JBoss hornetq SVN: r10623 - in trunk/hornetq-core/src/main/java/org/hornetq: utils and 1 other directory.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-11 09:21:17 -0400 (Wed, 11 May 2011)
New Revision: 10623
Modified:
trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/QueueImpl.java
trunk/hornetq-core/src/main/java/org/hornetq/utils/TypedProperties.java
Log:
Fix .equals(o) which didn't check for null argument, and another findbugs warning.
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/QueueImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/QueueImpl.java 2011-05-11 11:02:46 UTC (rev 10622)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/QueueImpl.java 2011-05-11 13:21:17 UTC (rev 10623)
@@ -1362,6 +1362,7 @@
{
return true;
}
+ if (!(other instanceof QueueImpl)) return false;
QueueImpl qother = (QueueImpl)other;
@@ -1932,7 +1933,7 @@
if (count == 0)
{
- // Note - we MUST store the delete after the preceeding ack has been committed to storage, we cannot combine
+ // Note - we MUST store the delete after the preceding ack has been committed to storage, we cannot combine
// the last ack and delete into a single delete.
// This is because otherwise we could have a situation where the same message is being acked concurrently
// from two different queues on different sessions.
@@ -1940,8 +1941,8 @@
// ack isn't committed, then the server crashes and on
// recovery the message is deleted even though the other ack never committed
- // also note then when this happens as part of a trasaction its the tx commt of the ack that is important
- // not this
+ // also note then when this happens as part of a transaction it is the tx commit of the ack that is
+ // important not this
// Also note that this delete shouldn't sync to disk, or else we would build up the executor's queue
// as we can't delete each messaging with sync=true while adding messages transactionally.
Modified: trunk/hornetq-core/src/main/java/org/hornetq/utils/TypedProperties.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/utils/TypedProperties.java 2011-05-11 11:02:46 UTC (rev 10622)
+++ trunk/hornetq-core/src/main/java/org/hornetq/utils/TypedProperties.java 2011-05-11 13:21:17 UTC (rev 10623)
@@ -354,10 +354,6 @@
public Float getFloatProperty(final SimpleString key) throws PropertyConversionException
{
Object value = doGetProperty(key);
- if (value == null)
- {
- return Float.valueOf(null);
- }
if (value instanceof Float)
{
@@ -369,7 +365,7 @@
}
else
{
- throw new PropertyConversionException("Invalid conversion");
+ throw new PropertyConversionException("Invalid conversion: " + key);
}
}
14 years, 12 months
- 1
- 0
JBoss hornetq SVN: r10622 - 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-11 07:02:46 -0400 (Wed, 11 May 2011)
New Revision: 10622
Modified:
trunk/tests/integration-tests/pom.xml
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java
Log:
HACK: Set java.library.path property and force its re-evaluation
Modified: trunk/tests/integration-tests/pom.xml
===================================================================
--- trunk/tests/integration-tests/pom.xml 2011-05-11 11:02:04 UTC (rev 10621)
+++ trunk/tests/integration-tests/pom.xml 2011-05-11 11:02:46 UTC (rev 10622)
@@ -114,7 +114,13 @@
<exclude>**/cluster/failover/Remote*.java</exclude>
<exclude>**/failover/remote/**.java</exclude>
</excludes>
- </configuration>
+ <systemProperties>
+ <property>
+ <name>java.library.path</name>
+ <value>${user.dir}/distribution/hornetq/src/main/resources/bin</value>
+ </property>
+ </systemProperties>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
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-11 11:02:04 UTC (rev 10621)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java 2011-05-11 11:02:46 UTC (rev 10622)
@@ -14,6 +14,7 @@
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;
@@ -130,6 +131,10 @@
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
- 1
- 0
JBoss hornetq SVN: r10621 - in trunk/docs/user-manual: zh and 1 other directory.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-11 07:02:04 -0400 (Wed, 11 May 2011)
New Revision: 10621
Modified:
trunk/docs/user-manual/en/large-messages.xml
trunk/docs/user-manual/zh/large-messages.xml
Log:
Fix manual typo (reported by 'xpromache' on Frenode)
Modified: trunk/docs/user-manual/en/large-messages.xml
===================================================================
--- trunk/docs/user-manual/en/large-messages.xml 2011-05-11 11:01:33 UTC (rev 10620)
+++ trunk/docs/user-manual/en/large-messages.xml 2011-05-11 11:02:04 UTC (rev 10621)
@@ -50,7 +50,7 @@
...
-<large-message-directory>/data/large-messages</large-message-directory>
+<large-messages-directory>/data/large-messages</large-messages-directory>
...
Modified: trunk/docs/user-manual/zh/large-messages.xml
===================================================================
--- trunk/docs/user-manual/zh/large-messages.xml 2011-05-11 11:01:33 UTC (rev 10620)
+++ trunk/docs/user-manual/zh/large-messages.xml 2011-05-11 11:02:04 UTC (rev 10621)
@@ -37,7 +37,7 @@
...
-<large-message-directory>/data/large-messages</large-message-directory>
+<large-messages-directory>/data/large-messages</large-messages-directory>
...
14 years, 12 months
- 1
- 0
JBoss hornetq SVN: r10620 - in trunk: .settings and 1 other directories.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-11 07:01:33 -0400 (Wed, 11 May 2011)
New Revision: 10620
Added:
trunk/etc/
trunk/etc/checkstyle.xml
trunk/etc/org.eclipse.jdt.core.prefs
trunk/etc/org.eclipse.jdt.ui.prefs
Removed:
trunk/.classpath
trunk/.settings/org.eclipse.jdt.core.prefs
trunk/checkstyle.xml
Modified:
trunk/.gitignore
trunk/README
trunk/pom.xml
Log:
Maven now will configure each sub-project identically.
Since there are a number of different configuration files, they are all included
into a new ./etc directory.
(note that there are still problems with the Eclipse set-up)
Deleted: trunk/.classpath
===================================================================
--- trunk/.classpath 2011-05-11 11:00:57 UTC (rev 10619)
+++ trunk/.classpath 2011-05-11 11:01:33 UTC (rev 10620)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
Modified: trunk/.gitignore
===================================================================
--- trunk/.gitignore 2011-05-11 11:00:57 UTC (rev 10619)
+++ trunk/.gitignore 2011-05-11 11:01:33 UTC (rev 10620)
@@ -1,5 +1,6 @@
target
tests/jms-tests/data
+org.maven.ide.eclipse.prefs
# /
/build
Deleted: trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/.settings/org.eclipse.jdt.core.prefs 2011-05-11 11:00:57 UTC (rev 10619)
+++ trunk/.settings/org.eclipse.jdt.core.prefs 2011-05-11 11:01:33 UTC (rev 10620)
@@ -1,276 +0,0 @@
-#Thu May 05 17:33:50 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=optimize out
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=82
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=82
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=82
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=82
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=82
-org.eclipse.jdt.core.formatter.alignment_for_assignment=82
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=82
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=82
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=82
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=82
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=82
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=82
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=82
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=82
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=82
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=82
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=82
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=0
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=3
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=3
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=3
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=3
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=false
Modified: trunk/README
===================================================================
--- trunk/README 2011-05-11 11:00:57 UTC (rev 10619)
+++ trunk/README 2011-05-11 11:01:33 UTC (rev 10620)
@@ -14,8 +14,8 @@
You need Maven 3.X.
-Do note that there are some compatibility issues with Maven 3.X still unsolved [1].
-This is specially true for the 'site' plugin [2].
+Do note that there are some compatibility issues with Maven 3.X still
+unsolved [1]. This is specially true for the 'site' plugin [2].
[1]: <https://cwiki.apache.org/MAVEN/maven-3x-compatibility-notes.html>
[2]: <https://cwiki.apache.org/MAVEN/maven-3x-and-site-plugin.html>
@@ -33,5 +33,9 @@
* Eclipse
-Install the m2Eclipse plugin, and run
- $ mvn eclipse:eclipse
+** Use the Maven eclipse plugin to configure the sub-projects
+
+$ mvn eclipse:eclipse
+
+** Install the m2Eclipse plugin, and use it to import the root
+ project. Each sub-project will be imported automatically.
Deleted: trunk/checkstyle.xml
===================================================================
--- trunk/checkstyle.xml 2011-05-11 11:00:57 UTC (rev 10619)
+++ trunk/checkstyle.xml 2011-05-11 11:01:33 UTC (rev 10620)
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<module name="Checker">
- <module name="FileTabCharacter">
- <property name="eachLine" value="true"/>
- </module>
-
- <module name="RegexpSingleline">
- <!-- \s matches whitespace character, $ matches end of line. -->
- <property name="format" value="\s+$"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
-
- <module name="TreeWalker">
-
- <property name="cacheFile" value="${checkstyle.cache.file}"/>
-
- <!-- Checks for imports -->
- <module name="AvoidStarImport"/>
- <module name="RedundantImport"/>
- <!-- Disabled until checkstyle can recognize imports which are used only by javadoc -->
- <!--<module name="UnusedImports"/>-->
-
- <!-- Modifier Checks -->
- <module name="ModifierOrder"/>
- <module name="RedundantModifier"/>
-
- <!-- Checks for blocks. You know, those {}'s -->
- <module name="LeftCurly"/>
-
- <!-- Checks for common coding problems -->
- <!-- Disabled until http://sourceforge.net/tracker/?func=detail&aid=2843447&group_id=29721&at... is fixed-->
- <!--<module name="DoubleCheckedLocking"/>-->
- <module name="EmptyStatement"/>
- <module name="EqualsHashCode"/>
- <module name="IllegalInstantiation"/>
- <module name="RedundantThrows">
- <property name="allowUnchecked" value="true"/>
- </module>
-
- <!-- Miscellaneous other checks. -->
- <module name="UpperEll"/>
- <module name="PackageAnnotation"/>
- <module name="CovariantEquals"/>
- <module name="ArrayTypeStyle"/>
-
- </module>
-
-</module>
-
Copied: trunk/etc/checkstyle.xml (from rev 10619, trunk/checkstyle.xml)
===================================================================
--- trunk/etc/checkstyle.xml (rev 0)
+++ trunk/etc/checkstyle.xml 2011-05-11 11:01:33 UTC (rev 10620)
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<module name="Checker">
+ <module name="FileTabCharacter">
+ <property name="eachLine" value="true"/>
+ </module>
+
+ <module name="RegexpSingleline">
+ <!-- \s matches whitespace character, $ matches end of line. -->
+ <property name="format" value="\s+$"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module>
+
+ <module name="TreeWalker">
+
+ <property name="cacheFile" value="${checkstyle.cache.file}"/>
+
+ <!-- Checks for imports -->
+ <module name="AvoidStarImport"/>
+ <module name="RedundantImport"/>
+ <!-- Disabled until checkstyle can recognize imports which are used only by javadoc -->
+ <!--<module name="UnusedImports"/>-->
+
+ <!-- Modifier Checks -->
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
+
+ <!-- Checks for blocks. You know, those {}'s -->
+ <module name="LeftCurly"/>
+
+ <!-- Checks for common coding problems -->
+ <!-- Disabled until http://sourceforge.net/tracker/?func=detail&aid=2843447&group_id=29721&at... is fixed-->
+ <!--<module name="DoubleCheckedLocking"/>-->
+ <module name="EmptyStatement"/>
+ <module name="EqualsHashCode"/>
+ <module name="IllegalInstantiation"/>
+ <module name="RedundantThrows">
+ <property name="allowUnchecked" value="true"/>
+ </module>
+
+ <!-- Miscellaneous other checks. -->
+ <module name="UpperEll"/>
+ <module name="PackageAnnotation"/>
+ <module name="CovariantEquals"/>
+ <module name="ArrayTypeStyle"/>
+
+ </module>
+
+</module>
+
Copied: trunk/etc/org.eclipse.jdt.core.prefs (from rev 10619, trunk/.settings/org.eclipse.jdt.core.prefs)
===================================================================
--- trunk/etc/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/etc/org.eclipse.jdt.core.prefs 2011-05-11 11:01:33 UTC (rev 10620)
@@ -0,0 +1,291 @@
+#Tue May 10 16:33:23 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=optimize out
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=82
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=82
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=82
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=82
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=82
+org.eclipse.jdt.core.formatter.alignment_for_assignment=82
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=82
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=82
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=82
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=82
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=82
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=82
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=82
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=82
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=82
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=82
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=82
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=0
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
+org.eclipse.jdt.core.formatter.comment.format_block_comments=false
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=3
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=3
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
+org.eclipse.jdt.core.formatter.indentation.size=3
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=3
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=false
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
Added: trunk/etc/org.eclipse.jdt.ui.prefs
===================================================================
--- trunk/etc/org.eclipse.jdt.ui.prefs (rev 0)
+++ trunk/etc/org.eclipse.jdt.ui.prefs 2011-05-11 11:01:33 UTC (rev 10620)
@@ -0,0 +1,114 @@
+#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
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-11 11:00:57 UTC (rev 10619)
+++ trunk/pom.xml 2011-05-11 11:01:33 UTC (rev 10620)
@@ -555,6 +555,30 @@
<effort>Max</effort>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.8</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
+ <sourceExcludes>
+ <sourceExclude>**/.svn/**</sourceExclude>
+ </sourceExcludes>
+ <additionalConfig>
+ <file>
+ <name>.settings/org.eclipse.jdt.core.prefs</name>
+ <location>${user.dir}/etc/org.eclipse.jdt.core.prefs</location>
+ </file>
+ <file>
+ <name>.settings/org.eclipse.jdt.ui.prefs</name>
+ <location>${user.dir}/etc/org.eclipse.jdt.ui.prefs</location>
+ </file>
+ </additionalConfig>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
14 years, 12 months
- 1
- 0
JBoss hornetq SVN: r10619 - trunk/hornetq-rest/hornetq-rest/.settings.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-11 07:00:57 -0400 (Wed, 11 May 2011)
New Revision: 10619
Removed:
trunk/hornetq-rest/hornetq-rest/.settings/org.eclipse.jdt.core.prefs
Log:
No point in having just this one eclipse sub-project file checked-in
Deleted: trunk/hornetq-rest/hornetq-rest/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/hornetq-rest/hornetq-rest/.settings/org.eclipse.jdt.core.prefs 2011-05-11 08:15:37 UTC (rev 10618)
+++ trunk/hornetq-rest/hornetq-rest/.settings/org.eclipse.jdt.core.prefs 2011-05-11 11:00:57 UTC (rev 10619)
@@ -1,5 +0,0 @@
-#Thu Nov 18 19:59:11 CST 2010
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
14 years, 12 months
- 1
- 0
JBoss hornetq SVN: r10618 - in branches/Branch_2_2_EAP/docs/user-manual: zh and 1 other directory.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-11 04:15:37 -0400 (Wed, 11 May 2011)
New Revision: 10618
Modified:
branches/Branch_2_2_EAP/docs/user-manual/en/large-messages.xml
branches/Branch_2_2_EAP/docs/user-manual/zh/large-messages.xml
Log:
Fix manual typo (reported by 'xpromache' on Frenode)
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/large-messages.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/large-messages.xml 2011-05-10 14:31:58 UTC (rev 10617)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/large-messages.xml 2011-05-11 08:15:37 UTC (rev 10618)
@@ -51,7 +51,7 @@
...
-<large-message-directory>/data/large-messages</large-message-directory>
+<large-messages-directory>/data/large-messages</large-messages-directory>
...
Modified: branches/Branch_2_2_EAP/docs/user-manual/zh/large-messages.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/zh/large-messages.xml 2011-05-10 14:31:58 UTC (rev 10617)
+++ branches/Branch_2_2_EAP/docs/user-manual/zh/large-messages.xml 2011-05-11 08:15:37 UTC (rev 10618)
@@ -37,7 +37,7 @@
...
-<large-message-directory>/data/large-messages</large-message-directory>
+<large-messages-directory>/data/large-messages</large-messages-directory>
...
14 years, 12 months
- 1
- 0
JBoss hornetq SVN: r10617 - in branches/Branch_2_2_2_REST: examples/dup-send and 3 other directories.
by do-not-reply＠jboss.org
Author: bill.burke(a)jboss.com
Date: 2011-05-10 10:31:58 -0400 (Tue, 10 May 2011)
New Revision: 10617
Modified:
branches/Branch_2_2_2_REST/examples/dup-send/pom.xml
branches/Branch_2_2_2_REST/examples/javascript-chat/pom.xml
branches/Branch_2_2_2_REST/examples/jms-to-rest/pom.xml
branches/Branch_2_2_2_REST/examples/push/pom.xml
branches/Branch_2_2_2_REST/pom.xml
Log:
pom messup
Modified: branches/Branch_2_2_2_REST/examples/dup-send/pom.xml
===================================================================
--- branches/Branch_2_2_2_REST/examples/dup-send/pom.xml 2011-05-10 12:04:54 UTC (rev 10616)
+++ branches/Branch_2_2_2_REST/examples/dup-send/pom.xml 2011-05-10 14:31:58 UTC (rev 10617)
@@ -3,11 +3,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.hornetq.rest.examples</groupId>
<artifactId>dup-send</artifactId>
- <version>2.2.0.CR1</version>
+ <version>2.2.2.1</version>
<packaging>war</packaging>
<properties>
- <resteasy.version>2.0.1.GA</resteasy.version>
- <hornetq.version>2.2.0.CR1</hornetq.version>
+ <resteasy.version>2.1.0.GA</resteasy.version>
+ <hornetq.version>2.2.2.Final</hornetq.version>
</properties>
<name>Duplicate Send Demo</name>
<repositories>
@@ -123,7 +123,7 @@
<dependency>
<groupId>org.hornetq.rest</groupId>
<artifactId>hornetq-rest</artifactId>
- <version>${hornetq.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
Modified: branches/Branch_2_2_2_REST/examples/javascript-chat/pom.xml
===================================================================
--- branches/Branch_2_2_2_REST/examples/javascript-chat/pom.xml 2011-05-10 12:04:54 UTC (rev 10616)
+++ branches/Branch_2_2_2_REST/examples/javascript-chat/pom.xml 2011-05-10 14:31:58 UTC (rev 10617)
@@ -3,11 +3,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.hornetq.rest.examples</groupId>
<artifactId>javascript-chat</artifactId>
- <version>2.2.0.CR1</version>
+ <version>2.2.2.1</version>
<packaging>war</packaging>
<properties>
<resteasy.version>2.0.1.GA</resteasy.version>
- <hornetq.version>2.2.0.CR1</hornetq.version>
+ <hornetq.version>2.2.2.Final</hornetq.version>
</properties>
<name>Browser Chat App</name>
<repositories>
@@ -137,7 +137,7 @@
<dependency>
<groupId>org.hornetq.rest</groupId>
<artifactId>hornetq-rest</artifactId>
- <version>${hornetq.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
Modified: branches/Branch_2_2_2_REST/examples/jms-to-rest/pom.xml
===================================================================
--- branches/Branch_2_2_2_REST/examples/jms-to-rest/pom.xml 2011-05-10 12:04:54 UTC (rev 10616)
+++ branches/Branch_2_2_2_REST/examples/jms-to-rest/pom.xml 2011-05-10 14:31:58 UTC (rev 10617)
@@ -3,11 +3,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.hornetq.rest.examples</groupId>
<artifactId>mixed-jms-rest</artifactId>
- <version>2.2.0.CR1</version>
+ <version>2.2.2.1</version>
<packaging>war</packaging>
<properties>
- <resteasy.version>2.0.1.GA</resteasy.version>
- <hornetq.version>2.2.0.CR1</hornetq.version>
+ <resteasy.version>2.1.0.GA</resteasy.version>
+ <hornetq.version>2.2.2.Final</hornetq.version>
</properties>
<name>Mixed JMS and REST Producers/Consumers</name>
<repositories>
@@ -123,7 +123,7 @@
<dependency>
<groupId>org.hornetq.rest</groupId>
<artifactId>hornetq-rest</artifactId>
- <version>${hornetq.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
Modified: branches/Branch_2_2_2_REST/examples/push/pom.xml
===================================================================
--- branches/Branch_2_2_2_REST/examples/push/pom.xml 2011-05-10 12:04:54 UTC (rev 10616)
+++ branches/Branch_2_2_2_REST/examples/push/pom.xml 2011-05-10 14:31:58 UTC (rev 10617)
@@ -3,11 +3,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.hornetq.rest.examples</groupId>
<artifactId>push</artifactId>
- <version>2.2.0.CR1</version>
+ <version>2.2.2.1</version>
<packaging>war</packaging>
<properties>
- <resteasy.version>2.0.1.GA</resteasy.version>
- <hornetq.version>2.2.0.CR1</hornetq.version>
+ <resteasy.version>2.1.0.GA</resteasy.version>
+ <hornetq.version>2.2.2.Final</hornetq.version>
</properties>
<name>Push Subscriptions</name>
<repositories>
@@ -129,7 +129,7 @@
<dependency>
<groupId>org.hornetq.rest</groupId>
<artifactId>hornetq-rest</artifactId>
- <version>${hornetq.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
Modified: branches/Branch_2_2_2_REST/pom.xml
===================================================================
--- branches/Branch_2_2_2_REST/pom.xml 2011-05-10 12:04:54 UTC (rev 10616)
+++ branches/Branch_2_2_2_REST/pom.xml 2011-05-10 14:31:58 UTC (rev 10617)
@@ -5,7 +5,7 @@
<name>HornetQ REST Interface Parent POM</name>
<groupId>org.hornetq.rest</groupId>
<artifactId>hornetq-rest-all</artifactId>
- <version>2.2.2.Final</version>
+ <version>2.2.2.1</version>
<packaging>pom</packaging>
<properties>
14 years, 12 months
- 1
- 0
JBoss hornetq SVN: r10616 - trunk.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-10 08:04:54 -0400 (Tue, 10 May 2011)
New Revision: 10616
Modified:
trunk/.gitignore
Log:
Ignore tests/jms-tests/data
Modified: trunk/.gitignore
===================================================================
--- trunk/.gitignore 2011-05-10 12:04:35 UTC (rev 10615)
+++ trunk/.gitignore 2011-05-10 12:04:54 UTC (rev 10616)
@@ -1,4 +1,5 @@
target
+tests/jms-tests/data
# /
/build
14 years, 12 months
- 1
- 0
JBoss hornetq SVN: r10615 - in trunk: .settings and 1 other directory.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-10 08:04:35 -0400 (Tue, 10 May 2011)
New Revision: 10615
Modified:
trunk/.classpath
trunk/.project
trunk/.settings/org.eclipse.jdt.core.prefs
trunk/README
Log:
Fix a number of issues with existing Eclipse configuration files
Modified: trunk/.classpath
===================================================================
--- trunk/.classpath 2011-05-09 17:05:18 UTC (rev 10614)
+++ trunk/.classpath 2011-05-10 12:04:35 UTC (rev 10615)
@@ -1,137 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="**/.svn/**/*" kind="src" path="src/main"/>
- <classpathentry kind="src" path="src/config/common"/>
- <classpathentry kind="src" path="build/src"/>
- <classpathentry kind="src" path="tests/jms-tests/config"/>
- <classpathentry kind="src" path="tests/config"/>
- <classpathentry excluding="**/.svn/**/*" kind="src" path="tests/src">
- <attributes>
- <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="trunk/native/bin"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="tests/jms-tests/src"/>
- <classpathentry kind="src" path="tests/joram-tests/src"/>
- <classpathentry kind="src" path="tests/joram-tests/config"/>
- <classpathentry kind="src" path="examples/core/embedded/src"/>
- <classpathentry kind="src" path="examples/core/microcontainer/src"/>
- <classpathentry kind="src" path="examples/core/embedded-remote/src"/>
- <classpathentry kind="src" path="examples/core/perf/src"/>
- <classpathentry kind="src" path="examples/core/twitter-connector/src"/>
- <classpathentry kind="src" path="examples/jms/applet/src"/>
- <classpathentry kind="src" path="examples/jms/application-layer-failover/src"/>
- <classpathentry kind="src" path="examples/jms/bridge/src"/>
- <classpathentry kind="src" path="examples/jms/browser/src"/>
- <classpathentry kind="src" path="examples/jms/client-kickoff/src"/>
- <classpathentry kind="src" path="examples/jms/client-side-load-balancing/src"/>
- <classpathentry kind="src" path="examples/jms/clustered-durable-subscription/src"/>
- <classpathentry kind="src" path="examples/jms/clustered-queue/src"/>
- <classpathentry kind="src" path="examples/jms/clustered-standalone/src"/>
- <classpathentry kind="src" path="examples/jms/clustered-topic/src"/>
- <classpathentry kind="src" path="examples/common/src"/>
- <classpathentry kind="src" path="examples/jms/consumer-rate-limit/src"/>
- <classpathentry kind="src" path="examples/jms/dead-letter/src"/>
- <classpathentry kind="src" path="examples/jms/delayed-redelivery/src"/>
- <classpathentry kind="src" path="examples/jms/divert/src"/>
- <classpathentry kind="src" path="examples/jms/durable-subscription/src"/>
- <classpathentry kind="src" path="examples/jms/embedded/src"/>
- <classpathentry kind="src" path="examples/jms/expiry/src"/>
- <classpathentry kind="src" path="examples/jms/http-transport/src"/>
- <classpathentry kind="src" path="examples/jms/instantiate-connection-factory/src"/>
- <classpathentry kind="src" path="examples/jms/interceptor/src"/>
- <classpathentry kind="src" path="examples/jms/jaas/src"/>
- <classpathentry kind="src" path="examples/jms/jms-bridge/src"/>
- <classpathentry kind="src" path="examples/jms/jmx/src"/>
- <classpathentry kind="src" path="examples/jms/large-message/src"/>
- <classpathentry kind="src" path="examples/jms/last-value-queue/src"/>
- <classpathentry kind="src" path="examples/jms/management/src"/>
- <classpathentry kind="src" path="examples/jms/management-notifications/src"/>
- <classpathentry kind="src" path="examples/jms/message-counters/src"/>
- <classpathentry kind="src" path="examples/jms/message-group/src"/>
- <classpathentry kind="src" path="examples/jms/message-priority/src"/>
- <classpathentry kind="src" path="examples/jms/no-consumer-buffering/src"/>
- <classpathentry kind="src" path="examples/jms/non-transaction-failover/src"/>
- <classpathentry kind="src" path="examples/jms/paging/src"/>
- <classpathentry kind="src" path="examples/jms/perf/src"/>
- <classpathentry kind="src" path="examples/jms/pre-acknowledge/src"/>
- <classpathentry kind="src" path="examples/jms/producer-rate-limit/src"/>
- <classpathentry kind="src" path="examples/jms/queue/src"/>
- <classpathentry kind="src" path="examples/jms/queue-message-redistribution/src"/>
- <classpathentry kind="src" path="examples/jms/queue-requestor/src"/>
- <classpathentry kind="src" path="examples/jms/queue-selector/src"/>
- <classpathentry kind="src" path="examples/jms/reattach-node/src"/>
- <classpathentry kind="src" path="examples/jms/request-reply/src"/>
- <classpathentry kind="src" path="examples/jms/scheduled-message/src"/>
- <classpathentry kind="src" path="examples/jms/security/src"/>
- <classpathentry kind="src" path="examples/jms/send-acknowledgements/src"/>
- <classpathentry kind="src" path="examples/jms/ssl-enabled/src"/>
- <classpathentry kind="src" path="examples/jms/static-selector/src"/>
- <classpathentry kind="src" path="examples/jms/static-selector-jms/src"/>
- <classpathentry kind="src" path="examples/jms/stomp/src"/>
- <classpathentry kind="src" path="examples/jms/stomp-websockets/src"/>
- <classpathentry kind="src" path="examples/jms/symmetric-cluster/src"/>
- <classpathentry kind="src" path="examples/jms/temp-queue/src"/>
- <classpathentry kind="src" path="examples/jms/topic/src"/>
- <classpathentry kind="src" path="examples/jms/topic-hierarchies/src"/>
- <classpathentry kind="src" path="examples/jms/topic-selector-example1/src"/>
- <classpathentry kind="src" path="examples/jms/topic-selector-example2/src"/>
- <classpathentry kind="src" path="examples/jms/transaction-failover/src"/>
- <classpathentry kind="src" path="examples/jms/transactional/src"/>
- <classpathentry kind="src" path="examples/jms/xa-heuristic/src"/>
- <classpathentry kind="src" path="examples/jms/xa-receive/src"/>
- <classpathentry kind="src" path="examples/jms/xa-send/src"/>
- <classpathentry kind="src" path="examples/jms/xa-with-jta/src"/>
- <classpathentry kind="src" path="examples/javaee/ejb-jms-transaction/src"/>
- <classpathentry kind="src" path="examples/javaee/hajndi/src"/>
- <classpathentry kind="src" path="examples/javaee/jca-config/src"/>
- <classpathentry kind="src" path="examples/javaee/jms-bridge/src"/>
- <classpathentry kind="src" path="examples/javaee/mdb-bmt/src"/>
- <classpathentry kind="src" path="examples/javaee/mdb-cmt-setrollbackonly/src"/>
- <classpathentry kind="src" path="examples/javaee/mdb-cmt-tx-local/src"/>
- <classpathentry kind="src" path="examples/javaee/mdb-cmt-tx-not-supported/src"/>
- <classpathentry kind="src" path="examples/javaee/mdb-cmt-tx-required/src"/>
- <classpathentry kind="src" path="examples/javaee/servlet-ssl/src"/>
- <classpathentry kind="src" path="examples/javaee/servlet-transport/src"/>
- <classpathentry kind="src" path="examples/javaee/xarecovery/src"/>
- <classpathentry kind="src" path="examples/soak/normal/src"/>
- <classpathentry kind="lib" path="thirdparty/junit/lib/junit.jar"/>
- <classpathentry kind="lib" path="thirdparty/apache-logging/lib/commons-logging.jar"/>
- <classpathentry kind="lib" path="thirdparty/apache-xerces/lib/xercesImpl.jar"/>
- <classpathentry kind="lib" path="thirdparty/sun-jaxb/lib/jaxb-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss/jbossts/lib/jbossts-common.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/jboss/javaee/lib/jboss-ejb-api.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="tests/tmpfiles"/>
- <classpathentry kind="lib" path="thirdparty/net/java/dev/javacc/lib/javacc.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/jboss/netty/lib/netty.jar" sourcepath="/Users/jmesnil/Downloads/netty-3.2.0.BETA1-sources.jar"/>
- <classpathentry kind="lib" path="thirdparty/log4j/lib/log4j.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/jboss/naming/lib/jnpserver.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/jboss/security/lib/jbosssx.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss/jbossts/lib/jbossjts.jar"/>
- <classpathentry kind="lib" path="thirdparty/apache-xerces/lib/xml-apis.jar"/>
- <classpathentry kind="lib" path="thirdparty/javax/activation/lib/activation.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/jboss/integration/lib/jboss-transaction-spi.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/jboss/javaee/lib/jboss-jaspi-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/jboss/javaee/lib/jboss-jca-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/jboss/javaee/lib/jboss-jms-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/jboss/javaee/lib/jboss-transaction-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/jboss/lib/jboss-common-core.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/jboss/lib/jboss-mdr.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/jboss/lib/jboss-reflect.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/jboss/lib/jbossxb.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/jboss/logging/lib/jboss-logging-spi.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/jboss/microcontainer/lib/jboss-dependency.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/jboss/microcontainer/lib/jboss-kernel.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/jboss/security/lib/jboss-security-spi.jar"/>
- <classpathentry kind="lib" path="thirdparty/wutka-dtdparser/lib/dtdparser121.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/jboss/ejb3/lib/jboss-ejb3-ext-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/twitter4j/lib/twitter4j-core.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/springframework/lib/spring-asm.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/springframework/lib/spring-beans.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/springframework/lib/spring-context.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/springframework/lib/spring-core.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/springframework/lib/spring-expression.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/springframework/lib/spring-jms.jar"/>
- <classpathentry kind="lib" path="thirdparty/org/springframework/lib/spring-tx.jar"/>
- <classpathentry kind="output" path="eclipse-output"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/.project
===================================================================
--- trunk/.project 2011-05-09 17:05:18 UTC (rev 10614)
+++ trunk/.project 2011-05-10 12:04:35 UTC (rev 10615)
@@ -15,8 +15,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sourceforge.metrics.nature</nature>
</natures>
Modified: trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/.settings/org.eclipse.jdt.core.prefs 2011-05-09 17:05:18 UTC (rev 10614)
+++ trunk/.settings/org.eclipse.jdt.core.prefs 2011-05-10 12:04:35 UTC (rev 10615)
@@ -1,4 +1,4 @@
-#Sat Sep 27 08:56:30 BST 2008
+#Thu May 05 17:33:50 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -8,16 +8,18 @@
org.eclipse.jdt.core.codeComplete.localSuffixes=
org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=optimize out
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=82
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=82
Modified: trunk/README
===================================================================
--- trunk/README 2011-05-09 17:05:18 UTC (rev 10614)
+++ trunk/README 2011-05-10 12:04:35 UTC (rev 10615)
@@ -31,3 +31,7 @@
% mvn install
% mvn site # (this currently does not work)
+* Eclipse
+
+Install the m2Eclipse plugin, and run
+ $ mvn eclipse:eclipse
14 years, 12 months
- 1
- 0
JBoss hornetq SVN: r10614 - branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-05-09 13:05:18 -0400 (Mon, 09 May 2011)
New Revision: 10614
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java
Log:
Adding debug logs to Client topology
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2011-05-09 16:14:07 UTC (rev 10613)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2011-05-09 17:05:18 UTC (rev 10614)
@@ -17,7 +17,6 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -29,9 +28,12 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
-import org.hornetq.api.core.*;
+import org.hornetq.api.core.HornetQBuffer;
+import org.hornetq.api.core.HornetQException;
+import org.hornetq.api.core.Interceptor;
+import org.hornetq.api.core.SimpleString;
+import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.ClientSession;
-import org.hornetq.api.core.client.HornetQClient;
import org.hornetq.api.core.client.ServerLocator;
import org.hornetq.api.core.client.SessionFailureListener;
import org.hornetq.core.logging.Logger;
@@ -230,8 +232,19 @@
{
if(live.equals(connectorConfig) && backUp != null)
{
+ if (log.isDebugEnabled())
+ {
+ log.debug("Setting up backup config = " + backUp + " for live = " + live);
+ }
backupConfig = backUp;
}
+ else
+ {
+ if (log.isDebugEnabled())
+ {
+ log.debug("ClientSessionFactoryImpl received backup update for live/backup pair = " + live + " / " + backUp + " but it didn't belong to " + this.connectorConfig);
+ }
+ }
}
public Object getBackupConnector()
@@ -875,6 +888,11 @@
return;
}
+ if (log.isDebugEnabled())
+ {
+ log.debug("Trying reconnection attempt " + count);
+ }
+
getConnection();
if (connection == null)
@@ -884,10 +902,10 @@
if (reconnectAttempts != 0)
{
count++;
-
+
if (reconnectAttempts != -1 && count == reconnectAttempts)
{
- log.warn("Tried " + reconnectAttempts + " times to connect. Now giving up.");
+ log.warn("Tried " + reconnectAttempts + " times to connect. Now giving up on reconnecting it.");
return;
}
@@ -989,10 +1007,20 @@
{
connector.start();
+ if (log.isDebugEnabled())
+ {
+ log.debug("Trying to connect at the main server using connector :" + connectorConfig);
+ }
+
tc = connector.createConnection();
if (tc == null)
{
+ if (log.isDebugEnabled())
+ {
+ log.debug("Main server is not up. Hopefully there's a backup configured now!");
+ }
+
try
{
connector.close();
@@ -1004,9 +1032,13 @@
connector = null;
}
}
- //if connection fails we can try the backup incase it has come live
+ //if connection fails we can try the backup in case it has come live
if(connector == null && backupConfig != null)
{
+ if (log.isDebugEnabled())
+ {
+ log.debug("Trying backup config = " + backupConfig);
+ }
ConnectorFactory backupConnectorFactory = instantiateConnectorFactory(backupConfig.getFactoryClassName());
connector = backupConnectorFactory.createConnector(backupConfig.getParams(),
handler,
@@ -1022,6 +1054,11 @@
if (tc == null)
{
+ if (log.isDebugEnabled())
+ {
+ log.debug("Backup is not active yet");
+ }
+
try
{
connector.close();
@@ -1035,6 +1072,12 @@
else
{
/*looks like the backup is now live, lets use that*/
+
+ if (log.isDebugEnabled())
+ {
+ log.debug("Connected to the backup at " + backupConfig);
+ }
+
connectorConfig = backupConfig;
backupConfig = null;
@@ -1244,10 +1287,18 @@
if (topMessage.isExit())
{
+ if (log.isDebugEnabled())
+ {
+ log.debug("Notifying " + topMessage.getNodeID() + " going down");
+ }
serverLocator.notifyNodeDown(topMessage.getNodeID());
}
else
{
+ if (log.isDebugEnabled())
+ {
+ log.debug("Node " + topMessage.getNodeID() + " going up, connector = " + topMessage.getPair() + ", isLast=" + topMessage.isLast());
+ }
serverLocator.notifyNodeUp(topMessage.getNodeID(),
topMessage.getPair(),
topMessage.isLast());
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java 2011-05-09 16:14:07 UTC (rev 10613)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java 2011-05-09 17:05:18 UTC (rev 10614)
@@ -46,7 +46,7 @@
*/
private Map<String, TopologyMember> topology = new HashMap<String, TopologyMember>();
- private boolean debug;
+ private boolean debug = log.isDebugEnabled();
public synchronized boolean addMember(String nodeId, TopologyMember member)
{
@@ -54,9 +54,9 @@
TopologyMember currentMember = topology.get(nodeId);
if (debug)
{
- System.out.println("adding = " + nodeId + ":" + member.getConnector());
- System.out.println("before----------------------------------");
- System.out.println(describe());
+ log.info("adding = " + nodeId + ":" + member.getConnector());
+ log.info("before----------------------------------");
+ log.info(describe());
}
if(currentMember == null)
{
@@ -87,9 +87,8 @@
}
if(debug)
{
-
- System.out.println("after----------------------------------updated=" + replaced);
- System.out.println(describe());
+ log.info("Topology updated=" + replaced);
+ log.info(describe());
}
return replaced;
}
@@ -97,6 +96,10 @@
public synchronized boolean removeMember(String nodeId)
{
TopologyMember member = topology.remove(nodeId);
+ if (debug)
+ {
+ log.info("Removing member " + member);
+ }
return (member != null);
}
14 years, 12 months
- 1
- 0