[portal-commits] JBoss Portal SVN: r8841 - in modules/test/trunk: mc and 12 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Wed Nov 7 14:02:05 EST 2007
Author: bdaw
Date: 2007-11-07 14:02:05 -0500 (Wed, 07 Nov 2007)
New Revision: 8841
Added:
modules/test/trunk/test/agent/pom.xml
modules/test/trunk/test/core/src/
modules/test/trunk/test/core/src/assembly/
modules/test/trunk/test/core/src/assembly/opends.xml
Modified:
modules/test/trunk/mc/pom.xml
modules/test/trunk/pom.xml
modules/test/trunk/remote/pom.xml
modules/test/trunk/test/core/pom.xml
modules/test/trunk/test/generic/pom.xml
modules/test/trunk/test/jboss/pom.xml
modules/test/trunk/tooling/ant/pom.xml
modules/test/trunk/tooling/core/pom.xml
modules/test/trunk/tooling/maven2/pom.xml
modules/test/trunk/tooling/pom.xml
modules/test/trunk/unit/pom.xml
Log:
more mavanization
Modified: modules/test/trunk/mc/pom.xml
===================================================================
--- modules/test/trunk/mc/pom.xml 2007-11-07 18:04:40 UTC (rev 8840)
+++ modules/test/trunk/mc/pom.xml 2007-11-07 19:02:05 UTC (rev 8841)
@@ -2,40 +2,40 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.jboss.portal.test</groupId>
- <artifactId>jboss-portal-modules-test-root</artifactId>
+ <artifactId>jboss-portal-modules-test</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-unit-mc</artifactId>
<packaging>jar</packaging>
- <name>JBoss Unit MC</name>
+ <name>JBoss Unit Microcontainer</name>
<dependencies>
<dependency>
<groupId>org.jboss.portal.test</groupId>
<artifactId>jboss-unit</artifactId>
- <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>2.0.0.Beta4</version>
</dependency>
</dependencies>
- <build>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
+ <!--<build>-->
+ <!--<plugins>-->
+ <!--<plugin>-->
+ <!--<groupId>org.apache.maven.plugins</groupId>-->
+ <!--<artifactId>maven-surefire-plugin</artifactId>-->
+ <!--<configuration>-->
+ <!--<skip>false</skip>-->
+ <!--<includes>-->
+ <!--<include>**/*Tests.java</include>-->
+ <!--</includes>-->
+ <!--</configuration>-->
+ <!--</plugin>-->
+ <!--</plugins>-->
+ <!--</build>-->
- </build>
<properties>
Modified: modules/test/trunk/pom.xml
===================================================================
--- modules/test/trunk/pom.xml 2007-11-07 18:04:40 UTC (rev 8840)
+++ modules/test/trunk/pom.xml 2007-11-07 19:02:05 UTC (rev 8841)
@@ -2,7 +2,7 @@
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.portal.test</groupId>
- <artifactId>jboss-portal-modules-test-root</artifactId>
+ <artifactId>jboss-portal-modules-test-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Modules Test</name>
<version>1.1.0-SNAPSHOT</version>
@@ -10,102 +10,102 @@
<dependencies/>
- <repositories>
- <repository>
- <id>repository.maven.org</id>
- <name>Maven Repository</name>
- <layout>default</layout>
- <url>http://repo1.maven.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <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>
+ <!--<repositories>-->
+ <!--<repository>-->
+ <!--<id>repository.maven.org</id>-->
+ <!--<name>Maven Repository</name>-->
+ <!--<layout>default</layout>-->
+ <!--<url>http://repo1.maven.org/maven2/</url>-->
+ <!--<snapshots>-->
+ <!--<enabled>false</enabled>-->
+ <!--</snapshots>-->
+ <!--</repository>-->
+ <!--<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>-->
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav</artifactId>
- <version>1.0-beta-2</version>
- </extension>
- </extensions>
- <pluginManagement>
- <plugins>
- <plugin>
- <inherited>true</inherited>
- <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-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-packaging-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-deploy-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <goals>
- <goal>jboss-deploy</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <!--<build>-->
+ <!--<extensions>-->
+ <!--<extension>-->
+ <!--<groupId>org.apache.maven.wagon</groupId>-->
+ <!--<artifactId>wagon-webdav</artifactId>-->
+ <!--<version>1.0-beta-2</version>-->
+ <!--</extension>-->
+ <!--</extensions>-->
+ <!--<pluginManagement>-->
+ <!--<plugins>-->
+ <!--<plugin>-->
+ <!--<inherited>true</inherited>-->
+ <!--<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-jar-plugin</artifactId>-->
+ <!--<configuration>-->
+ <!--<archive>-->
+ <!--<manifest>-->
+ <!--<addClasspath>true</addClasspath>-->
+ <!--</manifest>-->
+ <!--</archive>-->
+ <!--</configuration>-->
+ <!--</plugin>-->
+ <!--<plugin>-->
+ <!--<groupId>org.codehaus.mojo</groupId>-->
+ <!--<artifactId>jboss-packaging-maven-plugin</artifactId>-->
+ <!--<version>2.0-SNAPSHOT</version>-->
+ <!--<extensions>true</extensions>-->
+ <!--</plugin>-->
+ <!--<plugin>-->
+ <!--<artifactId>maven-idea-plugin</artifactId>-->
+ <!--<configuration>-->
+ <!--<downloadSources>true</downloadSources>-->
+ <!--</configuration>-->
+ <!--</plugin>-->
+ <!--<plugin>-->
+ <!--<groupId>org.jboss.maven.plugins</groupId>-->
+ <!--<artifactId>maven-jboss-deploy-plugin</artifactId>-->
+ <!--<version>1.3</version>-->
+ <!--<executions>-->
+ <!--<execution>-->
+ <!--<goals>-->
+ <!--<goal>jboss-deploy</goal>-->
+ <!--</goals>-->
+ <!--</execution>-->
+ <!--</executions>-->
+ <!--<configuration>-->
+ <!--<jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>-->
+ <!--</configuration>-->
+ <!--</plugin>-->
+ <!--</plugins>-->
+ <!--</pluginManagement>-->
+ <!--</build>-->
<distributionManagement>
<!--<repository>-->
@@ -123,6 +123,7 @@
</distributionManagement>
<modules>
+ <module>build</module>
<module>unit</module>
<module>tooling</module>
<module>mc</module>
@@ -130,73 +131,74 @@
<module>test/core</module>
<module>test/generic</module>
<module>test/jboss</module>
+ <module>test/agent</module>
</modules>
- <profiles>
- <profile>
- <id>docs</id>
- <modules>
- <module>docs</module>
- </modules>
- </profile>
- </profiles>
+ <!--<profiles>-->
+ <!--<profile>-->
+ <!--<id>docs</id>-->
+ <!--<modules>-->
+ <!--<module>docs</module>-->
+ <!--</modules>-->
+ <!--</profile>-->
+ <!--</profiles>-->
- <issueManagement>
- <system>JIRA</system>
- <url>http://jira.jboss.com/jira/browse/JBPORTAL</url>
- </issueManagement>
- <ciManagement>
- <system>cruisecontrol</system>
- </ciManagement>
+ <!--<issueManagement>-->
+ <!--<system>JIRA</system>-->
+ <!--<url>http://jira.jboss.com/jira/browse/JBPORTAL</url>-->
+ <!--</issueManagement>-->
+ <!--<ciManagement>-->
+ <!--<system>cruisecontrol</system>-->
+ <!--</ciManagement>-->
- <licenses>
- <license>
- <name>LGPL 2.1</name>
- <url>http://www.gnu.org/licenses/lgpl.html</url>
- <distribution>repo</distribution>
- <comments>
- GNU LESSER GENERAL PUBLIC LICENSE Version 2.1
- </comments>
- </license>
- </licenses>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/portal/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/portal/trunk</developerConnection>
- <url>https://svn.jboss.org/repos/portal/trunk</url>
- </scm>
+ <!--<licenses>-->
+ <!--<license>-->
+ <!--<name>LGPL 2.1</name>-->
+ <!--<url>http://www.gnu.org/licenses/lgpl.html</url>-->
+ <!--<distribution>repo</distribution>-->
+ <!--<comments>-->
+ <!--GNU LESSER GENERAL PUBLIC LICENSE Version 2.1-->
+ <!--</comments>-->
+ <!--</license>-->
+ <!--</licenses>-->
+ <!--<scm>-->
+ <!--<connection>scm:svn:http://anonsvn.jboss.org/repos/portal/trunk</connection>-->
+ <!--<developerConnection>scm:svn:https://svn.jboss.org/repos/portal/trunk</developerConnection>-->
+ <!--<url>https://svn.jboss.org/repos/portal/trunk</url>-->
+ <!--</scm>-->
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-changes-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <linkXref>true</linkXref>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
+ <!--<reporting>-->
+ <!--<plugins>-->
+ <!--<plugin>-->
+ <!--<artifactId>maven-changes-plugin</artifactId>-->
+ <!--</plugin>-->
+ <!--<plugin>-->
+ <!--<artifactId>maven-checkstyle-plugin</artifactId>-->
+ <!--</plugin>-->
+ <!--<plugin>-->
+ <!--<groupId>org.codehaus.mojo</groupId>-->
+ <!--<artifactId>cobertura-maven-plugin</artifactId>-->
+ <!--<version>2.0</version>-->
+ <!--</plugin>-->
+ <!--<plugin>-->
+ <!--<artifactId>maven-javadoc-plugin</artifactId>-->
+ <!--</plugin>-->
+ <!--<plugin>-->
+ <!--<artifactId>maven-jxr-plugin</artifactId>-->
+ <!--</plugin>-->
+ <!--<plugin>-->
+ <!--<artifactId>maven-pmd-plugin</artifactId>-->
+ <!--<configuration>-->
+ <!--<linkXref>true</linkXref>-->
+ <!--<targetJdk>1.5</targetJdk>-->
+ <!--</configuration>-->
+ <!--</plugin>-->
+ <!--<plugin>-->
+ <!--<artifactId>maven-surefire-report-plugin</artifactId>-->
+ <!--</plugin>-->
+ <!--</plugins>-->
+ <!--</reporting>-->
- <properties/>
+ <!--<properties/>-->
</project>
\ No newline at end of file
Modified: modules/test/trunk/remote/pom.xml
===================================================================
--- modules/test/trunk/remote/pom.xml 2007-11-07 18:04:40 UTC (rev 8840)
+++ modules/test/trunk/remote/pom.xml 2007-11-07 19:02:05 UTC (rev 8841)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.jboss.portal.test</groupId>
- <artifactId>jboss-portal-modules-test-root</artifactId>
+ <artifactId>jboss-portal-modules-test</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -14,49 +14,25 @@
<dependency>
<groupId>org.jboss.portal.test</groupId>
<artifactId>jboss-unit</artifactId>
- <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.portal.test</groupId>
- <artifactId>jboss-portal-modules-test-core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <artifactId>portal-test</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.portal.common</groupId>
<artifactId>jboss-portal-modules-common</artifactId>
- <version>1.1.0-SNAPSHOT</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>apache-collections</groupId>-->
- <!--<artifactId>commons-collections</artifactId>-->
- <!--<version>2.1</version>-->
- <!--</dependency>-->
<dependency>
<groupId>apache-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>2.0.0.Beta4</version>
</dependency>
</dependencies>
- <build>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-
<properties>
</properties>
Added: modules/test/trunk/test/agent/pom.xml
===================================================================
--- modules/test/trunk/test/agent/pom.xml (rev 0)
+++ modules/test/trunk/test/agent/pom.xml 2007-11-07 19:02:05 UTC (rev 8841)
@@ -0,0 +1,119 @@
+<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.portal.test</groupId>
+ <artifactId>jboss-portal-modules-test</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>portal-test-agent</artifactId>
+ <packaging>jboss-sar</packaging>
+ <name>JBoss Portal Modules Test Agent </name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.portal.common</groupId>
+ <artifactId>jboss-portal-modules-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>cargo</groupId>
+ <artifactId>core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>sun-opends</groupId>
+ <artifactId>opends-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossas.core-libs</groupId>
+ <artifactId>jboss-transaction</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossas.core-libs</groupId>
+ <artifactId>jnpserver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossas.core-libs</groupId>
+ <artifactId>jboss-jca</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossas.core-libs</groupId>
+ <artifactId>jboss-local-jdbc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossas.core-libs</groupId>
+ <artifactId>jboss</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portal.test</groupId>
+ <artifactId>portal-test</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portal.test</groupId>
+ <artifactId>portal-test-jboss</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>resources</directory>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-packaging-maven-plugin</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <excludes>
+ <exclude>jboss:jboss-jmx</exclude>
+ <exclude>jboss:jboss-backport-concurrent</exclude>
+ <exclude>jboss:jboss-common-logging-spi</exclude>
+ <exclude>junit:junit</exclude>
+ <exclude>jboss:jboss-remoting</exclude>
+ <exclude>jboss.jbossas.core-libs:jboss-local-jdbc</exclude>
+ <exclude>javax.servlet:servlet-api</exclude>
+ <exclude>ant:ant</exclude>
+ <exclude>jboss.jbossas.core-libs:jboss</exclude>
+ <exclude>jboss.jbossas.core-libs:jnpserver</exclude>
+ <exclude>ant:ant-launcher</exclude>
+ <exclude>jboss:jboss-common-core</exclude>
+ <exclude>jboss:jboss-j2ee</exclude>
+ <exclude>jboss:jboss-system</exclude>
+ <exclude>ant:ant-nodeps</exclude>
+ <exclude>javax.activation:activation</exclude>
+ <exclude>jboss.jbossas.core-libs:jboss-jca</exclude>
+ <exclude>cargo:core</exclude>
+ <exclude>hibernate:hibernate3</exclude>
+ <exclude>apache-xerces:xml-apis</exclude>
+ <exclude>jboss.jbossas.core-libs:jboss-transaction</exclude>
+ <exclude>dom4j:dom4j</exclude>
+ <exclude>oswego-concurrent:concurrent</exclude>
+ <exclude>apache-slide:webdavlib</exclude>
+ <exclude>sun-opends:opends-core</exclude>
+ <exclude>apache-httpclient:commons-httpclient</exclude>
+ <exclude>apache-log4j:log4j</exclude>
+ <exclude>org.codehaus.cargo:cargo-core-uberjar</exclude>
+ <exclude>xml-apis:xml-apis</exclude>
+ <exclude>ant:ant-junit</exclude>
+ </excludes>
+ <libDirectory>${project.build.directory}/${project.build.finalName}</libDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+
+ </properties>
+</project>
\ No newline at end of file
Modified: modules/test/trunk/test/core/pom.xml
===================================================================
--- modules/test/trunk/test/core/pom.xml 2007-11-07 18:04:40 UTC (rev 8840)
+++ modules/test/trunk/test/core/pom.xml 2007-11-07 19:02:05 UTC (rev 8841)
@@ -2,11 +2,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.jboss.portal.test</groupId>
- <artifactId>jboss-portal-modules-test-root</artifactId>
+ <artifactId>jboss-portal-modules-test</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-portal-modules-test-core</artifactId>
+ <artifactId>portal-test</artifactId>
<packaging>jar</packaging>
<name>JBoss Portal Modules Test Core</name>
@@ -14,52 +14,42 @@
<dependency>
<groupId>org.jboss.portal.common</groupId>
<artifactId>jboss-portal-modules-common</artifactId>
- <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cargo</groupId>
<artifactId>core</artifactId>
- <version>0.9-portal</version>
</dependency>
<dependency>
<groupId>sun-opends</groupId>
<artifactId>opends-core</artifactId>
- <version>1.0.0-BUILD04</version>
</dependency>
<dependency>
<groupId>hibernate</groupId>
<artifactId>hibernate3</artifactId>
- <version>3.2.3.GA</version>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
- <version>1.6.1</version>
</dependency>
<dependency>
<groupId>jboss.jbossas.core-libs</groupId>
<artifactId>jboss-transaction</artifactId>
- <version>4.0.4.GA</version>
</dependency>
<dependency>
<groupId>jboss.jbossas.core-libs</groupId>
<artifactId>jnpserver</artifactId>
- <version>4.0.4.GA</version>
</dependency>
<dependency>
<groupId>jboss.jbossas.core-libs</groupId>
<artifactId>jboss-jca</artifactId>
- <version>4.0.4.GA</version>
</dependency>
<dependency>
<groupId>jboss.jbossas.core-libs</groupId>
<artifactId>jboss-local-jdbc</artifactId>
- <version>4.0.4.GA</version>
</dependency>
<dependency>
<groupId>jboss.jbossas.core-libs</groupId>
<artifactId>jboss</artifactId>
- <version>4.0.4.GA</version>
</dependency>
</dependencies>
@@ -78,11 +68,23 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <skip>true</skip>
+ <finalName>opends</finalName>
+ <!--<appendAssemblyId>false</appendAssemblyId>-->
+ <descriptors>
+ <descriptor>src/assembly/opends.xml</descriptor>
+ </descriptors>
</configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
Added: modules/test/trunk/test/core/src/assembly/opends.xml
===================================================================
--- modules/test/trunk/test/core/src/assembly/opends.xml (rev 0)
+++ modules/test/trunk/test/core/src/assembly/opends.xml 2007-11-07 19:02:05 UTC (rev 8841)
@@ -0,0 +1,12 @@
+<assembly>
+ <id>config</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>resources/config</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Modified: modules/test/trunk/test/generic/pom.xml
===================================================================
--- modules/test/trunk/test/generic/pom.xml 2007-11-07 18:04:40 UTC (rev 8840)
+++ modules/test/trunk/test/generic/pom.xml 2007-11-07 19:02:05 UTC (rev 8841)
@@ -2,11 +2,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.jboss.portal.test</groupId>
- <artifactId>jboss-portal-modules-test-root</artifactId>
+ <artifactId>jboss-portal-modules-test</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-portal-modules-test-generic</artifactId>
+ <artifactId>portal-test-generic</artifactId>
<packaging>jar</packaging>
<name>JBoss Portal Modules Test Generic</name>
@@ -14,57 +14,46 @@
<dependency>
<groupId>org.jboss.portal.common</groupId>
<artifactId>jboss-portal-modules-common</artifactId>
- <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cargo</groupId>
<artifactId>core</artifactId>
- <version>0.9-portal</version>
</dependency>
<dependency>
<groupId>sun-opends</groupId>
<artifactId>opends-core</artifactId>
- <version>1.0.0-BUILD04</version>
</dependency>
<dependency>
<groupId>hibernate</groupId>
<artifactId>hibernate3</artifactId>
- <version>3.2.3.GA</version>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
- <version>1.6.1</version>
</dependency>
<dependency>
<groupId>jboss.jbossas.core-libs</groupId>
<artifactId>jboss-transaction</artifactId>
- <version>4.0.4.GA</version>
</dependency>
<dependency>
<groupId>jboss.jbossas.core-libs</groupId>
<artifactId>jnpserver</artifactId>
- <version>4.0.4.GA</version>
</dependency>
<dependency>
<groupId>jboss.jbossas.core-libs</groupId>
<artifactId>jboss-jca</artifactId>
- <version>4.0.4.GA</version>
</dependency>
<dependency>
<groupId>jboss.jbossas.core-libs</groupId>
<artifactId>jboss-local-jdbc</artifactId>
- <version>4.0.4.GA</version>
</dependency>
<dependency>
<groupId>jboss.jbossas.core-libs</groupId>
<artifactId>jboss</artifactId>
- <version>4.0.4.GA</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-remoting</artifactId>
- <version>2.2.1.GA</version>
</dependency>
</dependencies>
@@ -98,13 +87,13 @@
<!--</archive>-->
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
+ <!--<plugin>-->
+ <!--<groupId>org.apache.maven.plugins</groupId>-->
+ <!--<artifactId>maven-surefire-plugin</artifactId>-->
+ <!--<configuration>-->
+ <!--<skip>true</skip>-->
+ <!--</configuration>-->
+ <!--</plugin>-->
</plugins>
</build>
Modified: modules/test/trunk/test/jboss/pom.xml
===================================================================
--- modules/test/trunk/test/jboss/pom.xml 2007-11-07 18:04:40 UTC (rev 8840)
+++ modules/test/trunk/test/jboss/pom.xml 2007-11-07 19:02:05 UTC (rev 8841)
@@ -2,11 +2,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.jboss.portal.test</groupId>
- <artifactId>jboss-portal-modules-test-root</artifactId>
+ <artifactId>jboss-portal-modules-test</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-portal-modules-test-jboss</artifactId>
+ <artifactId>portal-test-jboss</artifactId>
<packaging>jar</packaging>
<name>JBoss Portal Modules Test JBoss</name>
@@ -14,57 +14,46 @@
<dependency>
<groupId>org.jboss.portal.common</groupId>
<artifactId>jboss-portal-modules-common</artifactId>
- <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cargo</groupId>
<artifactId>core</artifactId>
- <version>0.9-portal</version>
</dependency>
<dependency>
<groupId>sun-opends</groupId>
<artifactId>opends-core</artifactId>
- <version>1.0.0-BUILD04</version>
</dependency>
<dependency>
<groupId>hibernate</groupId>
<artifactId>hibernate3</artifactId>
- <version>3.2.3.GA</version>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
- <version>1.6.1</version>
</dependency>
<dependency>
<groupId>jboss.jbossas.core-libs</groupId>
<artifactId>jboss-transaction</artifactId>
- <version>4.0.4.GA</version>
</dependency>
<dependency>
<groupId>jboss.jbossas.core-libs</groupId>
<artifactId>jnpserver</artifactId>
- <version>4.0.4.GA</version>
</dependency>
<dependency>
<groupId>jboss.jbossas.core-libs</groupId>
<artifactId>jboss-jca</artifactId>
- <version>4.0.4.GA</version>
</dependency>
<dependency>
<groupId>jboss.jbossas.core-libs</groupId>
<artifactId>jboss-local-jdbc</artifactId>
- <version>4.0.4.GA</version>
</dependency>
<dependency>
<groupId>jboss.jbossas.core-libs</groupId>
<artifactId>jboss</artifactId>
- <version>4.0.4.GA</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-remoting</artifactId>
- <version>2.2.1.GA</version>
</dependency>
</dependencies>
@@ -81,13 +70,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: modules/test/trunk/tooling/ant/pom.xml
===================================================================
--- modules/test/trunk/tooling/ant/pom.xml 2007-11-07 18:04:40 UTC (rev 8840)
+++ modules/test/trunk/tooling/ant/pom.xml 2007-11-07 19:02:05 UTC (rev 8841)
@@ -14,40 +14,21 @@
<dependency>
<groupId>ant</groupId>
<artifactId>ant-junit</artifactId>
- <version>1.6.5</version>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</dependency>
<dependency>
<groupId>org.jboss.portal.test</groupId>
<artifactId>jboss-unit</artifactId>
- <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.portal.test</groupId>
<artifactId>jboss-unit-tooling</artifactId>
- <version>1.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
- <build>
-
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-
<properties>
</properties>
Modified: modules/test/trunk/tooling/core/pom.xml
===================================================================
--- modules/test/trunk/tooling/core/pom.xml 2007-11-07 18:04:40 UTC (rev 8840)
+++ modules/test/trunk/tooling/core/pom.xml 2007-11-07 19:02:05 UTC (rev 8841)
@@ -14,30 +14,14 @@
<dependency>
<groupId>ant</groupId>
<artifactId>ant-junit</artifactId>
- <version>1.6.5</version>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</dependency>
</dependencies>
- <build>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-
<properties>
</properties>
Modified: modules/test/trunk/tooling/maven2/pom.xml
===================================================================
--- modules/test/trunk/tooling/maven2/pom.xml 2007-11-07 18:04:40 UTC (rev 8840)
+++ modules/test/trunk/tooling/maven2/pom.xml 2007-11-07 19:02:05 UTC (rev 8841)
@@ -14,57 +14,38 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0.6</version>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-junit</artifactId>
- <version>1.6.5</version>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</dependency>
<dependency>
<groupId>org.jboss.portal.test</groupId>
<artifactId>jboss-unit</artifactId>
- <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.portal.test</groupId>
<artifactId>jboss-unit-tooling</artifactId>
- <version>1.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+
<properties/>
</project>
Modified: modules/test/trunk/tooling/pom.xml
===================================================================
--- modules/test/trunk/tooling/pom.xml 2007-11-07 18:04:40 UTC (rev 8840)
+++ modules/test/trunk/tooling/pom.xml 2007-11-07 19:02:05 UTC (rev 8841)
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.jboss.portal.test</groupId>
- <artifactId>jboss-portal-modules-test-root</artifactId>
+ <artifactId>jboss-portal-modules-test</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/trunk/unit/pom.xml
===================================================================
--- modules/test/trunk/unit/pom.xml 2007-11-07 18:04:40 UTC (rev 8840)
+++ modules/test/trunk/unit/pom.xml 2007-11-07 19:02:05 UTC (rev 8841)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.jboss.portal.test</groupId>
- <artifactId>jboss-portal-modules-test-root</artifactId>
+ <artifactId>jboss-portal-modules-test</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -12,20 +12,6 @@
<dependencies/>
- <build>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-
<properties>
</properties>
More information about the portal-commits
mailing list