From d2e7fc6e324dab9a491546b0150ce3a76b2329be Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Tue, 7 Sep 2010 09:46:10 +0000 Subject: [PATCH] SWF-1386 Spring spring-js into two artifacts --- build-spring-webflow/build.xml | 1 + build-spring-webflow/package-artifact.xml | 2 +- spring-js-resources/.classpath | 30 ++ spring-js-resources/.project | 17 + .../.settings/org.eclipse.jdt.core.prefs | 336 ++++++++++++++++++ .../.settings/org.eclipse.jdt.ui.prefs | 58 +++ .../org.eclipse.wst.validation.prefs | 6 + spring-js-resources/build.xml | 9 + .../dojo-build/README.txt | 0 .../dojo-build/dojo-build.zip | Bin spring-js-resources/ivy.xml | 23 ++ spring-js-resources/pom.xml | 9 + .../scripts/dojo/README.txt | 0 .../scripts/dojo/build.properties | 0 .../scripts/dojo/build.xml | 0 .../scripts/dojo/standard.profile.js | 0 .../web-resources/css-framework/css/forms.css | 0 .../css-framework/css/layout-1col.css | 0 .../css-framework/css/layout-navleft-1col.css | 0 .../css-framework/css/layout-navleft-2col.css | 0 .../css-framework/css/layout-navtop-1col.css | 0 .../css-framework/css/layout-navtop-3col.css | 0 .../css/layout-navtop-localleft.css | 0 .../css/layout-navtop-subright.css | 0 .../css-framework/css/layout.css | 0 .../css-framework/css/nav-horizontal.css | 0 .../css-framework/css/nav-vertical.css | 0 .../web-resources/css-framework/css/tools.css | 0 .../web-resources/css-framework/css/typo.css | 0 .../web-resources/spring/Spring-Dojo.js | 0 .../META-INF/web-resources/spring/Spring.js | 0 spring-js-resources/template.mf | 4 + spring-js/build.xml | 1 - spring-js/ivy.xml | 3 +- spring-js/pom.xml | 5 + 35 files changed, 501 insertions(+), 3 deletions(-) create mode 100644 spring-js-resources/.classpath create mode 100644 spring-js-resources/.project create mode 100644 spring-js-resources/.settings/org.eclipse.jdt.core.prefs create mode 100644 spring-js-resources/.settings/org.eclipse.jdt.ui.prefs create mode 100644 spring-js-resources/.settings/org.eclipse.wst.validation.prefs create mode 100644 spring-js-resources/build.xml rename {spring-js => spring-js-resources}/dojo-build/README.txt (100%) rename {spring-js => spring-js-resources}/dojo-build/dojo-build.zip (100%) create mode 100644 spring-js-resources/ivy.xml create mode 100644 spring-js-resources/pom.xml rename {spring-js => spring-js-resources}/scripts/dojo/README.txt (100%) rename {spring-js => spring-js-resources}/scripts/dojo/build.properties (100%) rename {spring-js => spring-js-resources}/scripts/dojo/build.xml (100%) rename {spring-js => spring-js-resources}/scripts/dojo/standard.profile.js (100%) rename {spring-js => spring-js-resources}/src/main/resources/META-INF/web-resources/css-framework/css/forms.css (100%) rename {spring-js => spring-js-resources}/src/main/resources/META-INF/web-resources/css-framework/css/layout-1col.css (100%) rename {spring-js => spring-js-resources}/src/main/resources/META-INF/web-resources/css-framework/css/layout-navleft-1col.css (100%) rename {spring-js => spring-js-resources}/src/main/resources/META-INF/web-resources/css-framework/css/layout-navleft-2col.css (100%) rename {spring-js => spring-js-resources}/src/main/resources/META-INF/web-resources/css-framework/css/layout-navtop-1col.css (100%) rename {spring-js => spring-js-resources}/src/main/resources/META-INF/web-resources/css-framework/css/layout-navtop-3col.css (100%) rename {spring-js => spring-js-resources}/src/main/resources/META-INF/web-resources/css-framework/css/layout-navtop-localleft.css (100%) rename {spring-js => spring-js-resources}/src/main/resources/META-INF/web-resources/css-framework/css/layout-navtop-subright.css (100%) rename {spring-js => spring-js-resources}/src/main/resources/META-INF/web-resources/css-framework/css/layout.css (100%) rename {spring-js => spring-js-resources}/src/main/resources/META-INF/web-resources/css-framework/css/nav-horizontal.css (100%) rename {spring-js => spring-js-resources}/src/main/resources/META-INF/web-resources/css-framework/css/nav-vertical.css (100%) rename {spring-js => spring-js-resources}/src/main/resources/META-INF/web-resources/css-framework/css/tools.css (100%) rename {spring-js => spring-js-resources}/src/main/resources/META-INF/web-resources/css-framework/css/typo.css (100%) rename {spring-js => spring-js-resources}/src/main/resources/META-INF/web-resources/spring/Spring-Dojo.js (100%) rename {spring-js => spring-js-resources}/src/main/resources/META-INF/web-resources/spring/Spring.js (100%) create mode 100644 spring-js-resources/template.mf diff --git a/build-spring-webflow/build.xml b/build-spring-webflow/build.xml index 9903cb41..b8993b4b 100644 --- a/build-spring-webflow/build.xml +++ b/build-spring-webflow/build.xml @@ -3,6 +3,7 @@ + diff --git a/build-spring-webflow/package-artifact.xml b/build-spring-webflow/package-artifact.xml index bbc77938..6322703b 100644 --- a/build-spring-webflow/package-artifact.xml +++ b/build-spring-webflow/package-artifact.xml @@ -30,7 +30,7 @@ - diff --git a/spring-js-resources/.classpath b/spring-js-resources/.classpath new file mode 100644 index 00000000..37ccae86 --- /dev/null +++ b/spring-js-resources/.classpath @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-js-resources/.project b/spring-js-resources/.project new file mode 100644 index 00000000..335ed577 --- /dev/null +++ b/spring-js-resources/.project @@ -0,0 +1,17 @@ + + + spring-js + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/spring-js-resources/.settings/org.eclipse.jdt.core.prefs b/spring-js-resources/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..2fdeadfc --- /dev/null +++ b/spring-js-resources/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,336 @@ +#Wed Jun 09 09:15:58 BST 2010 +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.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.5 +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.doc.comment.support=enabled +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nullReference=ignore +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +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=0 +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=1 +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=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +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=true +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=false +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not 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=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +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=false +org.eclipse.jdt.core.formatter.indentation.size=8 +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=do not 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=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not 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=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=false +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=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/spring-js-resources/.settings/org.eclipse.jdt.ui.prefs b/spring-js-resources/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 00000000..77e40833 --- /dev/null +++ b/spring-js-resources/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,58 @@ +#Tue Sep 25 14:14:24 EDT 2007 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_Spring Java Conventions +formatter_settings_version=11 +org.eclipse.jdt.ui.exception.name=e +org.eclipse.jdt.ui.gettersetter.use.is=false +org.eclipse.jdt.ui.javadoc=false +org.eclipse.jdt.ui.keywordthis=false +org.eclipse.jdt.ui.overrideannotation=false +org.eclipse.jdt.ui.text.custom_code_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=false +sp_cleanup.format_source_code=true +sp_cleanup.make_local_variable_final=false +sp_cleanup.make_parameters_final=false +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=false +sp_cleanup.organize_imports=true +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=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=false +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=false +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +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=false +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=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/spring-js-resources/.settings/org.eclipse.wst.validation.prefs b/spring-js-resources/.settings/org.eclipse.wst.validation.prefs new file mode 100644 index 00000000..68bb37d5 --- /dev/null +++ b/spring-js-resources/.settings/org.eclipse.wst.validation.prefs @@ -0,0 +1,6 @@ +#Fri May 05 18:13:37 EDT 2006 +DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator; +USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator; +USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator; +USER_PREFERENCE=overrideGlobalPreferencesfalse +eclipse.preferences.version=1 diff --git a/spring-js-resources/build.xml b/spring-js-resources/build.xml new file mode 100644 index 00000000..74cef270 --- /dev/null +++ b/spring-js-resources/build.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/spring-js/dojo-build/README.txt b/spring-js-resources/dojo-build/README.txt similarity index 100% rename from spring-js/dojo-build/README.txt rename to spring-js-resources/dojo-build/README.txt diff --git a/spring-js/dojo-build/dojo-build.zip b/spring-js-resources/dojo-build/dojo-build.zip similarity index 100% rename from spring-js/dojo-build/dojo-build.zip rename to spring-js-resources/dojo-build/dojo-build.zip diff --git a/spring-js-resources/ivy.xml b/spring-js-resources/ivy.xml new file mode 100644 index 00000000..b3b12a7a --- /dev/null +++ b/spring-js-resources/ivy.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/spring-js-resources/pom.xml b/spring-js-resources/pom.xml new file mode 100644 index 00000000..dd91128e --- /dev/null +++ b/spring-js-resources/pom.xml @@ -0,0 +1,9 @@ + + + 4.0.0 + org.springframework.webflow + spring-js-resources + jar + Spring JavaScript Resources + 2.2.0.BUILD-SNAPSHOT + diff --git a/spring-js/scripts/dojo/README.txt b/spring-js-resources/scripts/dojo/README.txt similarity index 100% rename from spring-js/scripts/dojo/README.txt rename to spring-js-resources/scripts/dojo/README.txt diff --git a/spring-js/scripts/dojo/build.properties b/spring-js-resources/scripts/dojo/build.properties similarity index 100% rename from spring-js/scripts/dojo/build.properties rename to spring-js-resources/scripts/dojo/build.properties diff --git a/spring-js/scripts/dojo/build.xml b/spring-js-resources/scripts/dojo/build.xml similarity index 100% rename from spring-js/scripts/dojo/build.xml rename to spring-js-resources/scripts/dojo/build.xml diff --git a/spring-js/scripts/dojo/standard.profile.js b/spring-js-resources/scripts/dojo/standard.profile.js similarity index 100% rename from spring-js/scripts/dojo/standard.profile.js rename to spring-js-resources/scripts/dojo/standard.profile.js diff --git a/spring-js/src/main/resources/META-INF/web-resources/css-framework/css/forms.css b/spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/forms.css similarity index 100% rename from spring-js/src/main/resources/META-INF/web-resources/css-framework/css/forms.css rename to spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/forms.css diff --git a/spring-js/src/main/resources/META-INF/web-resources/css-framework/css/layout-1col.css b/spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/layout-1col.css similarity index 100% rename from spring-js/src/main/resources/META-INF/web-resources/css-framework/css/layout-1col.css rename to spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/layout-1col.css diff --git a/spring-js/src/main/resources/META-INF/web-resources/css-framework/css/layout-navleft-1col.css b/spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/layout-navleft-1col.css similarity index 100% rename from spring-js/src/main/resources/META-INF/web-resources/css-framework/css/layout-navleft-1col.css rename to spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/layout-navleft-1col.css diff --git a/spring-js/src/main/resources/META-INF/web-resources/css-framework/css/layout-navleft-2col.css b/spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/layout-navleft-2col.css similarity index 100% rename from spring-js/src/main/resources/META-INF/web-resources/css-framework/css/layout-navleft-2col.css rename to spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/layout-navleft-2col.css diff --git a/spring-js/src/main/resources/META-INF/web-resources/css-framework/css/layout-navtop-1col.css b/spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/layout-navtop-1col.css similarity index 100% rename from spring-js/src/main/resources/META-INF/web-resources/css-framework/css/layout-navtop-1col.css rename to spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/layout-navtop-1col.css diff --git a/spring-js/src/main/resources/META-INF/web-resources/css-framework/css/layout-navtop-3col.css b/spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/layout-navtop-3col.css similarity index 100% rename from spring-js/src/main/resources/META-INF/web-resources/css-framework/css/layout-navtop-3col.css rename to spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/layout-navtop-3col.css diff --git a/spring-js/src/main/resources/META-INF/web-resources/css-framework/css/layout-navtop-localleft.css b/spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/layout-navtop-localleft.css similarity index 100% rename from spring-js/src/main/resources/META-INF/web-resources/css-framework/css/layout-navtop-localleft.css rename to spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/layout-navtop-localleft.css diff --git a/spring-js/src/main/resources/META-INF/web-resources/css-framework/css/layout-navtop-subright.css b/spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/layout-navtop-subright.css similarity index 100% rename from spring-js/src/main/resources/META-INF/web-resources/css-framework/css/layout-navtop-subright.css rename to spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/layout-navtop-subright.css diff --git a/spring-js/src/main/resources/META-INF/web-resources/css-framework/css/layout.css b/spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/layout.css similarity index 100% rename from spring-js/src/main/resources/META-INF/web-resources/css-framework/css/layout.css rename to spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/layout.css diff --git a/spring-js/src/main/resources/META-INF/web-resources/css-framework/css/nav-horizontal.css b/spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/nav-horizontal.css similarity index 100% rename from spring-js/src/main/resources/META-INF/web-resources/css-framework/css/nav-horizontal.css rename to spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/nav-horizontal.css diff --git a/spring-js/src/main/resources/META-INF/web-resources/css-framework/css/nav-vertical.css b/spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/nav-vertical.css similarity index 100% rename from spring-js/src/main/resources/META-INF/web-resources/css-framework/css/nav-vertical.css rename to spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/nav-vertical.css diff --git a/spring-js/src/main/resources/META-INF/web-resources/css-framework/css/tools.css b/spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/tools.css similarity index 100% rename from spring-js/src/main/resources/META-INF/web-resources/css-framework/css/tools.css rename to spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/tools.css diff --git a/spring-js/src/main/resources/META-INF/web-resources/css-framework/css/typo.css b/spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/typo.css similarity index 100% rename from spring-js/src/main/resources/META-INF/web-resources/css-framework/css/typo.css rename to spring-js-resources/src/main/resources/META-INF/web-resources/css-framework/css/typo.css diff --git a/spring-js/src/main/resources/META-INF/web-resources/spring/Spring-Dojo.js b/spring-js-resources/src/main/resources/META-INF/web-resources/spring/Spring-Dojo.js similarity index 100% rename from spring-js/src/main/resources/META-INF/web-resources/spring/Spring-Dojo.js rename to spring-js-resources/src/main/resources/META-INF/web-resources/spring/Spring-Dojo.js diff --git a/spring-js/src/main/resources/META-INF/web-resources/spring/Spring.js b/spring-js-resources/src/main/resources/META-INF/web-resources/spring/Spring.js similarity index 100% rename from spring-js/src/main/resources/META-INF/web-resources/spring/Spring.js rename to spring-js-resources/src/main/resources/META-INF/web-resources/spring/Spring.js diff --git a/spring-js-resources/template.mf b/spring-js-resources/template.mf new file mode 100644 index 00000000..b55f6de2 --- /dev/null +++ b/spring-js-resources/template.mf @@ -0,0 +1,4 @@ +Bundle-SymbolicName: org.springframework.js.resources +Bundle-Name: Spring JS Resources +Bundle-Vendor: SpringSource +Bundle-ManifestVersion: 2 diff --git a/spring-js/build.xml b/spring-js/build.xml index cf2c11ab..7512923f 100644 --- a/spring-js/build.xml +++ b/spring-js/build.xml @@ -3,7 +3,6 @@ - diff --git a/spring-js/ivy.xml b/spring-js/ivy.xml index b691f163..37a8847b 100644 --- a/spring-js/ivy.xml +++ b/spring-js/ivy.xml @@ -31,6 +31,7 @@ + @@ -42,4 +43,4 @@ - \ No newline at end of file + diff --git a/spring-js/pom.xml b/spring-js/pom.xml index d6759241..1945582f 100644 --- a/spring-js/pom.xml +++ b/spring-js/pom.xml @@ -27,6 +27,11 @@ spring-core ${spring.version} + + org.springframework.webflow + spring-js-resources + ${project.version} + javax.servlet servlet-api