JBoss hornetq SVN: r10663 - trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-16 06:36:36 -0400 (Mon, 16 May 2011)
New Revision: 10663
Modified:
trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/HornetQServerTestCase.java
Log:
Make test case class abstract (avoids warnings with both Maven and Eclipse)
Modified: trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/HornetQServerTestCase.java
===================================================================
--- trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/HornetQServerTestCase.java 2011-05-13 16:21:21 UTC (rev 10662)
+++ trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/HornetQServerTestCase.java 2011-05-16 10:36:36 UTC (rev 10663)
@@ -33,8 +33,6 @@
import javax.naming.InitialContext;
import javax.transaction.TransactionManager;
-import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
-
import org.hornetq.core.logging.Logger;
import org.hornetq.core.security.Role;
import org.hornetq.core.server.HornetQServer;
@@ -43,6 +41,8 @@
import org.hornetq.jms.tests.tools.container.Server;
import org.hornetq.jms.tests.util.ProxyAssertSupport;
+import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
+
/**
* @author <a href="mailto:adrian@jboss.org">Adrian Brock</a>
* @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a>
@@ -50,7 +50,7 @@
* @author <a href="ataylor(a)redhat.com">Andy Taylor</a>
* @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
*/
-public class HornetQServerTestCase extends ProxyAssertSupport
+public abstract class HornetQServerTestCase extends ProxyAssertSupport
{
// Constants -----------------------------------------------------
@@ -61,8 +61,11 @@
protected final Logger log = Logger.getLogger(getClass());
// Static --------------------------------------------------------
-
- /** Some testcases are time sensitive, and we need to make sure a GC would happen before certain scenarios*/
+
+ /**
+ * Some test cases are time sensitive, and we need to make sure a GC would
+ * happen before certain scenarios.
+ */
public static void forceGC()
{
WeakReference<Object> dumbReference = new WeakReference<Object>(new Object());
@@ -122,7 +125,7 @@
}
catch (Exception e)
{
- // ignore, incase its a remote server
+ // ignore, in case its a remote server
}
if (!started)
{
14 years, 11 months
JBoss hornetq SVN: r10662 - branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-05-13 12:21:21 -0400 (Fri, 13 May 2011)
New Revision: 10662
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java
Log:
fixing tests
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java 2011-05-13 14:00:28 UTC (rev 10661)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java 2011-05-13 16:21:21 UTC (rev 10662)
@@ -413,7 +413,7 @@
public Executor getExecutor()
{
- if (pageSubscription.isPaging())
+ if (pageSubscription != null && pageSubscription.isPaging())
{
// When in page mode, we don't want to have concurrent IO on the same PageStore
return pageSubscription.getExecutor();
14 years, 12 months
JBoss hornetq SVN: r10661 - trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-13 10:00:28 -0400 (Fri, 13 May 2011)
New Revision: 10661
Modified:
trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/HornetQServerTestCase.java
Log:
Adjust configuration file to maven location
Modified: trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/HornetQServerTestCase.java
===================================================================
--- trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/HornetQServerTestCase.java 2011-05-13 13:59:52 UTC (rev 10660)
+++ trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/HornetQServerTestCase.java 2011-05-13 14:00:28 UTC (rev 10661)
@@ -35,7 +35,6 @@
import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
-import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.security.Role;
import org.hornetq.core.server.HornetQServer;
@@ -246,10 +245,9 @@
destroyQueue("Queue4");
}
- // FIXME https://jira.jboss.org/jira/browse/JBMESSAGING-1606
public String[] getContainerConfig()
{
- return new String[] {"config/test-beans.xml"};
+ return new String[] {"test-beans.xml"};
}
protected HornetQServer getJmsServer() throws Exception
14 years, 12 months
JBoss hornetq SVN: r10660 - in trunk/tests/integration-tests: src/test/java/org/hornetq/tests/integration/journal and 1 other directory.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-13 09:59:52 -0400 (Fri, 13 May 2011)
New Revision: 10660
Modified:
trunk/tests/integration-tests/pom.xml
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java
Log:
Set java.library.path in the correct way (remove hack)
Modified: trunk/tests/integration-tests/pom.xml
===================================================================
--- trunk/tests/integration-tests/pom.xml 2011-05-13 13:59:13 UTC (rev 10659)
+++ trunk/tests/integration-tests/pom.xml 2011-05-13 13:59:52 UTC (rev 10660)
@@ -106,12 +106,7 @@
<exclude>**/cluster/failover/Remote*.java</exclude>
<exclude>**/failover/remote/**.java</exclude>
</excludes>
- <systemProperties>
- <property>
- <name>java.library.path</name>
- <value>${user.dir}/distribution/hornetq/src/main/resources/bin</value>
- </property>
- </systemProperties>
+ <argLine>-Djava.library.path=${user.dir}/distribution/hornetq/src/main/resources/bin</argLine>
</configuration>
</plugin>
<plugin>
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java 2011-05-13 13:59:13 UTC (rev 10659)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java 2011-05-13 13:59:52 UTC (rev 10660)
@@ -14,7 +14,6 @@
package org.hornetq.tests.integration.journal;
import java.io.File;
-import java.lang.reflect.Field;
import java.nio.ByteBuffer;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
@@ -131,10 +130,6 @@
File file = new File(getTestDir());
deleteDirectory(file);
file.mkdir();
-
- Field fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths");
- fieldSysPath.setAccessible(true);
- fieldSysPath.set(null, null);
}
// Private -------------------------------------------------------
14 years, 12 months
JBoss hornetq SVN: r10659 - trunk.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-13 09:59:13 -0400 (Fri, 13 May 2011)
New Revision: 10659
Modified:
trunk/.gitignore
Log:
update gitignore
Modified: trunk/.gitignore
===================================================================
--- trunk/.gitignore 2011-05-13 13:58:55 UTC (rev 10658)
+++ trunk/.gitignore 2011-05-13 13:59:13 UTC (rev 10659)
@@ -693,3 +693,15 @@
# /hornetq-twitter-integration/
/hornetq-twitter-integration/target
/hornetq-twitter-integration/.project
+/tests/concurrent-tests/.project
+/tests/integration-tests/.project
+/tests/jms-tests/.project
+/tests/joram-tests/.project
+/tests/performance-tests/.project
+/tests/.project
+/tests/soak-tests/.project
+/tests/stress-tests/.project
+/tests/timing-tests/.project
+/tests/unit-tests/.project
+/docs/rest-manual/.project
+/docs/quickstart-guide/.project
14 years, 12 months
JBoss hornetq SVN: r10658 - trunk/.settings.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-13 09:58:55 -0400 (Fri, 13 May 2011)
New Revision: 10658
Removed:
trunk/.settings/org.eclipse.jdt.ui.prefs
Log:
Remove checked in Eclipse file, maven is managing it now
Deleted: trunk/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- trunk/.settings/org.eclipse.jdt.ui.prefs 2011-05-13 13:26:58 UTC (rev 10657)
+++ trunk/.settings/org.eclipse.jdt.ui.prefs 2011-05-13 13:58:55 UTC (rev 10658)
@@ -1,114 +0,0 @@
-#Mon Jan 18 18:34:30 CET 2010
-cleanup.add_default_serial_version_id=false
-cleanup.add_generated_serial_version_id=true
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_serial_version_id=true
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=true
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=false
-cleanup.make_parameters_final=true
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=true
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=true
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_HornetQ profile
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=false
-formatter_profile=_JBM
-formatter_settings_version=11
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;com;org;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=9999
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.staticondemandthreshold=9999
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecommen!
t_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"/><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * A ${type_name}\n *\n * @author ${user}\n *\n * ${tags}\n *\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="ove!
rridecomment_context" deleted\="false" description\="Comment f!
or overr
iding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*\n * Copyright 2010 Red Hat, Inc.\n * Red Hat licenses this file to you under the Apache License, version\n * 2.0 (the "License"); you may not use this file except in compliance\n * with the License. You may obtain a copy of the License at\n * http\://www.apache.org/licenses/LICENSE-2.0\n * Unless required by applicable law or agreed to in!
writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n * implied. See the License for the specific language governing\n * permissions and limitations under the License.\n */\n\n${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="false" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n // Constants -----------------------------------------------------\n\n // Attributes ----------------------------------------------------\n\n // Static --------------------------------------------------------\n\n // Constructors --------------------------------------------------\n\n // Public --------------------------------------------------------\n\n // Package protected ------------------!
---------------------------\n\n // Protected ---------------!
--------
------------------------------\n\n // Private -------------------------------------------------------\n\n // Inner classes -------------------------------------------------\n\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new c!
atch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};!
</template><template autoinsert\="true" context\="setterbody_c!
ontext"
deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.format_source_code=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=true
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=false
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=true
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=true
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=true
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
14 years, 12 months
JBoss hornetq SVN: r10657 - in trunk: hornetq-core and 1 other directories.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-13 09:26:58 -0400 (Fri, 13 May 2011)
New Revision: 10657
Modified:
trunk/hornetq-core/pom.xml
trunk/hornetq-rest/pom.xml
trunk/pom.xml
Log:
All plugins have a version specified and using the latest versions.
Modified: trunk/hornetq-core/pom.xml
===================================================================
--- trunk/hornetq-core/pom.xml 2011-05-13 12:55:57 UTC (rev 10656)
+++ trunk/hornetq-core/pom.xml 2011-05-13 13:26:58 UTC (rev 10657)
@@ -27,7 +27,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <version>2.8</version>
<configuration>
<doclet>org.jboss.apiviz.APIviz</doclet>
<docletArtifact>
Modified: trunk/hornetq-rest/pom.xml
===================================================================
--- trunk/hornetq-rest/pom.xml 2011-05-13 12:55:57 UTC (rev 10656)
+++ trunk/hornetq-rest/pom.xml 2011-05-13 13:26:58 UTC (rev 10657)
@@ -117,15 +117,9 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.3</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -135,28 +129,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <linkXref>true</linkXref>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.6</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <configuration/>
- <executions>
- <execution>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</pluginManagement>
@@ -183,45 +155,4 @@
</build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <configuration>
- <formats>
- <format>html</format>
- <format>xml</format>
- </formats>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>
- config/jboss_checks.xml
- </configLocation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <minmemory>128m</minmemory>
- <maxmemory>1024m</maxmemory>
- <quiet>false</quiet>
- <aggregate>true</aggregate>
- <excludePackageNames>com.restfully.*:org.jboss.resteasy.examples.*:org.jboss.resteasy.tests.*
- </excludePackageNames>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>
- maven-project-info-reports-plugin
- </artifactId>
- </plugin>
- </plugins>
- </reporting>
</project>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-13 12:55:57 UTC (rev 10656)
+++ trunk/pom.xml 2011-05-13 13:26:58 UTC (rev 10657)
@@ -435,24 +435,24 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.3.3</version>
+ <version>1.4</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.15</version>
+ <version>6.1.26</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</plugin>
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.3</version>
+ <version>2.1.2</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -480,7 +480,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.3</version>
+ <version>2.3.1</version>
<configuration>
<createChecksum>true</createChecksum>
</configuration>
@@ -488,6 +488,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
+ <version>2.5</version>
<configuration>
<linkXref>true</linkXref>
<sourceEncoding>utf-8</sourceEncoding>
@@ -523,7 +524,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -617,7 +618,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
<configuration>
<minmemory>128m</minmemory>
<maxmemory>1024m</maxmemory>
14 years, 12 months
JBoss hornetq SVN: r10656 - trunk.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-13 08:55:57 -0400 (Fri, 13 May 2011)
New Revision: 10656
Modified:
trunk/pom.xml
Log:
Update maven-surefire version to 2.8.1
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-13 11:35:58 UTC (rev 10655)
+++ trunk/pom.xml 2011-05-13 12:55:57 UTC (rev 10656)
@@ -465,7 +465,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4</version>
+ <version>2.8.1</version>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
<runOrder>alphabetical</runOrder>
14 years, 12 months
JBoss hornetq SVN: r10655 - trunk/tests/joram-tests/src/test/java/org/hornetq/jms.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-05-13 07:35:58 -0400 (Fri, 13 May 2011)
New Revision: 10655
Modified:
trunk/tests/joram-tests/src/test/java/org/hornetq/jms/HornetQAdmin.java
Log:
temporarily turn on debug for joram tests
Modified: trunk/tests/joram-tests/src/test/java/org/hornetq/jms/HornetQAdmin.java
===================================================================
--- trunk/tests/joram-tests/src/test/java/org/hornetq/jms/HornetQAdmin.java 2011-05-13 11:00:33 UTC (rev 10654)
+++ trunk/tests/joram-tests/src/test/java/org/hornetq/jms/HornetQAdmin.java 2011-05-13 11:35:58 UTC (rev 10655)
@@ -237,7 +237,7 @@
public void startServer() throws Exception
{
String[] vmArgs = new String[] { "-Dorg.hornetq.logger-delegate-factory-class-name=org.hornetq.jms.SysoutLoggerDelegateFactory" };
- serverProcess = SpawnedVMSupport.spawnVM(SpawnedJMSServer.class.getName(), vmArgs, false);
+ serverProcess = SpawnedVMSupport.spawnVM(SpawnedJMSServer.class.getName(), "-Xms512m -Xmx512m ", vmArgs, true, true);
InputStreamReader isr = new InputStreamReader(serverProcess.getInputStream());
final BufferedReader br = new BufferedReader(isr);
14 years, 12 months
JBoss hornetq SVN: r10654 - in trunk/tests: integration-tests and 5 other directories.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-13 07:00:33 -0400 (Fri, 13 May 2011)
New Revision: 10654
Modified:
trunk/tests/concurrent-tests/pom.xml
trunk/tests/integration-tests/pom.xml
trunk/tests/joram-tests/pom.xml
trunk/tests/performance-tests/pom.xml
trunk/tests/soak-tests/pom.xml
trunk/tests/stress-tests/pom.xml
trunk/tests/timing-tests/pom.xml
Log:
Fix incorrect scope, remove unnecessary plugins and non-standard resource locations
Modified: trunk/tests/concurrent-tests/pom.xml
===================================================================
--- trunk/tests/concurrent-tests/pom.xml 2011-05-13 10:28:07 UTC (rev 10653)
+++ trunk/tests/concurrent-tests/pom.xml 2011-05-13 11:00:33 UTC (rev 10654)
@@ -30,19 +30,19 @@
<groupId>org.hornetq.tests</groupId>
<artifactId>unit-tests</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq.tests</groupId>
<artifactId>integration-tests</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq.tests</groupId>
<artifactId>jms-tests</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
@@ -111,11 +111,6 @@
</dependencies>
<build>
- <testResources>
- <testResource>
- <directory>config</directory>
- </testResource>
- </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -127,14 +122,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: trunk/tests/integration-tests/pom.xml
===================================================================
--- trunk/tests/integration-tests/pom.xml 2011-05-13 10:28:07 UTC (rev 10653)
+++ trunk/tests/integration-tests/pom.xml 2011-05-13 11:00:33 UTC (rev 10654)
@@ -16,13 +16,13 @@
<groupId>org.hornetq.tests</groupId>
<artifactId>jms-tests</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq.tests</groupId>
<artifactId>unit-tests</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
Modified: trunk/tests/joram-tests/pom.xml
===================================================================
--- trunk/tests/joram-tests/pom.xml 2011-05-13 10:28:07 UTC (rev 10653)
+++ trunk/tests/joram-tests/pom.xml 2011-05-13 11:00:33 UTC (rev 10654)
@@ -30,13 +30,13 @@
<groupId>org.hornetq.tests</groupId>
<artifactId>unit-tests</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq.tests</groupId>
<artifactId>integration-tests</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
@@ -105,20 +105,12 @@
</dependencies>
<build>
- <testResources>
- <testResource>
- <directory>config</directory>
- </testResource>
- </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>${skipJoramTests}</skipTests>
- <includes>
- <include>**/*Test.java</include>
- </includes>
</configuration>
</plugin>
</plugins>
Modified: trunk/tests/performance-tests/pom.xml
===================================================================
--- trunk/tests/performance-tests/pom.xml 2011-05-13 10:28:07 UTC (rev 10653)
+++ trunk/tests/performance-tests/pom.xml 2011-05-13 11:00:33 UTC (rev 10654)
@@ -30,19 +30,19 @@
<groupId>org.hornetq.tests</groupId>
<artifactId>unit-tests</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq.tests</groupId>
<artifactId>integration-tests</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq.tests</groupId>
<artifactId>jms-tests</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
@@ -111,11 +111,6 @@
</dependencies>
<build>
- <testResources>
- <testResource>
- <directory>config</directory>
- </testResource>
- </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -127,14 +122,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: trunk/tests/soak-tests/pom.xml
===================================================================
--- trunk/tests/soak-tests/pom.xml 2011-05-13 10:28:07 UTC (rev 10653)
+++ trunk/tests/soak-tests/pom.xml 2011-05-13 11:00:33 UTC (rev 10654)
@@ -30,19 +30,19 @@
<groupId>org.hornetq.tests</groupId>
<artifactId>unit-tests</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq.tests</groupId>
<artifactId>integration-tests</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq.tests</groupId>
<artifactId>jms-tests</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
@@ -111,11 +111,6 @@
</dependencies>
<build>
- <testResources>
- <testResource>
- <directory>config</directory>
- </testResource>
- </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -127,14 +122,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: trunk/tests/stress-tests/pom.xml
===================================================================
--- trunk/tests/stress-tests/pom.xml 2011-05-13 10:28:07 UTC (rev 10653)
+++ trunk/tests/stress-tests/pom.xml 2011-05-13 11:00:33 UTC (rev 10654)
@@ -30,19 +30,19 @@
<groupId>org.hornetq.tests</groupId>
<artifactId>unit-tests</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq.tests</groupId>
<artifactId>integration-tests</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq.tests</groupId>
<artifactId>jms-tests</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
@@ -111,11 +111,6 @@
</dependencies>
<build>
- <testResources>
- <testResource>
- <directory>config</directory>
- </testResource>
- </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -127,14 +122,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: trunk/tests/timing-tests/pom.xml
===================================================================
--- trunk/tests/timing-tests/pom.xml 2011-05-13 10:28:07 UTC (rev 10653)
+++ trunk/tests/timing-tests/pom.xml 2011-05-13 11:00:33 UTC (rev 10654)
@@ -30,19 +30,19 @@
<groupId>org.hornetq.tests</groupId>
<artifactId>unit-tests</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq.tests</groupId>
<artifactId>integration-tests</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq.tests</groupId>
<artifactId>jms-tests</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
@@ -111,30 +111,14 @@
</dependencies>
<build>
- <testResources>
- <testResource>
- <directory>config</directory>
- </testResource>
- </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>${skipTimingTests}</skipTests>
- <includes>
- <include>**/*Test.java</include>
- </includes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
</plugins>
</build>
14 years, 12 months