Author: aadamchik
Date: Mon Mar 19 06:28:00 2012
New Revision: 1302291
URL: http://svn.apache.org/viewvc?rev=1302291&view=rev
Log:
upgrading to the new M2E plugin
Added:
cayenne/main/trunk/framework/cayenne-tools/.settings/org.eclipse.core.resources.prefs
cayenne/main/trunk/framework/cayenne-tools/.settings/org.eclipse.m2e.core.prefs
Modified:
cayenne/main/trunk/framework/cayenne-tools/.classpath
cayenne/main/trunk/framework/cayenne-tools/.project
cayenne/main/trunk/framework/cayenne-tools/.settings/org.eclipse.jdt.core.prefs
Modified: cayenne/main/trunk/framework/cayenne-tools/.classpath
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/.classpath?rev=1302291&r1=1302290&r2=1302291&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/.classpath (original)
+++ cayenne/main/trunk/framework/cayenne-tools/.classpath Mon Mar 19 06:28:00
2012
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes"
path="src/main/java"/>
- <classpathentry kind="src" output="target/classes"
path="src/main/resources"/>
+ <classpathentry excluding="**" kind="src" output="target/classes"
path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes"
path="src/test/java"/>
- <classpathentry kind="src" output="target/test-classes"
path="src/test/resources"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes"
path="src/test/resources"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con"
path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: cayenne/main/trunk/framework/cayenne-tools/.project
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/.project?rev=1302291&r1=1302290&r2=1302291&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/.project (original)
+++ cayenne/main/trunk/framework/cayenne-tools/.project Mon Mar 19 06:28:00 2012
@@ -15,8 +15,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
Added:
cayenne/main/trunk/framework/cayenne-tools/.settings/org.eclipse.core.resources.prefs
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/.settings/org.eclipse.core.resources.prefs?rev=1302291&view=auto
==============================================================================
---
cayenne/main/trunk/framework/cayenne-tools/.settings/org.eclipse.core.resources.prefs
(added)
+++
cayenne/main/trunk/framework/cayenne-tools/.settings/org.eclipse.core.resources.prefs
Mon Mar 19 06:28:00 2012
@@ -0,0 +1,4 @@
+#Fri Mar 16 18:09:14 EDT 2012
+eclipse.preferences.version=1
+encoding//src/main/resources=UTF-8
+encoding//src/test/resources=UTF-8
Modified:
cayenne/main/trunk/framework/cayenne-tools/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/.settings/org.eclipse.jdt.core.prefs?rev=1302291&r1=1302290&r2=1302291&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-tools/.settings/org.eclipse.jdt.core.prefs
(original)
+++
cayenne/main/trunk/framework/cayenne-tools/.settings/org.eclipse.jdt.core.prefs
Mon Mar 19 06:28:00 2012
@@ -1,4 +1,4 @@
-#Sat Jan 12 21:09:47 EST 2008
+#Fri Mar 16 18:09:14 EDT 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
@@ -19,7 +19,7 @@ org.eclipse.jdt.core.compiler.problem.en
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.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
Added:
cayenne/main/trunk/framework/cayenne-tools/.settings/org.eclipse.m2e.core.prefs
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/.settings/org.eclipse.m2e.core.prefs?rev=1302291&view=auto
==============================================================================
---
cayenne/main/trunk/framework/cayenne-tools/.settings/org.eclipse.m2e.core.prefs
(added)
+++
cayenne/main/trunk/framework/cayenne-tools/.settings/org.eclipse.m2e.core.prefs
Mon Mar 19 06:28:00 2012
@@ -0,0 +1,5 @@
+#Fri Mar 16 18:09:13 EDT 2012
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
