Author: aadamchik
Date: Sun Jul 30 12:59:39 2006
New Revision: 426925
URL: http://svn.apache.org/viewvc?rev=426925&view=rev
Log:
fixing third-level transitive XML dependencies that messed up Eclipse
setting up Maven eclipse projects
removed JRE_LIB_15 variable - so now default workspace JRE must be 1.5
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/.classpath
incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/.project
incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/.settings/org.eclipse.jdt.core.prefs
incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/.settings/org.eclipse.jdt.ui.prefs
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/.classpath
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/.classpath?rev=426925&r1=426924&r2=426925&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/.classpath (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/.classpath Sun Jul 30
12:59:39 2006
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/cayenne/java"/>
- <classpathentry kind="src" path="src/tests/java"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/cayenne-java"/>
- <classpathentry kind="var" path="JRE_LIB_15"/>
- <classpathentry kind="output" path="build/eclipse"/>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/.project
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/.project?rev=426925&r1=426924&r2=426925&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/.project (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/.project Sun Jul 30
12:59:39 2006
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>cayenne-java-1.5</name>
- <comment></comment>
+ <name>cayenne-jdk1.5-core</name>
+ <comment>Cayenne Java 1.5 Core</comment>
<projects>
</projects>
<buildSpec>
@@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/.settings/org.eclipse.jdt.core.prefs?rev=426925&r1=426924&r2=426925&view=diff
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/.settings/org.eclipse.jdt.core.prefs
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/.settings/org.eclipse.jdt.core.prefs
Sun Jul 30 12:59:39 2006
@@ -1,4 +1,4 @@
-#Sun Nov 06 12:14:49 MSK 2005
+#Sun Jul 23 18:13:04 EDT 2006
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
@@ -7,8 +7,53 @@
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.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.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.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+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.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=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=ignore
+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=ignore
+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.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=48
@@ -16,6 +61,7 @@
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=48
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=48
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=48
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=48
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=48
@@ -65,10 +111,12 @@
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
@@ -82,6 +130,7 @@
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=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
@@ -225,6 +274,7 @@
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_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
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/.settings/org.eclipse.jdt.ui.prefs
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/.settings/org.eclipse.jdt.ui.prefs?rev=426925&r1=426924&r2=426925&view=diff
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/.settings/org.eclipse.jdt.ui.prefs
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/.settings/org.eclipse.jdt.ui.prefs
Sun Jul 30 12:59:39 2006
@@ -1,7 +1,7 @@
-#Tue Jul 18 15:19:20 EDT 2006
+#Sun Jul 23 18:13:03 EDT 2006
eclipse.preferences.version=1
-formatter_settings_version=8
-internal.default.compliance=user
+formatter_settings_version=10
+internal.default.compliance=default
org.eclipse.jdt.ui.ignorelowercasenames=true
org.eclipse.jdt.ui.importorder=java;javax;org;com;
org.eclipse.jdt.ui.ondemandthreshold=99
