2:27 p.m.
Author: bdaw
Date: 2007-10-25 15:27:47 -0400 (Thu, 25 Oct 2007)
New Revision: 8775
Added:
modules/test/trunk/test/jboss/pom.xml
Modified:
modules/test/trunk/build/ide/intellij/idea60/modules/test/test.iml
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/src/main/java/org/jboss/portal/test/framework/embedded/opends/OpenDSService.java
modules/test/trunk/tooling/pom.xml
modules/test/trunk/unit/pom.xml
Log:
update of poms for test module
Modified: modules/test/trunk/build/ide/intellij/idea60/modules/test/test.iml
===================================================================
--- modules/test/trunk/build/ide/intellij/idea60/modules/test/test.iml 2007-10-25 12:52:32
UTC (rev 8774)
+++ modules/test/trunk/build/ide/intellij/idea60/modules/test/test.iml 2007-10-25 19:27:47
UTC (rev 8775)
@@ -264,15 +264,6 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/sun-opends/lib/OpenDS.jar!/"
/>
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
<root
url="jar://$MODULE_DIR$/../../../../../../test/selenium-java-client-driver-backport.jar!/"
/>
</CLASSES>
<JAVADOC />
@@ -351,6 +342,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root
url="jar://$MODULE_DIR$/../../../../../../../../../opends-core-1.0.0-BUILD04.jar!/"
/>
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: modules/test/trunk/pom.xml
===================================================================
--- modules/test/trunk/pom.xml 2007-10-25 12:52:32 UTC (rev 8774)
+++ modules/test/trunk/pom.xml 2007-10-25 19:27:47 UTC (rev 8775)
@@ -126,9 +126,10 @@
<module>unit</module>
<module>tooling</module>
<module>mc</module>
- <!--<module>remote</module>-->
- <!--<module>test/generic</module>-->
- <!--<module>test/core</module>-->
+ <module>remote</module>
+ <module>test/core</module>
+ <module>test/generic</module>
+ <module>test/jboss</module>
</modules>
Modified: modules/test/trunk/remote/pom.xml
===================================================================
--- modules/test/trunk/remote/pom.xml 2007-10-25 12:52:32 UTC (rev 8774)
+++ modules/test/trunk/remote/pom.xml 2007-10-25 19:27:47 UTC (rev 8775)
@@ -8,7 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-portal-modules-test-remote</artifactId>
<packaging>jar</packaging>
- <name>JBoss Portal Modules Common Remote</name>
+ <name>JBoss Portal Modules Test Remote</name>
<dependencies>
<dependency>
@@ -17,6 +17,11 @@
<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>
+ </dependency>
+ <dependency>
<groupId>org.jboss.portal.common</groupId>
<artifactId>jboss-portal-modules-common</artifactId>
<version>1.1.0-SNAPSHOT</version>
@@ -29,7 +34,7 @@
<dependency>
<groupId>apache-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>2.0.2</version>
+ <version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
Modified: modules/test/trunk/test/core/pom.xml
===================================================================
--- modules/test/trunk/test/core/pom.xml 2007-10-25 12:52:32 UTC (rev 8774)
+++ modules/test/trunk/test/core/pom.xml 2007-10-25 19:27:47 UTC (rev 8775)
@@ -18,8 +18,8 @@
</dependency>
<dependency>
<groupId>cargo</groupId>
- <artifactId>cargo</artifactId>
- <version>0.5</version>
+ <artifactId>core</artifactId>
+ <version>0.9-portal</version>
</dependency>
<dependency>
<groupId>sun-opends</groupId>
@@ -38,14 +38,29 @@
</dependency>
<dependency>
<groupId>jboss.jbossas.core-libs</groupId>
- <artifactId>jboss-client</artifactId>
- <version>4.0.3.SP1</version>
+ <artifactId>jboss-transaction</artifactId>
+ <version>4.0.4.GA</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.jboss.microcontainer</groupId>-->
- <!--<artifactId>jboss-kernel</artifactId>-->
- <!--<version>2.0.0.Beta4</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>
<build>
Modified: modules/test/trunk/test/generic/pom.xml
===================================================================
--- modules/test/trunk/test/generic/pom.xml 2007-10-25 12:52:32 UTC (rev 8774)
+++ modules/test/trunk/test/generic/pom.xml 2007-10-25 19:27:47 UTC (rev 8775)
@@ -11,6 +11,61 @@
<name>JBoss Portal Modules Test Generic</name>
<dependencies>
+ <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>
<build>
@@ -20,9 +75,23 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
-
<includes><include>org/jboss/portal/test/framework/impl/generic/**</include></includes>
+ <includes>
+
<include>org/jboss/portal/test/framework/impl/generic/**</include>
+
+
<include>org/jboss/portal/test/framework/agent/**</include>
+
<include>org/jboss/portal/test/framework/server/**</include>
+ </includes>
</configuration>
</plugin>
+ <!--<plugin>-->
+ <!--<groupId>org.apache.maven.plugins</groupId>-->
+ <!--<artifactId>maven-jar-plugin</artifactId>-->
+ <!--<configuration>-->
+ <!--<archive>-->
+
<!--<manifestFile>META-INF/MANIFEST.MF</manifestFile>-->
+ <!--</archive>-->
+ <!--</configuration>-->
+ <!--</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Copied: modules/test/trunk/test/jboss/pom.xml (from rev 8774,
modules/test/trunk/test/generic/pom.xml)
===================================================================
--- modules/test/trunk/test/jboss/pom.xml (rev 0)
+++ modules/test/trunk/test/jboss/pom.xml 2007-10-25 19:27:47 UTC (rev 8775)
@@ -0,0 +1,98 @@
+<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-root</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-portal-modules-test-jboss</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Portal Modules Test JBoss</name>
+
+ <dependencies>
+ <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>
+
+ <build>
+ <sourceDirectory>../src/main/java</sourceDirectory>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <includes>
+
<include>org/jboss/portal/test/framework/impl/jboss/**</include>
+
<include>org/jboss/portal/test/framework/embedded/opends/**</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+
+ <properties>
+
+ </properties>
+</project>
Modified:
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/embedded/opends/OpenDSService.java
===================================================================
---
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/embedded/opends/OpenDSService.java 2007-10-25
12:52:32 UTC (rev 8774)
+++
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/embedded/opends/OpenDSService.java 2007-10-25
19:27:47 UTC (rev 8775)
@@ -70,7 +70,9 @@
*/
public void restart()
{
- DirectoryServer.restart(getClass().getName(), "DS restart");
+
+ //TODO:
+ //DirectoryServer.restart(getClass().getName(), "DS restart");
}
public void create() throws Exception
@@ -112,8 +114,9 @@
public void stopService() throws Exception
{
- log.info("Asking DS to shutdown");
- DirectoryServer.shutDown(getClass().getName(), "Shut down DS");
+ //TODO:
+ //log.info("Asking DS to shutdown");
+ //DirectoryServer.shutDown(getClass().getName(), "Shut down DS");
}
public void destroy() throws Exception
Modified: modules/test/trunk/tooling/pom.xml
===================================================================
--- modules/test/trunk/tooling/pom.xml 2007-10-25 12:52:32 UTC (rev 8774)
+++ modules/test/trunk/tooling/pom.xml 2007-10-25 19:27:47 UTC (rev 8775)
@@ -8,7 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-portal-modules-test-tooling</artifactId>
<packaging>jar</packaging>
- <name>JBoss Portal Modules Common Tooling</name>
+ <name>JBoss Portal Modules Test Tooling</name>
<dependencies>
<dependency>
Modified: modules/test/trunk/unit/pom.xml
===================================================================
--- modules/test/trunk/unit/pom.xml 2007-10-25 12:52:32 UTC (rev 8774)
+++ modules/test/trunk/unit/pom.xml 2007-10-25 19:27:47 UTC (rev 8775)
@@ -8,7 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-portal-modules-test-unit</artifactId>
<packaging>jar</packaging>
- <name>JBoss Portal Modules Common Portal</name>
+ <name>JBoss Portal Modules Test Portal</name>
<dependencies/>