[jboss-cvs] JBossAS SVN: r59797 - in projects/microcontainer/trunk: build and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 18 16:19:23 EST 2007
Author: pgier
Date: 2007-01-18 16:19:23 -0500 (Thu, 18 Jan 2007)
New Revision: 59797
Modified:
projects/microcontainer/trunk/aop-mc-int/pom.xml
projects/microcontainer/trunk/build/pom.xml
projects/microcontainer/trunk/container/pom.xml
projects/microcontainer/trunk/dependency/pom.xml
projects/microcontainer/trunk/deployers/pom.xml
projects/microcontainer/trunk/kernel/pom.xml
projects/microcontainer/trunk/managed/pom.xml
projects/microcontainer/trunk/metatype/pom.xml
projects/microcontainer/trunk/osgi-int/pom.xml
projects/microcontainer/trunk/spring-int/pom.xml
Log:
JBMICROCONT-117; Added distribution management section to pom.xml files. Some minor formatting cleanup.
Modified: projects/microcontainer/trunk/aop-mc-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/pom.xml 2007-01-18 21:18:43 UTC (rev 59796)
+++ projects/microcontainer/trunk/aop-mc-int/pom.xml 2007-01-18 21:19:23 UTC (rev 59797)
@@ -9,10 +9,10 @@
<url>http://www.jboss.org</url>
<description>JBoss Microcontainer</description>
<licenses>
- <license>
+ <license>
<name>lgpl</name>
<url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
+ </license>
</licenses>
<organization>
<name>JBoss Inc.</name>
@@ -32,7 +32,7 @@
</repositories>
<pluginRepositories>
- <pluginRepository>
+ <pluginRepository>
<id>jbosspluginrepo</id>
<name>jboss plugin repository</name>
<url>http://repository.jboss.com/maven2</url>
@@ -41,14 +41,14 @@
<enabled>false</enabled>
<updatePolicy>never</updatePolicy>
</snapshots>
- </pluginRepository>
+ </pluginRepository>
</pluginRepositories>
<build>
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
- <finalName>${artifactId}</finalName>
- <plugins>
+ <sourceDirectory>src/main</sourceDirectory>
+ <testSourceDirectory>src/tests</testSourceDirectory>
+ <finalName>${artifactId}</finalName>
+ <plugins>
<!-- define how we want compilation to take place
here, we accept most of the defaults but say that we want the
@@ -58,24 +58,25 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0</version>
<configuration>
- <optimize>true</optimize>
- <source>1.5</source>
- <target>1.5</target>
+ <optimize>true</optimize>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+
<!-- define that we wish to create src jars -->
<plugin>
<artifactId>maven-source-plugin</artifactId>
@@ -95,7 +96,6 @@
<skip>true</skip>
</configuration>
</plugin>
-
</plugins>
</build>
<dependencies>
@@ -149,5 +149,12 @@
</dependencies>
+ <distributionManagement>
+ <repository>
+ <id>cvs-file-repository</id>
+ <url>file://${maven.cvs.root}</url>
+ </repository>
+ </distributionManagement>
+
</project>
Modified: projects/microcontainer/trunk/build/pom.xml
===================================================================
--- projects/microcontainer/trunk/build/pom.xml 2007-01-18 21:18:43 UTC (rev 59796)
+++ projects/microcontainer/trunk/build/pom.xml 2007-01-18 21:19:23 UTC (rev 59797)
@@ -1,14 +1,18 @@
<!--
-A top level maven pom that expects a structure like:
- build/pom.xml
- aop-mc-int/pom.xml
- container/pom.xml
- dependency/pom.xml
- deployers/pom.xml
- kernel/pom.xml
- managed/pom.xml
- metatype/pom.xml
- spring-int/pom.xml
+ A top level maven pom that expects a structure like:
+ build/pom.xml
+ aop-mc-int/pom.xml
+ container/pom.xml
+ dependency/pom.xml
+ deployers/pom.xml
+ kernel/pom.xml
+ managed/pom.xml
+ metatype/pom.xml
+ spring-int/pom.xml
+
+ To build this project maven 2 should be installed and in the system path. From the command line
+ run "mvn install".
+
-->
<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">
@@ -62,6 +66,7 @@
<distributionManagement>
<repository>
+ <!-- Copy the distribution jar file to a local copy of the maven repository, for use by other projects -->
<id>cvs-file-repository</id>
<url>file://${maven.cvs.root}</url>
</repository>
Modified: projects/microcontainer/trunk/container/pom.xml
===================================================================
--- projects/microcontainer/trunk/container/pom.xml 2007-01-18 21:18:43 UTC (rev 59796)
+++ projects/microcontainer/trunk/container/pom.xml 2007-01-18 21:19:23 UTC (rev 59797)
@@ -48,6 +48,12 @@
<sourceDirectory>src/main</sourceDirectory>
<testSourceDirectory>src/tests</testSourceDirectory>
<finalName>${artifactId}</finalName>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
<plugins>
<!-- define how we want compilation to take place
@@ -64,18 +70,18 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
<!-- define that we wish to create src jars -->
<plugin>
@@ -111,61 +117,6 @@
<artifactId>jboss-vfs</artifactId>
<version>2.0.4.snapshot</version>
</dependency>
- <!--<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>2.0.4.Alpha</version>
- </dependency>-->
- <!--<dependency>
- <groupId>apache-log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.8</version>
- </dependency>-->
- <!--<dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.7.1</version>
- </dependency>-->
- <!--<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-jdk</artifactId>
- <version>2.0.2.GA</version>
- </dependency>-->
- <!--<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <version>2.0.2.GA</version>
- </dependency>-->
- <!--<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>2.0.2.GA</version>
- </dependency>-->
- <!--<dependency>
- <groupId>jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>1.0.0.CR8</version>
- </dependency>-->
- <!--<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>2.0.0.alpha2</version>
- </dependency>-->
- <!--<dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4</version>
- </dependency>-->
- <!--<dependency>
- <groupId>net.java.dev.javacc</groupId>
- <artifactId>javacc</artifactId>
- <version>4.0</version>
- </dependency>-->
- <!--<dependency>
- <groupId>trove</groupId>
- <artifactId>trove</artifactId>
- <version>1.0.2</version>
- </dependency>-->
<!-- Test dependencies -->
<dependency>
@@ -186,6 +137,14 @@
<version>1.0.0.CR5</version>
<scope>test</scope>
</dependency>
- </dependencies>
+ </dependencies>
+
+ <distributionManagement>
+ <repository>
+ <id>cvs-file-repository</id>
+ <url>file://${maven.cvs.root}</url>
+ </repository>
+ </distributionManagement>
+
</project>
Modified: projects/microcontainer/trunk/dependency/pom.xml
===================================================================
--- projects/microcontainer/trunk/dependency/pom.xml 2007-01-18 21:18:43 UTC (rev 59796)
+++ projects/microcontainer/trunk/dependency/pom.xml 2007-01-18 21:19:23 UTC (rev 59797)
@@ -64,18 +64,18 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
<!-- define that we wish to create src jars -->
<plugin>
<artifactId>maven-source-plugin</artifactId>
@@ -119,7 +119,14 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
- </dependencies>
+ </dependencies>
+ <distributionManagement>
+ <repository>
+ <id>cvs-file-repository</id>
+ <url>file://${maven.cvs.root}</url>
+ </repository>
+ </distributionManagement>
+
</project>
Modified: projects/microcontainer/trunk/deployers/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers/pom.xml 2007-01-18 21:18:43 UTC (rev 59796)
+++ projects/microcontainer/trunk/deployers/pom.xml 2007-01-18 21:19:23 UTC (rev 59797)
@@ -64,18 +64,18 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
<!-- define that we wish to create src jars -->
<plugin>
<artifactId>maven-source-plugin</artifactId>
@@ -136,6 +136,13 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
+ <distributionManagement>
+ <repository>
+ <id>cvs-file-repository</id>
+ <url>file://${maven.cvs.root}</url>
+ </repository>
+ </distributionManagement>
+
</project>
Modified: projects/microcontainer/trunk/kernel/pom.xml
===================================================================
--- projects/microcontainer/trunk/kernel/pom.xml 2007-01-18 21:18:43 UTC (rev 59796)
+++ projects/microcontainer/trunk/kernel/pom.xml 2007-01-18 21:19:23 UTC (rev 59797)
@@ -140,8 +140,15 @@
</dependency>
<!-- Test dependencies -->
-
- </dependencies>
-
+ </dependencies>
+
+ <distributionManagement>
+ <repository>
+ <id>cvs-file-repository</id>
+ <url>file://${maven.cvs.root}</url>
+ </repository>
+ </distributionManagement>
+
+
</project>
Modified: projects/microcontainer/trunk/managed/pom.xml
===================================================================
--- projects/microcontainer/trunk/managed/pom.xml 2007-01-18 21:18:43 UTC (rev 59796)
+++ projects/microcontainer/trunk/managed/pom.xml 2007-01-18 21:19:23 UTC (rev 59797)
@@ -64,18 +64,18 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
<!-- define that we wish to create src jars -->
<plugin>
<artifactId>maven-source-plugin</artifactId>
@@ -131,6 +131,12 @@
</dependency>
</dependencies>
-
+ <distributionManagement>
+ <repository>
+ <id>cvs-file-repository</id>
+ <url>file://${maven.cvs.root}</url>
+ </repository>
+ </distributionManagement>
+
</project>
Modified: projects/microcontainer/trunk/metatype/pom.xml
===================================================================
--- projects/microcontainer/trunk/metatype/pom.xml 2007-01-18 21:18:43 UTC (rev 59796)
+++ projects/microcontainer/trunk/metatype/pom.xml 2007-01-18 21:19:23 UTC (rev 59797)
@@ -64,18 +64,18 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
<!-- define that we wish to create src jars -->
<plugin>
<artifactId>maven-source-plugin</artifactId>
@@ -114,8 +114,14 @@
<scope>test</scope>
</dependency>
- </dependencies>
+ </dependencies>
+ <distributionManagement>
+ <repository>
+ <id>cvs-file-repository</id>
+ <url>file://${maven.cvs.root}</url>
+ </repository>
+ </distributionManagement>
</project>
Modified: projects/microcontainer/trunk/osgi-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/osgi-int/pom.xml 2007-01-18 21:18:43 UTC (rev 59796)
+++ projects/microcontainer/trunk/osgi-int/pom.xml 2007-01-18 21:19:23 UTC (rev 59797)
@@ -82,18 +82,18 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
<!-- define that we wish to create src jars -->
<plugin>
<artifactId>maven-source-plugin</artifactId>
@@ -139,5 +139,12 @@
</dependencies>
+ <distributionManagement>
+ <repository>
+ <id>cvs-file-repository</id>
+ <url>file://${maven.cvs.root}</url>
+ </repository>
+ </distributionManagement>
+
</project>
Modified: projects/microcontainer/trunk/spring-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/spring-int/pom.xml 2007-01-18 21:18:43 UTC (rev 59796)
+++ projects/microcontainer/trunk/spring-int/pom.xml 2007-01-18 21:19:23 UTC (rev 59797)
@@ -64,18 +64,18 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
<!-- define that we wish to create src jars -->
<plugin>
<artifactId>maven-source-plugin</artifactId>
@@ -127,7 +127,14 @@
<scope>test</scope>
</dependency>
- </dependencies>
+ </dependencies>
+
+ <distributionManagement>
+ <repository>
+ <id>cvs-file-repository</id>
+ <url>file://${maven.cvs.root}</url>
+ </repository>
+ </distributionManagement>
</project>
More information about the jboss-cvs-commits
mailing list