Signed-off-by: Mark Struberg <struberg@xxxxxxxx> --- org.spearce.jgit/.classpath | 7 +++++-- org.spearce.jgit/.project | 6 ++++++ .../.settings/org.eclipse.jdt.core.prefs | 4 ++-- .../.settings/org.maven.ide.eclipse.prefs | 9 +++++++++ org.spearce.jgit/build.properties | 6 +++--- 5 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 org.spearce.jgit/.settings/org.maven.ide.eclipse.prefs diff --git a/org.spearce.jgit/.classpath b/org.spearce.jgit/.classpath index 304e861..c1c8f51 100644 --- a/org.spearce.jgit/.classpath +++ b/org.spearce.jgit/.classpath @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> + <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.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/org.spearce.jgit/.project b/org.spearce.jgit/.project index 7d38455..da2f7cf 100644 --- a/org.spearce.jgit/.project +++ b/org.spearce.jgit/.project @@ -20,8 +20,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>org.eclipse.pde.PluginNature</nature> </natures> diff --git a/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs b/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs index 8e8e172..22d560f 100644 --- a/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs +++ b/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Sun Mar 15 01:13:43 CET 2009 +#Fri Sep 04 16:53:41 CEST 2009 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -34,7 +34,7 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=error +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag diff --git a/org.spearce.jgit/.settings/org.maven.ide.eclipse.prefs b/org.spearce.jgit/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 0000000..1e219ee --- /dev/null +++ b/org.spearce.jgit/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,9 @@ +#Fri Sep 04 16:35:48 CEST 2009 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/org.spearce.jgit/build.properties b/org.spearce.jgit/build.properties index aa1a008..b686345 100644 --- a/org.spearce.jgit/build.properties +++ b/org.spearce.jgit/build.properties @@ -1,5 +1,5 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ +source.. = src/main/java/ +output.. = target/classes/ +bin.includes = src/main/resources/,\ .,\ plugin.properties -- 1.6.2.5 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html