[jboss-cvs] JBossAS SVN: r77665 - in projects/microcontainer/trunk: aop-mc-int and 45 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 29 17:58:21 EDT 2008
Author: pgier
Date: 2008-08-29 17:58:21 -0400 (Fri, 29 Aug 2008)
New Revision: 77665
Added:
projects/microcontainer/trunk/aop-mc-int/src/main/java/
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/
projects/microcontainer/trunk/aop-mc-int/src/main/resources/
projects/microcontainer/trunk/aop-mc-int/src/main/resources/schema/
projects/microcontainer/trunk/aop-mc-int/src/test/
projects/microcontainer/trunk/aop-mc-int/src/test/java/
projects/microcontainer/trunk/aop-mc-int/src/test/java/org/
projects/microcontainer/trunk/aop-mc-int/src/test/resources/
projects/microcontainer/trunk/aop-mc-int/src/test/resources/org/
projects/microcontainer/trunk/dependency/src/main/java/
projects/microcontainer/trunk/dependency/src/main/java/org/
projects/microcontainer/trunk/dependency/src/test/
projects/microcontainer/trunk/dependency/src/test/java/
projects/microcontainer/trunk/dependency/src/test/java/org/
projects/microcontainer/trunk/guice-int/src/main/java/
projects/microcontainer/trunk/guice-int/src/main/java/org/
projects/microcontainer/trunk/guice-int/src/test/
projects/microcontainer/trunk/guice-int/src/test/java/
projects/microcontainer/trunk/guice-int/src/test/java/org/
projects/microcontainer/trunk/kernel/src/main/java/
projects/microcontainer/trunk/kernel/src/main/java/org/
projects/microcontainer/trunk/kernel/src/main/resources/
projects/microcontainer/trunk/kernel/src/main/resources/schema/
projects/microcontainer/trunk/kernel/src/test/
projects/microcontainer/trunk/kernel/src/test/java/
projects/microcontainer/trunk/kernel/src/test/java/org/
projects/microcontainer/trunk/kernel/src/test/resources/
projects/microcontainer/trunk/kernel/src/test/resources/org/
projects/microcontainer/trunk/kernel/src/test/resources/xml-test/
projects/microcontainer/trunk/spring-int/src/main/java/
projects/microcontainer/trunk/spring-int/src/main/java/org/
projects/microcontainer/trunk/spring-int/src/main/resources/
projects/microcontainer/trunk/spring-int/src/main/resources/schema/
projects/microcontainer/trunk/spring-int/src/test/
projects/microcontainer/trunk/spring-int/src/test/java/
projects/microcontainer/trunk/spring-int/src/test/java/org/
projects/microcontainer/trunk/spring-int/src/test/resources/
projects/microcontainer/trunk/spring-int/src/test/resources/org/
Removed:
projects/microcontainer/trunk/aop-mc-int/src/main/org/
projects/microcontainer/trunk/aop-mc-int/src/resources/main/schema/
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/
projects/microcontainer/trunk/aop-mc-int/src/tests/org/
projects/microcontainer/trunk/dependency/src/main/org/
projects/microcontainer/trunk/dependency/src/tests/org/
projects/microcontainer/trunk/guice-int/src/main/org/
projects/microcontainer/trunk/guice-int/src/tests/org/
projects/microcontainer/trunk/kernel/src/main/org/
projects/microcontainer/trunk/kernel/src/resources/main/schema/
projects/microcontainer/trunk/kernel/src/resources/tests/org/
projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/
projects/microcontainer/trunk/kernel/src/tests/org/
projects/microcontainer/trunk/spring-int/src/main/org/
projects/microcontainer/trunk/spring-int/src/resources/main/schema/
projects/microcontainer/trunk/spring-int/src/resources/tests/org/
projects/microcontainer/trunk/spring-int/src/tests/org/
Modified:
projects/microcontainer/trunk/aop-mc-int/pom-jdk14.xml
projects/microcontainer/trunk/aop-mc-int/pom.xml
projects/microcontainer/trunk/build/pom.xml
projects/microcontainer/trunk/kernel/pom-jdk14.xml
projects/microcontainer/trunk/kernel/pom.xml
projects/microcontainer/trunk/pom.xml
projects/microcontainer/trunk/spring-int/pom-jdk14.xml
projects/microcontainer/trunk/spring-int/pom.xml
Log:
[JBBUILD-484] Move the source and resources directories into the maven standard locations.
Modified: projects/microcontainer/trunk/aop-mc-int/pom-jdk14.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/pom-jdk14.xml 2008-08-29 20:35:14 UTC (rev 77664)
+++ projects/microcontainer/trunk/aop-mc-int/pom-jdk14.xml 2008-08-29 21:58:21 UTC (rev 77665)
@@ -22,17 +22,8 @@
<name>JBoss Microcontainer AOP MC INT JDK 1.4</name>
<url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Microcontainer</description>
+
<build>
- <resources>
- <resource>
- <directory>src/resources/main</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/resources/tests</directory>
- </testResource>
- </testResources>
<plugins>
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
Modified: projects/microcontainer/trunk/aop-mc-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/pom.xml 2008-08-29 20:35:14 UTC (rev 77664)
+++ projects/microcontainer/trunk/aop-mc-int/pom.xml 2008-08-29 21:58:21 UTC (rev 77665)
@@ -24,16 +24,6 @@
<url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Microcontainer</description>
<build>
- <resources>
- <resource>
- <directory>src/resources/main</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/resources/tests</directory>
- </testResource>
- </testResources>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
Copied: projects/microcontainer/trunk/aop-mc-int/src/main/java/org (from rev 77663, projects/microcontainer/trunk/aop-mc-int/src/main/org)
Copied: projects/microcontainer/trunk/aop-mc-int/src/main/resources/schema (from rev 77663, projects/microcontainer/trunk/aop-mc-int/src/resources/main/schema)
Copied: projects/microcontainer/trunk/aop-mc-int/src/test/java/org (from rev 77663, projects/microcontainer/trunk/aop-mc-int/src/tests/org)
Copied: projects/microcontainer/trunk/aop-mc-int/src/test/resources/org (from rev 77663, projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org)
Modified: projects/microcontainer/trunk/build/pom.xml
===================================================================
--- projects/microcontainer/trunk/build/pom.xml 2008-08-29 20:35:14 UTC (rev 77664)
+++ projects/microcontainer/trunk/build/pom.xml 2008-08-29 21:58:21 UTC (rev 77665)
@@ -27,12 +27,7 @@
<profiles>
<profile>
- <id>combined-assembly</id>
- <activation>
- <property>
- <name>!skip-assembly</name>
- </property>
- </activation>
+ <id>assembly</id>
<build>
<plugins>
<plugin>
@@ -47,6 +42,7 @@
<goal>attached</goal>
</goals>
<configuration>
+ <finalName>jboss-microcontainer-${project.version}</finalName>
<descriptors>
<descriptor>src/assembly/dist.xml</descriptor>
<descriptor>src/assembly/src.xml</descriptor>
@@ -59,5 +55,5 @@
</build>
</profile>
</profiles>
-
+
</project>
Copied: projects/microcontainer/trunk/dependency/src/main/java/org (from rev 77663, projects/microcontainer/trunk/dependency/src/main/org)
Copied: projects/microcontainer/trunk/dependency/src/test/java/org (from rev 77663, projects/microcontainer/trunk/dependency/src/tests/org)
Copied: projects/microcontainer/trunk/guice-int/src/main/java/org (from rev 77663, projects/microcontainer/trunk/guice-int/src/main/org)
Copied: projects/microcontainer/trunk/guice-int/src/test/java/org (from rev 77663, projects/microcontainer/trunk/guice-int/src/tests/org)
Modified: projects/microcontainer/trunk/kernel/pom-jdk14.xml
===================================================================
--- projects/microcontainer/trunk/kernel/pom-jdk14.xml 2008-08-29 20:35:14 UTC (rev 77664)
+++ projects/microcontainer/trunk/kernel/pom-jdk14.xml 2008-08-29 21:58:21 UTC (rev 77665)
@@ -22,17 +22,8 @@
<name>JBoss Microcontainer Kernel JDK 1.4</name>
<url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Microcontainer Kernel</description>
+
<build>
- <resources>
- <resource>
- <directory>src/resources/main</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/resources/tests</directory>
- </testResource>
- </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: projects/microcontainer/trunk/kernel/pom.xml
===================================================================
--- projects/microcontainer/trunk/kernel/pom.xml 2008-08-29 20:35:14 UTC (rev 77664)
+++ projects/microcontainer/trunk/kernel/pom.xml 2008-08-29 21:58:21 UTC (rev 77665)
@@ -11,16 +11,6 @@
<url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Microcontainer Kernel</description>
<build>
- <resources>
- <resource>
- <directory>src/resources/main</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/resources/tests</directory>
- </testResource>
- </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Copied: projects/microcontainer/trunk/kernel/src/main/java/org (from rev 77663, projects/microcontainer/trunk/kernel/src/main/org)
Copied: projects/microcontainer/trunk/kernel/src/main/resources/schema (from rev 77663, projects/microcontainer/trunk/kernel/src/resources/main/schema)
Copied: projects/microcontainer/trunk/kernel/src/test/java/org (from rev 77663, projects/microcontainer/trunk/kernel/src/tests/org)
Copied: projects/microcontainer/trunk/kernel/src/test/resources/org (from rev 77663, projects/microcontainer/trunk/kernel/src/resources/tests/org)
Copied: projects/microcontainer/trunk/kernel/src/test/resources/xml-test (from rev 77663, projects/microcontainer/trunk/kernel/src/resources/tests/xml-test)
Modified: projects/microcontainer/trunk/pom.xml
===================================================================
--- projects/microcontainer/trunk/pom.xml 2008-08-29 20:35:14 UTC (rev 77664)
+++ projects/microcontainer/trunk/pom.xml 2008-08-29 21:58:21 UTC (rev 77665)
@@ -51,8 +51,6 @@
</properties>
<build>
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
<outputDirectory>${microcontainer.outputDirectory}</outputDirectory>
<testOutputDirectory>${microcontainer.testOutputDirectory}</testOutputDirectory>
<finalName>${artifactId}</finalName>
@@ -317,7 +315,7 @@
</activation>
<properties>
<microcontainer.outputDirectory>target/classes</microcontainer.outputDirectory>
- <microcontainer.testOutputDirectory>target/tests-classes</microcontainer.testOutputDirectory>
+ <microcontainer.testOutputDirectory>target/test-classes</microcontainer.testOutputDirectory>
</properties>
</profile>
<profile>
@@ -350,48 +348,7 @@
</profile>
<profile>
- <id>eclipse-1</id>
- <build>
- <defaultGoal>process-test-resources</defaultGoal>
- </build>
- </profile>
- <profile>
- <id>docs</id>
- <activation>
- <property>
- <name>generate.docs</name>
- </property>
- </activation>
- <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-microcontainer-${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>
Modified: projects/microcontainer/trunk/spring-int/pom-jdk14.xml
===================================================================
--- projects/microcontainer/trunk/spring-int/pom-jdk14.xml 2008-08-29 20:35:14 UTC (rev 77664)
+++ projects/microcontainer/trunk/spring-int/pom-jdk14.xml 2008-08-29 21:58:21 UTC (rev 77665)
@@ -24,17 +24,8 @@
<name>JBoss Microcontainer Spring Int JDK 1.4</name>
<url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Microcontainer Spring 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.jboss.maven.plugins</groupId>
Modified: projects/microcontainer/trunk/spring-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/spring-int/pom.xml 2008-08-29 20:35:14 UTC (rev 77664)
+++ projects/microcontainer/trunk/spring-int/pom.xml 2008-08-29 21:58:21 UTC (rev 77665)
@@ -10,18 +10,7 @@
<name>JBoss Microcontainer Spring Int</name>
<url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Microcontainer Spring Integration</description>
- <build>
- <resources>
- <resource>
- <directory>src/resources/main</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/resources/tests</directory>
- </testResource>
- </testResources>
- </build>
+
<!-- Do not add version information here, use ../build/pom.xml instead -->
<dependencies>
<!-- Global dependencies -->
Copied: projects/microcontainer/trunk/spring-int/src/main/java/org (from rev 77663, projects/microcontainer/trunk/spring-int/src/main/org)
Copied: projects/microcontainer/trunk/spring-int/src/main/resources/schema (from rev 77663, projects/microcontainer/trunk/spring-int/src/resources/main/schema)
Copied: projects/microcontainer/trunk/spring-int/src/test/java/org (from rev 77663, projects/microcontainer/trunk/spring-int/src/tests/org)
Copied: projects/microcontainer/trunk/spring-int/src/test/resources/org (from rev 77663, projects/microcontainer/trunk/spring-int/src/resources/tests/org)
More information about the jboss-cvs-commits
mailing list