Author: aadamchik
Date: Mon Mar 19 06:28:42 2012
New Revision: 1302294
URL: http://svn.apache.org/viewvc?rev=1302294&view=rev
Log:
upgrading to the new M2E plugin
Added:
cayenne/main/trunk/framework/maven-cayenne-plugin/.settings/
cayenne/main/trunk/framework/maven-cayenne-plugin/.settings/org.eclipse.core.resources.prefs
cayenne/main/trunk/framework/maven-cayenne-plugin/.settings/org.eclipse.jdt.core.prefs
cayenne/main/trunk/framework/maven-cayenne-plugin/.settings/org.eclipse.m2e.core.prefs
cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/.settings/
cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/.settings/org.eclipse.jdt.core.prefs
cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/.settings/org.eclipse.m2e.core.prefs
Modified:
cayenne/main/trunk/framework/maven-cayenne-plugin/.classpath
cayenne/main/trunk/framework/maven-cayenne-plugin/.project
cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/.classpath
cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/.project
Modified: cayenne/main/trunk/framework/maven-cayenne-plugin/.classpath
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/maven-cayenne-plugin/.classpath?rev=1302294&r1=1302293&r2=1302294&view=diff
==============================================================================
--- cayenne/main/trunk/framework/maven-cayenne-plugin/.classpath (original)
+++ cayenne/main/trunk/framework/maven-cayenne-plugin/.classpath Mon Mar 19
06:28:42 2012
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes"
path="src/main/java"/>
+ <classpathentry kind="src" output="target/test-classes"
path="src/test/java"/>
+ <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/maven-cayenne-plugin/.project
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/maven-cayenne-plugin/.project?rev=1302294&r1=1302293&r2=1302294&view=diff
==============================================================================
--- cayenne/main/trunk/framework/maven-cayenne-plugin/.project (original)
+++ cayenne/main/trunk/framework/maven-cayenne-plugin/.project Mon Mar 19
06:28:42 2012
@@ -1,23 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>maven-cayenne-plugin</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <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>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>maven-cayenne-plugin</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <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>
+</projectDescription>
Added:
cayenne/main/trunk/framework/maven-cayenne-plugin/.settings/org.eclipse.core.resources.prefs
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/maven-cayenne-plugin/.settings/org.eclipse.core.resources.prefs?rev=1302294&view=auto
==============================================================================
---
cayenne/main/trunk/framework/maven-cayenne-plugin/.settings/org.eclipse.core.resources.prefs
(added)
+++
cayenne/main/trunk/framework/maven-cayenne-plugin/.settings/org.eclipse.core.resources.prefs
Mon Mar 19 06:28:42 2012
@@ -0,0 +1,3 @@
+#Fri Mar 16 18:10:55 EDT 2012
+eclipse.preferences.version=1
+encoding//src/test/resources=UTF-8
Added:
cayenne/main/trunk/framework/maven-cayenne-plugin/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/maven-cayenne-plugin/.settings/org.eclipse.jdt.core.prefs?rev=1302294&view=auto
==============================================================================
---
cayenne/main/trunk/framework/maven-cayenne-plugin/.settings/org.eclipse.jdt.core.prefs
(added)
+++
cayenne/main/trunk/framework/maven-cayenne-plugin/.settings/org.eclipse.jdt.core.prefs
Mon Mar 19 06:28:42 2012
@@ -0,0 +1,6 @@
+#Fri Mar 16 18:10:55 EDT 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
Added:
cayenne/main/trunk/framework/maven-cayenne-plugin/.settings/org.eclipse.m2e.core.prefs
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/maven-cayenne-plugin/.settings/org.eclipse.m2e.core.prefs?rev=1302294&view=auto
==============================================================================
---
cayenne/main/trunk/framework/maven-cayenne-plugin/.settings/org.eclipse.m2e.core.prefs
(added)
+++
cayenne/main/trunk/framework/maven-cayenne-plugin/.settings/org.eclipse.m2e.core.prefs
Mon Mar 19 06:28:42 2012
@@ -0,0 +1,5 @@
+#Fri Mar 16 18:10:54 EDT 2012
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
Modified: cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/.classpath
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/.classpath?rev=1302294&r1=1302293&r2=1302294&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/.classpath
(original)
+++ cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/.classpath Mon Mar
19 06:28:42 2012
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes"
path="src/main/java"/>
+ <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/modeler/maven-cayenne-modeler-plugin/.project
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/.project?rev=1302294&r1=1302293&r2=1302294&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/.project (original)
+++ cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/.project Mon Mar 19
06:28:42 2012
@@ -1,23 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>maven-cayenne-modeler-plugin</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <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>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>maven-cayenne-modeler-plugin</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <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>
+</projectDescription>
Added:
cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/.settings/org.eclipse.jdt.core.prefs?rev=1302294&view=auto
==============================================================================
---
cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/.settings/org.eclipse.jdt.core.prefs
(added)
+++
cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/.settings/org.eclipse.jdt.core.prefs
Mon Mar 19 06:28:42 2012
@@ -0,0 +1,6 @@
+#Fri Mar 16 18:11:02 EDT 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
Added:
cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/.settings/org.eclipse.m2e.core.prefs
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/.settings/org.eclipse.m2e.core.prefs?rev=1302294&view=auto
==============================================================================
---
cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/.settings/org.eclipse.m2e.core.prefs
(added)
+++
cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/.settings/org.eclipse.m2e.core.prefs
Mon Mar 19 06:28:42 2012
@@ -0,0 +1,5 @@
+#Fri Mar 16 18:11:01 EDT 2012
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
