[jboss-cvs] JBossAS SVN: r78276 - in projects/demos/trunk: bootstrap and 27 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 9 16:38:54 EDT 2008
Author: pgier
Date: 2008-09-09 16:38:54 -0400 (Tue, 09 Sep 2008)
New Revision: 78276
Added:
projects/demos/trunk/bootstrap/src/main/java/
projects/demos/trunk/bootstrap/src/main/java/org/
projects/demos/trunk/bootstrap/src/main/resources/
projects/demos/trunk/bootstrap/src/main/resources/log4j.properties
projects/demos/trunk/classloading/src/main/java/
projects/demos/trunk/classloading/src/main/java/org/
projects/demos/trunk/classloading/src/main/resources/
projects/demos/trunk/classloading/src/main/resources/log4j.properties
projects/demos/trunk/classpath/src/main/java/
projects/demos/trunk/classpath/src/main/java/org/
projects/demos/trunk/classpath/src/main/resources/
projects/demos/trunk/ioc/src/main/java/
projects/demos/trunk/ioc/src/main/java/org/
projects/demos/trunk/ioc/src/main/resources/
projects/demos/trunk/jmx/src/main/java/
projects/demos/trunk/jmx/src/main/java/org/
projects/demos/trunk/jmx/src/main/resources/
projects/demos/trunk/jmx/src/main/resources/log4j.properties
projects/demos/trunk/models/src/main/java/
projects/demos/trunk/models/src/main/java/org/
projects/demos/trunk/models/src/main/resources/
Removed:
projects/demos/trunk/bootstrap/src/main/log4j.properties
projects/demos/trunk/bootstrap/src/main/org/
projects/demos/trunk/bootstrap/src/resources/
projects/demos/trunk/classloading/src/main/log4j.properties
projects/demos/trunk/classloading/src/main/org/
projects/demos/trunk/classloading/src/resources/
projects/demos/trunk/classpath/src/main/org/
projects/demos/trunk/classpath/src/resources/
projects/demos/trunk/ioc/src/main/org/
projects/demos/trunk/ioc/src/resources/
projects/demos/trunk/jmx/src/main/log4j.properties
projects/demos/trunk/jmx/src/main/org/
projects/demos/trunk/jmx/src/resources/
projects/demos/trunk/models/src/main/org/
projects/demos/trunk/models/src/resources/
Modified:
projects/demos/trunk/bootstrap/
projects/demos/trunk/bootstrap/pom.xml
projects/demos/trunk/build/pom.xml
projects/demos/trunk/classloading/
projects/demos/trunk/classloading/pom.xml
projects/demos/trunk/classpath/
projects/demos/trunk/classpath/pom.xml
projects/demos/trunk/ioc/
projects/demos/trunk/ioc/pom.xml
projects/demos/trunk/jmx/
projects/demos/trunk/jmx/pom.xml
projects/demos/trunk/models/
projects/demos/trunk/models/pom.xml
projects/demos/trunk/pom.xml
Log:
[JBBUILD-484] Restructure microcontainer demos to match maven standards.
Property changes on: projects/demos/trunk/bootstrap
___________________________________________________________________
Name: svn:ignore
+ target
Modified: projects/demos/trunk/bootstrap/pom.xml
===================================================================
--- projects/demos/trunk/bootstrap/pom.xml 2008-09-09 19:32:41 UTC (rev 78275)
+++ projects/demos/trunk/bootstrap/pom.xml 2008-09-09 20:38:54 UTC (rev 78276)
@@ -11,9 +11,7 @@
<name>JBoss MC Demos Boostrap</name>
<url>http://www.jboss.org/jbossmc</url>
<description>JBoss MC Demos</description>
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- </build>
+
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
Copied: projects/demos/trunk/bootstrap/src/main/java/org (from rev 78265, projects/demos/trunk/bootstrap/src/main/org)
Deleted: projects/demos/trunk/bootstrap/src/main/log4j.properties
===================================================================
--- projects/demos/trunk/bootstrap/src/main/log4j.properties 2008-09-09 19:32:41 UTC (rev 78275)
+++ projects/demos/trunk/bootstrap/src/main/log4j.properties 2008-09-09 20:38:54 UTC (rev 78276)
@@ -1,6 +0,0 @@
-log4j.rootLogger=DEBUG, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-# Pattern to output the caller's file name and line number.
-log4j.appender.stdout.layout.ConversionPattern=JBoss-MC-Demo %5p [%d{dd-MM-yyyy HH:mm:ss}] %c{1} - %m%n
Copied: projects/demos/trunk/bootstrap/src/main/resources (from rev 78265, projects/demos/trunk/bootstrap/src/resources)
Copied: projects/demos/trunk/bootstrap/src/main/resources/log4j.properties (from rev 78265, projects/demos/trunk/bootstrap/src/main/log4j.properties)
===================================================================
--- projects/demos/trunk/bootstrap/src/main/resources/log4j.properties (rev 0)
+++ projects/demos/trunk/bootstrap/src/main/resources/log4j.properties 2008-09-09 20:38:54 UTC (rev 78276)
@@ -0,0 +1,6 @@
+log4j.rootLogger=DEBUG, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+# Pattern to output the caller's file name and line number.
+log4j.appender.stdout.layout.ConversionPattern=JBoss-MC-Demo %5p [%d{dd-MM-yyyy HH:mm:ss}] %c{1} - %m%n
Modified: projects/demos/trunk/build/pom.xml
===================================================================
--- projects/demos/trunk/build/pom.xml 2008-09-09 19:32:41 UTC (rev 78275)
+++ projects/demos/trunk/build/pom.xml 2008-09-09 20:38:54 UTC (rev 78276)
@@ -1,420 +1,18 @@
<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.demos</groupId>
+ <artifactId>jboss-demos</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.demos</groupId>
- <artifactId>jboss-demos</artifactId>
+ <artifactId>jboss-demos-dist-build</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JBoss Demos Build</name>
- <url>http://www.jboss.com/products/jbossmc</url>
<description>
- The JBoss MC Demos
+ The JBoss MC Demos Distribution Build
</description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/demos/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/demos/trunk/</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/demos/trunk/</url>
- </scm>
- <properties>
- <version.jboss.jbossas>5.0.0.CR1</version.jboss.jbossas>
- <version.jboss.man>2.0.0.Beta12</version.jboss.man>
- <version.jboss.mdr>2.0.0-SNAPSHOT</version.jboss.mdr>
- <version.jboss.microcontainer>2.0.0-SNAPSHOT</version.jboss.microcontainer>
- <version.jboss.deployers>2.0.0-SNAPSHOT</version.jboss.deployers>
- <version.jboss.classloader>2.0.0-SNAPSHOT</version.jboss.classloader>
- <version.jboss.common.core>2.2.7.GA</version.jboss.common.core>
- <version.jboss.common.logging.spi>2.0.5.GA</version.jboss.common.logging.spi>
- <version.jboss.common.logging.log4j>2.0.5.GA</version.jboss.common.logging.log4j>
- <version.jbossxb>2.0.0.CR12</version.jbossxb>
- <version.jboss.aop>2.0.0.CR15</version.jboss.aop>
- <version.jboss.vfs>2.0.0-SNAPSHOT</version.jboss.vfs>
- <version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
- <version.junit>4.4</version.junit>
- <version.javassist>3.7.1.GA</version.javassist>
- <version.xerces>2.9.1</version.xerces>
- <version.spring>2.5.5</version.spring>
- </properties>
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- <resources>
- <resource>
- <targetPath/>
- <filtering/>
- <directory>src/resources</directory>
- <includes/>
- <excludes/>
- </resource>
- </resources>
- <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.demos</groupId>
- <artifactId>jboss-demos</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.demos</groupId>
- <artifactId>jboss-demos-bootstrap</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.demos</groupId>
- <artifactId>jboss-demos-jmx</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.demos</groupId>
- <artifactId>jboss-demos-models</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!--
- <dependency>
- <groupId>org.jboss.demos</groupId>
- <artifactId>jboss-demos-osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
- -->
-
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-spring-int</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-guice-int</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client</artifactId>
- <version>${version.jboss.deployers}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- <version>${version.jboss.deployers}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- <version>${version.jboss.deployers}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- <version>${version.jboss.deployers}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- <version>${version.jboss.deployers}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-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.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <version>${version.jboss.deployers}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloader</artifactId>
- <version>${version.jboss.classloader}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloading</artifactId>
- <version>${version.jboss.classloader}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloading-vfs</artifactId>
- <version>${version.jboss.classloader}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <version>${version.jboss.man}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-metatype</artifactId>
- <version>${version.jboss.man}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- <version>${version.jboss.mdr}</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.common.logging.spi}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <version>${version.jboss.common.logging.log4j}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>${version.jbossxb}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>${version.jboss.vfs}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>${version.jboss.aop}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
- <version>${version.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
- <version>${version.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>javassist</artifactId>
- <version>${version.javassist}</version>
- </dependency>
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- <version>${version.xerces}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${version.spring}</version>
- </dependency>
- <dependency>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- <version>1.0</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>
- </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>
\ No newline at end of file
Property changes on: projects/demos/trunk/classloading
___________________________________________________________________
Name: svn:ignore
+ target
Modified: projects/demos/trunk/classloading/pom.xml
===================================================================
--- projects/demos/trunk/classloading/pom.xml 2008-09-09 19:32:41 UTC (rev 78275)
+++ projects/demos/trunk/classloading/pom.xml 2008-09-09 20:38:54 UTC (rev 78276)
@@ -11,9 +11,7 @@
<name>JBoss MC Demos Classloading</name>
<url>http://www.jboss.org/jbossmc</url>
<description>JBoss MC Demos</description>
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- </build>
+
<dependencies>
<dependency>
<groupId>org.jboss.demos</groupId>
Copied: projects/demos/trunk/classloading/src/main/java/org (from rev 78265, projects/demos/trunk/classloading/src/main/org)
Deleted: projects/demos/trunk/classloading/src/main/log4j.properties
===================================================================
--- projects/demos/trunk/classloading/src/main/log4j.properties 2008-09-09 19:32:41 UTC (rev 78275)
+++ projects/demos/trunk/classloading/src/main/log4j.properties 2008-09-09 20:38:54 UTC (rev 78276)
@@ -1,6 +0,0 @@
-log4j.rootLogger=DEBUG, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-# Pattern to output the caller's file name and line number.
-log4j.appender.stdout.layout.ConversionPattern=JBoss-MC-Demo %5p [%d{dd-MM-yyyy HH:mm:ss}] %c{1} - %m%n
Copied: projects/demos/trunk/classloading/src/main/resources (from rev 78265, projects/demos/trunk/classloading/src/resources)
Copied: projects/demos/trunk/classloading/src/main/resources/log4j.properties (from rev 78265, projects/demos/trunk/classloading/src/main/log4j.properties)
===================================================================
--- projects/demos/trunk/classloading/src/main/resources/log4j.properties (rev 0)
+++ projects/demos/trunk/classloading/src/main/resources/log4j.properties 2008-09-09 20:38:54 UTC (rev 78276)
@@ -0,0 +1,6 @@
+log4j.rootLogger=DEBUG, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+# Pattern to output the caller's file name and line number.
+log4j.appender.stdout.layout.ConversionPattern=JBoss-MC-Demo %5p [%d{dd-MM-yyyy HH:mm:ss}] %c{1} - %m%n
Property changes on: projects/demos/trunk/classpath
___________________________________________________________________
Name: svn:ignore
+ target
Modified: projects/demos/trunk/classpath/pom.xml
===================================================================
--- projects/demos/trunk/classpath/pom.xml 2008-09-09 19:32:41 UTC (rev 78275)
+++ projects/demos/trunk/classpath/pom.xml 2008-09-09 20:38:54 UTC (rev 78276)
@@ -8,12 +8,10 @@
<groupId>org.jboss.demos</groupId>
<artifactId>jboss-demos-classpath</artifactId>
<packaging>jar</packaging>
- <name>JBoss MC Demos IoC</name>
+ <name>JBoss MC Demos Classpath</name>
<url>http://www.jboss.org/jbossmc</url>
<description>JBoss MC Demos</description>
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- </build>
+
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
Copied: projects/demos/trunk/classpath/src/main/java/org (from rev 78265, projects/demos/trunk/classpath/src/main/org)
Copied: projects/demos/trunk/classpath/src/main/resources (from rev 78265, projects/demos/trunk/classpath/src/resources)
Property changes on: projects/demos/trunk/ioc
___________________________________________________________________
Name: svn:ignore
+ target
Modified: projects/demos/trunk/ioc/pom.xml
===================================================================
--- projects/demos/trunk/ioc/pom.xml 2008-09-09 19:32:41 UTC (rev 78275)
+++ projects/demos/trunk/ioc/pom.xml 2008-09-09 20:38:54 UTC (rev 78276)
@@ -11,9 +11,7 @@
<name>JBoss MC Demos IoC</name>
<url>http://www.jboss.org/jbossmc</url>
<description>JBoss MC Demos</description>
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- </build>
+
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
Copied: projects/demos/trunk/ioc/src/main/java/org (from rev 78265, projects/demos/trunk/ioc/src/main/org)
Copied: projects/demos/trunk/ioc/src/main/resources (from rev 78265, projects/demos/trunk/ioc/src/resources)
Property changes on: projects/demos/trunk/jmx
___________________________________________________________________
Name: svn:ignore
+ target
Modified: projects/demos/trunk/jmx/pom.xml
===================================================================
--- projects/demos/trunk/jmx/pom.xml 2008-09-09 19:32:41 UTC (rev 78275)
+++ projects/demos/trunk/jmx/pom.xml 2008-09-09 20:38:54 UTC (rev 78276)
@@ -11,9 +11,7 @@
<name>JBoss MC Demos JMX</name>
<url>http://www.jboss.org/jbossmc</url>
<description>JBoss MC Demos</description>
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- </build>
+
<dependencies>
<dependency>
<groupId>org.jboss.demos</groupId>
Copied: projects/demos/trunk/jmx/src/main/java/org (from rev 78265, projects/demos/trunk/jmx/src/main/org)
Deleted: projects/demos/trunk/jmx/src/main/log4j.properties
===================================================================
--- projects/demos/trunk/jmx/src/main/log4j.properties 2008-09-09 19:32:41 UTC (rev 78275)
+++ projects/demos/trunk/jmx/src/main/log4j.properties 2008-09-09 20:38:54 UTC (rev 78276)
@@ -1,6 +0,0 @@
-log4j.rootLogger=DEBUG, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-# Pattern to output the caller's file name and line number.
-log4j.appender.stdout.layout.ConversionPattern=JBoss-MC-Demo %5p [%d{dd-MM-yyyy HH:mm:ss}] %c{1} - %m%n
Copied: projects/demos/trunk/jmx/src/main/resources (from rev 78265, projects/demos/trunk/jmx/src/resources)
Copied: projects/demos/trunk/jmx/src/main/resources/log4j.properties (from rev 78265, projects/demos/trunk/jmx/src/main/log4j.properties)
===================================================================
--- projects/demos/trunk/jmx/src/main/resources/log4j.properties (rev 0)
+++ projects/demos/trunk/jmx/src/main/resources/log4j.properties 2008-09-09 20:38:54 UTC (rev 78276)
@@ -0,0 +1,6 @@
+log4j.rootLogger=DEBUG, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+# Pattern to output the caller's file name and line number.
+log4j.appender.stdout.layout.ConversionPattern=JBoss-MC-Demo %5p [%d{dd-MM-yyyy HH:mm:ss}] %c{1} - %m%n
Property changes on: projects/demos/trunk/models
___________________________________________________________________
Name: svn:ignore
+ target
Modified: projects/demos/trunk/models/pom.xml
===================================================================
--- projects/demos/trunk/models/pom.xml 2008-09-09 19:32:41 UTC (rev 78275)
+++ projects/demos/trunk/models/pom.xml 2008-09-09 20:38:54 UTC (rev 78276)
@@ -11,9 +11,7 @@
<name>JBoss MC Demos Models</name>
<url>http://www.jboss.org/jbossmc</url>
<description>JBoss MC Demos</description>
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- </build>
+
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
Copied: projects/demos/trunk/models/src/main/java/org (from rev 78265, projects/demos/trunk/models/src/main/org)
Copied: projects/demos/trunk/models/src/main/resources (from rev 78265, projects/demos/trunk/models/src/resources)
Modified: projects/demos/trunk/pom.xml
===================================================================
--- projects/demos/trunk/pom.xml 2008-09-09 19:32:41 UTC (rev 78275)
+++ projects/demos/trunk/pom.xml 2008-09-09 20:38:54 UTC (rev 78276)
@@ -2,24 +2,25 @@
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
- <version>4-beta-2</version>
+ <version>4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.demos</groupId>
- <artifactId>jboss-demos-aggregator</artifactId>
+ <artifactId>jboss-demos</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>JBoss Demos Aggregator</name>
- <url>http://www.jboss.com/products/jbossmc</url>
+ <name>JBoss Demos Parent POM</name>
+ <url>http://www.jboss.org/jbossmc</url>
<description>
The JBoss MC Demos
</description>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/demos/trunk</connection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/demos/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/demos/trunk/</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/demos/trunk/</url>
</scm>
<modules>
- <module>build</module>
<module>bootstrap</module>
<module>jmx</module>
<module>models</module>
@@ -27,12 +28,48 @@
<module>classloading</module>
<module>classpath</module>
<!-- <module>osgi</module> -->
+ <module>build</module>
</modules>
+
+ <properties>
+ <version.jboss.jbossas>5.0.0.CR1</version.jboss.jbossas>
+ <version.jboss.man>2.0.0.Beta12</version.jboss.man>
+ <version.jboss.mdr>2.0.0-SNAPSHOT</version.jboss.mdr>
+ <version.jboss.microcontainer>2.0.0-SNAPSHOT</version.jboss.microcontainer>
+ <version.jboss.deployers>2.0.0-SNAPSHOT</version.jboss.deployers>
+ <version.jboss.classloader>2.0.0-SNAPSHOT</version.jboss.classloader>
+ <version.jboss.common.core>2.2.7.GA</version.jboss.common.core>
+ <version.jboss.common.logging.spi>2.0.5.GA</version.jboss.common.logging.spi>
+ <version.jboss.common.logging.log4j>2.0.5.GA</version.jboss.common.logging.log4j>
+ <version.jbossxb>2.0.0.CR12</version.jbossxb>
+ <version.jboss.aop>2.0.0.CR15</version.jboss.aop>
+ <version.jboss.vfs>2.0.0-SNAPSHOT</version.jboss.vfs>
+ <version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
+ <version.junit>4.4</version.junit>
+ <version.javassist>3.7.1.GA</version.javassist>
+ <version.xerces>2.9.1</version.xerces>
+ <version.spring>2.5.5</version.spring>
+ </properties>
<build>
+ <outputDirectory>${microcontainer.outputDirectory}</outputDirectory>
+ <testOutputDirectory>${microcontainer.testOutputDirectory}</testOutputDirectory>
+ <finalName>${artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <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>
@@ -42,14 +79,317 @@
</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>
+
+ <dependencyManagement>
+ <!-- The parent pom manages the inter-dependencies of the modules. -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.demos</groupId>
+ <artifactId>jboss-demos</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.demos</groupId>
+ <artifactId>jboss-demos-bootstrap</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.demos</groupId>
+ <artifactId>jboss-demos-jmx</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.demos</groupId>
+ <artifactId>jboss-demos-models</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>org.jboss.demos</groupId>
+ <artifactId>jboss-demos-osgi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ -->
+
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <version>${version.jboss.microcontainer}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${version.jboss.microcontainer}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ <version>${version.jboss.microcontainer}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-spring-int</artifactId>
+ <version>${version.jboss.microcontainer}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-guice-int</artifactId>
+ <version>${version.jboss.microcontainer}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client</artifactId>
+ <version>${version.jboss.deployers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ <version>${version.jboss.deployers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ <version>${version.jboss.deployers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-impl</artifactId>
+ <version>${version.jboss.deployers}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
+ <version>${version.jboss.deployers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-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.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <version>${version.jboss.deployers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloader</artifactId>
+ <version>${version.jboss.classloader}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ <version>${version.jboss.classloader}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading-vfs</artifactId>
+ <version>${version.jboss.classloader}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <version>${version.jboss.man}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-metatype</artifactId>
+ <version>${version.jboss.man}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <version>${version.jboss.mdr}</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.common.logging.spi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <version>${version.jboss.common.logging.log4j}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>${version.jbossxb}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>${version.jboss.vfs}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>${version.jboss.aop}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ <version>${version.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ <version>${version.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${version.javassist}</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${version.xerces}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${version.spring}</version>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</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>
+ </dependencies>
+ </dependencyManagement>
+
<profiles>
<profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <microcontainer.outputDirectory>target/classes</microcontainer.outputDirectory>
+ <microcontainer.testOutputDirectory>target/test-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/test-classes</microcontainer.testOutputDirectory>
+ </properties>
</profile>
</profiles>
More information about the jboss-cvs-commits
mailing list