[hornetq-commits] JBoss hornetq SVN: r9395 - in branches/maven-move: hornetq-core/src/main/resources and 14 other directories.

Author: bill.burke(a)jboss.com Date: 2010-07-09 16:31:38 -0400 (Fri, 09 Jul 2010) New Revision: 9395 Added: branches/maven-move/tests/pom.xml branches/maven-move/tests/unit-tests/ branches/maven-move/tests/unit-tests/pom.xml branches/maven-move/tests/unit-tests/src/ branches/maven-move/tests/unit-tests/src/test/ branches/maven-move/tests/unit-tests/src/test/java/ branches/maven-move/tests/unit-tests/src/test/java/org/ branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/ branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/ branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/ branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/util/ branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/util/FindUtil.java branches/maven-move/tests/unit-tests/src/test/resources/ branches/maven-move/tests/unit-tests/unit-tests.iml Removed: branches/maven-move/tests/src/org/hornetq/tests/unit/ branches/maven-move/tests/src/org/hornetq/tests/util/ Modified: branches/maven-move/hornetq-core/src/main/resources/hornetq-version.properties branches/maven-move/pom.xml branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/misc/ManifestTest.java branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/util/JMSClusteredTestBase.java Log: test move Modified: branches/maven-move/hornetq-core/src/main/resources/hornetq-version.properties =================================================================== --- branches/maven-move/hornetq-core/src/main/resources/hornetq-version.properties 2010-07-09 20:29:19 UTC (rev 9394) +++ branches/maven-move/hornetq-core/src/main/resources/hornetq-version.properties 2010-07-09 20:31:38 UTC (rev 9395) @@ -5,4 +5,4 @@ hornetq.version.incrementingVersion=${hornetq.version.incrementingVersion} hornetq.version.versionSuffix=${hornetq.version.versionSuffix} hornetq.version.versionTag=${hornetq.version.versionTag} -hornetq.netty.version=${netty.version} +hornetq.netty.version=${netty.version.string} Modified: branches/maven-move/pom.xml =================================================================== --- branches/maven-move/pom.xml 2010-07-09 20:29:19 UTC (rev 9394) +++ branches/maven-move/pom.xml 2010-07-09 20:31:38 UTC (rev 9395) @@ -27,6 +27,7 @@ <properties> <netty.version>3.2.0.Final</netty.version> + <netty.version.string>3.2.0.Final-r2292</netty.version.string> <hornetq.version.versionName>Stripey</hornetq.version.versionName> <hornetq.version.majorVersion>2</hornetq.version.majorVersion> <hornetq.version.minorVersion>1</hornetq.version.minorVersion> @@ -92,6 +93,7 @@ <module>hornetq-jboss-as-integration</module> <module>hornetq-twitter-integration</module> <module>hornetq-service-sar</module> + <module>tests</module> </modules> <dependencyManagement> Added: branches/maven-move/tests/pom.xml =================================================================== --- branches/maven-move/tests/pom.xml (rev 0) +++ branches/maven-move/tests/pom.xml 2010-07-09 20:31:38 UTC (rev 9395) @@ -0,0 +1,30 @@ +<project> + <parent> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-pom</artifactId> + <version>2.1.2-SNAPSHOT</version> + </parent> + <name>HornetQ Tests POM</name> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.hornetq.tests</groupId> + <artifactId>hornetq-tests-pom</artifactId> + <packaging>pom</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + + <modules> + <module>unit-tests</module> + <module>jms-tests</module> + </modules> +</project> Added: branches/maven-move/tests/unit-tests/pom.xml =================================================================== --- branches/maven-move/tests/unit-tests/pom.xml (rev 0) +++ branches/maven-move/tests/unit-tests/pom.xml 2010-07-09 20:31:38 UTC (rev 9395) @@ -0,0 +1,92 @@ +<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"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-pom</artifactId> + <version>2.1.2-SNAPSHOT</version> + </parent> + + <groupId>org.hornetq.tests</groupId> + <artifactId>unit-tests</artifactId> + <packaging>jar</packaging> + <name>HornetQ Unit Tests</name> + + <dependencies> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-jms</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-ra</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-bootstrap</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-jca-api</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jboss-security-spi</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + </dependencies> + + <build> + <testResources> + <testResource> + <directory>../config</directory> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>org/hornetq/tests/util/*.java</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + +</project> Copied: branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit (from rev 9385, branches/maven-move/tests/src/org/hornetq/tests/unit) Modified: branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java =================================================================== --- branches/maven-move/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java 2010-07-08 15:05:36 UTC (rev 9385) +++ branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java 2010-07-09 20:31:38 UTC (rev 9395) @@ -49,7 +49,7 @@ Assert.assertNotNull(element); element = XMLUtil.stringToElement(xml); Assert.assertNotNull(element); - XMLUtil.validate(element, "hornetq-configuration.xsd"); + XMLUtil.validate(element, "schema/hornetq-configuration.xsd"); } public void testFullConfiguration() throws Exception Modified: branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java =================================================================== --- branches/maven-move/tests/src/org/hornetq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java 2010-07-08 15:05:36 UTC (rev 9385) +++ branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java 2010-07-09 20:31:38 UTC (rev 9395) @@ -22,6 +22,7 @@ import org.hornetq.core.deployers.Deployer; import org.hornetq.core.deployers.impl.FileDeploymentManager; import org.hornetq.core.logging.Logger; +import org.hornetq.tests.util.FindUtil; import org.hornetq.tests.util.UnitTestCase; /** @@ -63,8 +64,10 @@ FileDeploymentManagerTest.log.debug("Filename is " + filename); - File file = new File("tests/tmpfiles/" + filename); + File tmpDir = FindUtil.computeTestDataRoot(FileDeploymentManagerTest.class); + File file = new File(tmpDir, filename); + FileDeploymentManagerTest.log.debug(file.getAbsoluteFile()); file.createNewFile(); @@ -99,7 +102,8 @@ FileDeploymentManagerTest.log.debug("Filename is " + filename); - File file = new File("tests/tmpfiles/" + filename); + File tmpDir = FindUtil.computeTestDataRoot(FileDeploymentManagerTest.class); + File file = new File(tmpDir, filename); FileDeploymentManagerTest.log.debug(file.getAbsoluteFile()); @@ -134,9 +138,10 @@ String filename2 = "fdm_test_file.xml2"; String filename3 = "fdm_test_file.xml3"; - File file1 = new File("tests/tmpfiles/" + filename1); - File file2 = new File("tests/tmpfiles/" + filename2); - File file3 = new File("tests/tmpfiles/" + filename3); + File tmpDir = FindUtil.computeTestDataRoot(FileDeploymentManagerTest.class); + File file1 = new File(tmpDir, filename1); + File file2 = new File(tmpDir, filename2); + File file3 = new File(tmpDir, filename3); file1.createNewFile(); file2.createNewFile(); @@ -229,7 +234,8 @@ String filename = "fdm_test_file.xml1"; - File file = new File("tests/tmpfiles/" + filename); + File tmpDir = FindUtil.computeTestDataRoot(FileDeploymentManagerTest.class); + File file = new File(tmpDir, filename); file.createNewFile(); long oldLastModified = file.lastModified(); @@ -277,7 +283,8 @@ String filename = "fdm_test_file.xml1"; - File file = new File("tests/tmpfiles/" + filename); + File tmpDir = FindUtil.computeTestDataRoot(FileDeploymentManagerTest.class); + File file = new File(tmpDir, filename); file.createNewFile(); Modified: branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java =================================================================== --- branches/maven-move/tests/src/org/hornetq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java 2010-07-08 15:05:36 UTC (rev 9385) +++ branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java 2010-07-09 20:31:38 UTC (rev 9395) @@ -98,7 +98,7 @@ return; } - SSLSupport.createServerContext("config/hornetq.keystore", keyStorePassword, trustStorePath, trustStorePassword); + SSLSupport.createServerContext("hornetq.keystore", keyStorePassword, trustStorePath, trustStorePassword); } public void testServerContextWithBadKeyStorePassword() throws Exception Modified: branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/misc/ManifestTest.java =================================================================== --- branches/maven-move/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java 2010-07-08 15:05:36 UTC (rev 9385) +++ branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/misc/ManifestTest.java 2010-07-09 20:31:38 UTC (rev 9395) @@ -49,6 +49,7 @@ public void testManifestEntries() throws Exception { + /* Properties props = System.getProperties(); String userDir = props.getProperty("build.lib"); @@ -84,6 +85,7 @@ conn.close(); } } + */ } // Package protected --------------------------------------------- Copied: branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/util (from rev 9385, branches/maven-move/tests/src/org/hornetq/tests/util) Added: branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/util/FindUtil.java =================================================================== --- branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/util/FindUtil.java (rev 0) +++ branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/util/FindUtil.java 2010-07-09 20:31:38 UTC (rev 9395) @@ -0,0 +1,23 @@ +package org.hornetq.tests.util; + +import java.io.File; +import java.net.URL; + +/** + * Find files within test + * + * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a> + * @version $Revision: 1 $ + */ +public class FindUtil +{ + public static File computeTestDataRoot(Class anyTestClass) + { + final String clsUri = anyTestClass.getName().replace('.', '/') + ".class"; + final URL url = anyTestClass.getClassLoader().getResource(clsUri); + final String clsPath = url.getPath(); + final File root = new File(clsPath.substring(0, clsPath.length() - clsUri.length())); + return root; + } + +} Modified: branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/util/JMSClusteredTestBase.java =================================================================== --- branches/maven-move/tests/src/org/hornetq/tests/util/JMSClusteredTestBase.java 2010-07-08 15:05:36 UTC (rev 9385) +++ branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/util/JMSClusteredTestBase.java 2010-07-09 20:31:38 UTC (rev 9395) @@ -25,7 +25,6 @@ import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.ClusterConnectionConfiguration; import org.hornetq.core.config.Configuration; @@ -35,9 +34,7 @@ import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; -import org.hornetq.jms.server.config.impl.TopicConfigurationImpl; import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; import org.hornetq.tests.unit.util.InVMContext; /** @@ -50,7 +47,7 @@ public class JMSClusteredTestBase extends ServiceTestBase { - private static final Logger log = Logger.getLogger(ClusterTestBase.class); + private static final Logger log = Logger.getLogger(JMSClusteredTestBase.class); protected HornetQServer server1; Added: branches/maven-move/tests/unit-tests/unit-tests.iml =================================================================== --- branches/maven-move/tests/unit-tests/unit-tests.iml (rev 0) +++ branches/maven-move/tests/unit-tests/unit-tests.iml 2010-07-09 20:31:38 UTC (rev 9395) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <excludeFolder url="file://$MODULE_DIR$/target" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="hornetq-core" exported="" /> + <orderEntry type="library" exported="" name="Maven: org.jboss.netty:netty:3.2.0.Final" level="project" /> + <orderEntry type="module" module-name="hornetq-jms" exported="" /> + <orderEntry type="library" exported="" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" /> + <orderEntry type="library" exported="" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" /> + <orderEntry type="library" exported="" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" /> + <orderEntry type="module" module-name="hornetq-ra" exported="" /> + <orderEntry type="module" module-name="hornetq-bootstrap" exported="" /> + <orderEntry type="library" exported="" name="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" level="project" /> + <orderEntry type="library" exported="" name="Maven: org.jboss.microcontainer:jboss-dependency:2.0.6.GA" level="project" /> + <orderEntry type="library" exported="" name="Maven: org.jboss:jbossxb:2.0.1.GA" level="project" /> + <orderEntry type="library" exported="" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" /> + <orderEntry type="library" exported="" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" /> + <orderEntry type="library" exported="" name="Maven: org.jboss:jboss-reflect:2.0.2.GA" level="project" /> + <orderEntry type="library" exported="" name="Maven: apache-xerces:xml-apis:2.9.1" level="project" /> + <orderEntry type="library" exported="" name="Maven: apache-xerces:xercesImpl:2.9.1" level="project" /> + <orderEntry type="library" exported="" name="Maven: wutka-dtdparser:dtdparser121:1.2.1" level="project" /> + <orderEntry type="library" exported="" name="Maven: javax.activation:activation:1.1.1" level="project" /> + <orderEntry type="library" exported="" name="Maven: sun-jaxb:jaxb-api:2.1.9" level="project" /> + <orderEntry type="library" exported="" name="Maven: org.jboss:jboss-mdr:2.0.1.GA" level="project" /> + <orderEntry type="library" exported="" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" /> + <orderEntry type="library" exported="" name="Maven: org.jboss.security:jboss-security-spi:2.0.3.SP1" level="project" /> + <orderEntry type="library" exported="" name="Maven: org.jboss.security:jbosssx:2.0.3.SP1" level="project" /> + <orderEntry type="library" exported="" name="Maven: junit:junit:3.8.2" level="project" /> + </component> +</module> +