* Re: [JGIT PATCH 7/9] removing eclipse project files [not found] <891180.68852.qm@web27805.mail.ukl.yahoo.com> @ 2009-09-25 15:48 ` Michael Gaffney 2009-09-25 21:21 ` Robin Rosenberg 0 siblings, 1 reply; 19+ messages in thread From: Michael Gaffney @ 2009-09-25 15:48 UTC (permalink / raw) To: Mark Struberg; +Cc: Douglas Campos, Shawn Spearce, git My only real item is that I'd like to have the .* eclipse projects added to gitignore so I'm not having to constantly stash mine off to the side if I make changes. -Mike ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [JGIT PATCH 7/9] removing eclipse project files 2009-09-25 15:48 ` [JGIT PATCH 7/9] removing eclipse project files Michael Gaffney @ 2009-09-25 21:21 ` Robin Rosenberg 0 siblings, 0 replies; 19+ messages in thread From: Robin Rosenberg @ 2009-09-25 21:21 UTC (permalink / raw) To: Michael Gaffney; +Cc: Mark Struberg, Douglas Campos, Shawn Spearce, git fredag 25 september 2009 17:48:16 skrev Michael Gaffney <mr.gaffo@gmail.com>: > My only real item is that I'd like to have the .* eclipse projects added > to gitignore so I'm not having to constantly stash mine off to the side > if I make changes. Is that so hard? Without Git it's a problem since other tools don't have stash. If you constantly have your own settings you risk making your changes incompatible with the official settings in various ways, like different formatting, compiler settings and so on. If you still want different settings --assume-unchanged may help somewhat. -- robin ^ permalink raw reply [flat|nested] 19+ messages in thread
* [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de> @ 2009-09-23 21:16 Mark Struberg [not found] ` <1253740570-10718-2-git-send-email-struberg@yahoo.de> 0 siblings, 1 reply; 19+ messages in thread From: Mark Struberg @ 2009-09-23 21:16 UTC (permalink / raw) To: git, spearce; +Cc: Jason van Zyl From: Jason van Zyl <jvanzyl@sonatype.com> --- .gitignore | 1 + org.spearce.jgit.pgm/pom.xml | 59 ++++++++++ org.spearce.jgit.test/pom.xml | 30 +++++ org.spearce.jgit/pom.xml | 35 ++++++ pom.xml | 258 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 383 insertions(+), 0 deletions(-) create mode 100644 org.spearce.jgit.pgm/pom.xml create mode 100644 org.spearce.jgit.test/pom.xml create mode 100644 org.spearce.jgit/pom.xml create mode 100644 pom.xml diff --git a/.gitignore b/.gitignore index 5219cbc..37ca28d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /jgit /jgit.jar /jgit_src.zip +target /jgit_docs.zip diff --git a/org.spearce.jgit.pgm/pom.xml b/org.spearce.jgit.pgm/pom.xml new file mode 100644 index 0000000..9501cb5 --- /dev/null +++ b/org.spearce.jgit.pgm/pom.xml @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.spearce</groupId> + <artifactId>jgit-parent</artifactId> + <version>0.5.0-SNAPSHOT</version> + </parent> + <artifactId>org.spearce.jgit.pgm</artifactId> + <name>JGit :: Pgm</name> + <dependencies> + <dependency> + <groupId>org.spearce</groupId> + <artifactId>org.spearce.jgit</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>args4j</groupId> + <artifactId>args4j</artifactId> + </dependency> + </dependencies> + <build> + <sourceDirectory>src</sourceDirectory> + <resources> + <resource> + <directory>src</directory> + <includes> + <include>**/services/**</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <finalName>jgit-cli</finalName> + <createDependencyReducedPom>false</createDependencyReducedPom> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> + <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <mainClass>org.spearce.jgit.pgm.Main</mainClass> + </transformer> + </transformers> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> diff --git a/org.spearce.jgit.test/pom.xml b/org.spearce.jgit.test/pom.xml new file mode 100644 index 0000000..db1fc46 --- /dev/null +++ b/org.spearce.jgit.test/pom.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.spearce</groupId> + <artifactId>jgit-parent</artifactId> + <version>0.5.0-SNAPSHOT</version> + </parent> + <artifactId>org.spearce.jgit.test</artifactId> + <name>JGit :: Test</name> + <dependencies> + <dependency> + <groupId>org.spearce</groupId> + <artifactId>org.spearce.jgit</artifactId> + </dependency> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch</artifactId> + </dependency> + </dependencies> + <build> + <testResources> + <testResource> + <directory>tst-rsrc/</directory> + </testResource> + </testResources> + <testSourceDirectory>tst/</testSourceDirectory> + </build> +</project> diff --git a/org.spearce.jgit/pom.xml b/org.spearce.jgit/pom.xml new file mode 100644 index 0000000..2510ff7 --- /dev/null +++ b/org.spearce.jgit/pom.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.spearce</groupId> + <artifactId>jgit-parent</artifactId> + <version>0.5.0-SNAPSHOT</version> + </parent> + <artifactId>org.spearce.jgit</artifactId> + <name>JGit :: Core</name> + <dependencies> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch</artifactId> + </dependency> + </dependencies> + <build> + <sourceDirectory>src</sourceDirectory> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.2</version> + <configuration> + <includes> + <include>**/*Test.java</include> + <include>**/*TestCase.java</include> + <include>**/T000*.java</include> + </includes> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..7d52ba2 --- /dev/null +++ b/pom.xml @@ -0,0 +1,258 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +All rights reserved. +Redistribution and use in source and binary forms, with or +without modification, are permitted provided that the following +conditions are met: + +Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following +disclaimer in the documentation and/or other materials provided +with the distribution. + +Neither the name of the Git Development Community nor the +names of its contributors may be used to endorse or promote +products derived from this software without specific prior +written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND +CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.spearce</groupId> + <artifactId>jgit-parent</artifactId> + <packaging>pom</packaging> + <version>0.5.0-SNAPSHOT</version> + <name>JGit :: Parent</name> + <url>http://repo.or.cz/w/egit.git</url> + <mailingLists> + <mailingList> + <name>GIT Mailing List</name> + <post>git@vger.kernel.org</post> + <archive>http://marc.info/?l=git</archive> + </mailingList> + </mailingLists> + <description>Pure Java implementation of Git</description> + <developers> + <developer> + <name>Shawn O. Pearce</name> + <email>spearce@spearce.org</email> + <roles> + <role>Maintainer</role> + </roles> + </developer> + <developer> + <name>Robin Rosenberg</name> + <email>robin.rosenberg@dewire.com</email> + <roles> + <role>Maintainer</role> + </roles> + </developer> + <developer> + <name>Dave Watson</name> + <email>dwatson@mimvista.com</email> + <roles> + <role>Developer</role> + </roles> + </developer> + <developer> + <name>Roger C. Soares</name> + <email>rogersoares@intelinet.com.br</email> + <roles> + <role>Developer</role> + </roles> + </developer> + <developer> + <name>Marek Zawirski</name> + <email>marek.zawirski@gmail.com</email> + <roles> + <role>Developer</role> + </roles> + </developer> + <developer> + <name>Charles O'Farrell</name> + <email>charleso@charleso.org</email> + <roles> + <role>Contributor</role> + </roles> + </developer> + <developer> + <name>Imran M Yousuf</name> + <email>imyousuf@smartitengineering.com</email> + <organization>Smart IT Engineering</organization> + <roles> + <role>Contributor</role> + </roles> + </developer> + </developers> + <licenses> + <license> + <name>3-clause (new-style) BSD license.</name> + <comments> + All rights reserved. + Redistribution and use in source and binary forms, with or + without modification, are permitted provided that the following + conditions are met: + + Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + Neither the name of the Git Development Community nor the + names of its contributors may be used to endorse or promote + products derived from this software without specific prior + written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + </comments> + </license> + </licenses> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.1</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.spearce</groupId> + <artifactId>org.spearce.jgit</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch</artifactId> + <version>0.1.38</version> + </dependency> + <dependency> + <groupId>args4j</groupId> + <artifactId>args4j</artifactId> + <version>2.0.9</version> + </dependency> + </dependencies> + </dependencyManagement> + <distributionManagement> + <snapshotRepository> + <id>jgit-maven-snapshot-repository</id> + <name>JGit Maven Snapshot Repository</name> + <url>dav:https://egit.googlecode.com/svn/maven/snapshot-repository/</url> + <uniqueVersion>true</uniqueVersion> + </snapshotRepository> + </distributionManagement> + <modules> + <module>org.spearce.jgit</module> + <module>org.spearce.jgit.test</module> + <module>org.spearce.jgit.pgm</module> + </modules> + <profiles> + <!-- Release --> + <profile> + <id>jgit-release</id> + <build> + <plugins> + <!-- We want to sign the artifact, the POM, and all attached artifacts --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <configuration> + <passphrase>${gpg.passphrase}</passphrase> + </configuration> + <executions> + <execution> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> + <!-- We want to deploy the artifact to a staging location for perusal --> + <plugin> + <inherited>true</inherited> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <updateReleaseInfo>true</updateReleaseInfo> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <encoding>${project.build.sourceEncoding}</encoding> + </configuration> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> -- 1.6.2.5 ^ permalink raw reply related [flat|nested] 19+ messages in thread
[parent not found: <1253740570-10718-2-git-send-email-struberg@yahoo.de>]
* [JGIT PATCH 3/9] moving some license files and META-INF [not found] ` <1253740570-10718-2-git-send-email-struberg@yahoo.de> @ 2009-09-23 21:16 ` Mark Struberg 2009-09-23 21:16 ` [JGIT PATCH 4/9] checkin all eclipse project file changes Mark Struberg 0 siblings, 1 reply; 19+ messages in thread From: Mark Struberg @ 2009-09-23 21:16 UTC (permalink / raw) To: git, spearce; +Cc: Mark Struberg Signed-off-by: Mark Struberg <struberg@yahoo.de> removed LICENSE files from submodules. One in the parent folder is enough. --- org.spearce.jgit.test/LICENSE => LICENSE | 0 NOTICE | 7 ++++ .../lib => licenses}/JSch.LICENSE.txt | 0 org.spearce.jgit/LICENSE | 34 -------------------- org.spearce.jgit/lib/jsch-0.1.37.jar | Bin 206178 -> 0 bytes org.spearce.jgit/lib/jsch-0.1.37.zip | Bin 268804 -> 0 bytes .../{ => src/main/resources}/META-INF/MANIFEST.MF | 0 7 files changed, 7 insertions(+), 34 deletions(-) rename org.spearce.jgit.test/LICENSE => LICENSE (100%) create mode 100644 NOTICE rename {org.spearce.jgit/lib => licenses}/JSch.LICENSE.txt (100%) delete mode 100644 org.spearce.jgit/LICENSE delete mode 100644 org.spearce.jgit/lib/jsch-0.1.37.jar delete mode 100644 org.spearce.jgit/lib/jsch-0.1.37.zip rename org.spearce.jgit/{ => src/main/resources}/META-INF/MANIFEST.MF (100%) diff --git a/org.spearce.jgit.test/LICENSE b/LICENSE similarity index 100% rename from org.spearce.jgit.test/LICENSE rename to LICENSE diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..c19fbc3 --- /dev/null +++ b/NOTICE @@ -0,0 +1,7 @@ +JGIT Java native GIT core library + +see LICENSE for mor information + +This product uses the library jsch-0.1.38.jar as binary, +home page of the project is http://www.jcraft.com/jsch/ + diff --git a/org.spearce.jgit/lib/JSch.LICENSE.txt b/licenses/JSch.LICENSE.txt similarity index 100% rename from org.spearce.jgit/lib/JSch.LICENSE.txt rename to licenses/JSch.LICENSE.txt diff --git a/org.spearce.jgit/LICENSE b/org.spearce.jgit/LICENSE deleted file mode 100644 index 2917c22..0000000 --- a/org.spearce.jgit/LICENSE +++ /dev/null @@ -1,34 +0,0 @@ -/* - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * - Neither the name of the Git Development Community nor the - * names of its contributors may be used to endorse or promote - * products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ diff --git a/org.spearce.jgit/lib/jsch-0.1.37.jar b/org.spearce.jgit/lib/jsch-0.1.37.jar deleted file mode 100644 index e38c4b3..0000000 Binary files a/org.spearce.jgit/lib/jsch-0.1.37.jar and /dev/null differ diff --git a/org.spearce.jgit/lib/jsch-0.1.37.zip b/org.spearce.jgit/lib/jsch-0.1.37.zip deleted file mode 100644 index 63f3575..0000000 Binary files a/org.spearce.jgit/lib/jsch-0.1.37.zip and /dev/null differ diff --git a/org.spearce.jgit/META-INF/MANIFEST.MF b/org.spearce.jgit/src/main/resources/META-INF/MANIFEST.MF similarity index 100% rename from org.spearce.jgit/META-INF/MANIFEST.MF rename to org.spearce.jgit/src/main/resources/META-INF/MANIFEST.MF -- 1.6.2.5 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [JGIT PATCH 4/9] checkin all eclipse project file changes 2009-09-23 21:16 ` [JGIT PATCH 3/9] moving some license files and META-INF Mark Struberg @ 2009-09-23 21:16 ` Mark Struberg 2009-09-23 21:16 ` [JGIT PATCH 5/9] mavenized org.spearce.jgit.pgm Mark Struberg 0 siblings, 1 reply; 19+ messages in thread From: Mark Struberg @ 2009-09-23 21:16 UTC (permalink / raw) To: git, spearce; +Cc: Mark Struberg Signed-off-by: Mark Struberg <struberg@yahoo.de> --- 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 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [JGIT PATCH 5/9] mavenized org.spearce.jgit.pgm 2009-09-23 21:16 ` [JGIT PATCH 4/9] checkin all eclipse project file changes Mark Struberg @ 2009-09-23 21:16 ` Mark Struberg 2009-09-23 21:16 ` [JGIT PATCH 6/9] enable missing test cases and fix jgit executable creation Mark Struberg 0 siblings, 1 reply; 19+ messages in thread From: Mark Struberg @ 2009-09-23 21:16 UTC (permalink / raw) To: git, spearce; +Cc: Mark Struberg * moved org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/ -> org.spearce.jgit.pgm/src/main/java * all pgm related stuff has been moved to org.speace.jgit.pgm This includes jgit.sh and the jgit executable * create the jgit executable with maven; deleted make_jgit.sh. Instead type $>mvn clean install in the root directory and you'll get org.spearce.jgit.pgm/jgit Signed-off-by: Mark Struberg <struberg@yahoo.de> --- NOTICE | 12 +- .../lib => licenses}/args4j.LICENSE.txt | 0 make_jgit.sh | 132 ------------- org.spearce.jgit.pgm/.gitignore | 1 - jgit.sh => org.spearce.jgit.pgm/jgit.sh | 7 +- org.spearce.jgit.pgm/lib/args4j-2.0.9.jar | Bin 40654 -> 0 bytes org.spearce.jgit.pgm/lib/args4j-2.0.9.zip | Bin 31516 -> 0 bytes org.spearce.jgit.pgm/pom.xml | 173 +++++++++++------ .../org/spearce/jgit/pgm/AbstractFetchCommand.java | 0 .../java}/org/spearce/jgit/pgm/Branch.java | 0 .../java}/org/spearce/jgit/pgm/Clone.java | 0 .../java}/org/spearce/jgit/pgm/Command.java | 0 .../java}/org/spearce/jgit/pgm/CommandCatalog.java | 0 .../java}/org/spearce/jgit/pgm/CommandRef.java | 0 .../java}/org/spearce/jgit/pgm/Daemon.java | 0 .../{ => main/java}/org/spearce/jgit/pgm/Die.java | 0 .../java}/org/spearce/jgit/pgm/DiffTree.java | 0 .../java}/org/spearce/jgit/pgm/Fetch.java | 0 .../{ => main/java}/org/spearce/jgit/pgm/Glog.java | 0 .../java}/org/spearce/jgit/pgm/IndexPack.java | 0 .../{ => main/java}/org/spearce/jgit/pgm/Init.java | 0 .../{ => main/java}/org/spearce/jgit/pgm/Log.java | 0 .../java}/org/spearce/jgit/pgm/LsRemote.java | 0 .../java}/org/spearce/jgit/pgm/LsTree.java | 0 .../{ => main/java}/org/spearce/jgit/pgm/Main.java | 0 .../java}/org/spearce/jgit/pgm/MergeBase.java | 0 .../{ => main/java}/org/spearce/jgit/pgm/Push.java | 0 .../java}/org/spearce/jgit/pgm/ReceivePack.java | 0 .../java}/org/spearce/jgit/pgm/RevList.java | 0 .../java}/org/spearce/jgit/pgm/RevParse.java | 0 .../org/spearce/jgit/pgm/RevWalkTextBuiltin.java | 0 .../{ => main/java}/org/spearce/jgit/pgm/Rm.java | 0 .../java}/org/spearce/jgit/pgm/ShowRef.java | 0 .../{ => main/java}/org/spearce/jgit/pgm/Tag.java | 0 .../java}/org/spearce/jgit/pgm/TextBuiltin.java | 0 .../java}/org/spearce/jgit/pgm/UploadPack.java | 0 .../java}/org/spearce/jgit/pgm/Version.java | 0 .../org/spearce/jgit/pgm/debug/MakeCacheTree.java | 0 .../org/spearce/jgit/pgm/debug/ReadDirCache.java | 0 .../spearce/jgit/pgm/debug/RebuildCommitGraph.java | 0 .../org/spearce/jgit/pgm/debug/ShowCacheTree.java | 0 .../org/spearce/jgit/pgm/debug/ShowCommands.java | 0 .../org/spearce/jgit/pgm/debug/ShowDirCache.java | 0 .../org/spearce/jgit/pgm/debug/WriteDirCache.java | 0 .../jgit/pgm/opt/AbstractTreeIteratorHandler.java | 0 .../org/spearce/jgit/pgm/opt/CmdLineParser.java | 0 .../org/spearce/jgit/pgm/opt/ObjectIdHandler.java | 0 .../jgit/pgm/opt/PathTreeFilterHandler.java | 0 .../org/spearce/jgit/pgm/opt/RefSpecHandler.java | 0 .../org/spearce/jgit/pgm/opt/RevCommitHandler.java | 0 .../org/spearce/jgit/pgm/opt/RevTreeHandler.java | 0 .../spearce/jgit/pgm/opt/SubcommandHandler.java | 0 .../services/org.spearce.jgit.pgm.TextBuiltin | 0 .../org/spearce/jgit/pgm/build/JarLinkUtil.java | 206 -------------------- 54 files changed, 129 insertions(+), 402 deletions(-) rename {org.spearce.jgit.pgm/lib => licenses}/args4j.LICENSE.txt (100%) delete mode 100755 make_jgit.sh rename jgit.sh => org.spearce.jgit.pgm/jgit.sh (79%) delete mode 100644 org.spearce.jgit.pgm/lib/args4j-2.0.9.jar delete mode 100644 org.spearce.jgit.pgm/lib/args4j-2.0.9.zip rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/AbstractFetchCommand.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Branch.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Clone.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Command.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/CommandCatalog.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/CommandRef.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Daemon.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Die.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/DiffTree.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Fetch.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Glog.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/IndexPack.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Init.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Log.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/LsRemote.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/LsTree.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Main.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/MergeBase.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Push.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/ReceivePack.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/RevList.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/RevParse.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/RevWalkTextBuiltin.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Rm.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/ShowRef.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Tag.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/TextBuiltin.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/UploadPack.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Version.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/debug/MakeCacheTree.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/debug/ReadDirCache.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/debug/RebuildCommitGraph.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/debug/ShowCacheTree.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/debug/ShowCommands.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/debug/ShowDirCache.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/debug/WriteDirCache.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/opt/AbstractTreeIteratorHandler.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/opt/CmdLineParser.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/opt/ObjectIdHandler.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/opt/PathTreeFilterHandler.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/opt/RefSpecHandler.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/opt/RevCommitHandler.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/opt/RevTreeHandler.java (100%) rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/opt/SubcommandHandler.java (100%) rename org.spearce.jgit.pgm/src/{ => main/resources}/META-INF/services/org.spearce.jgit.pgm.TextBuiltin (100%) delete mode 100644 org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/build/JarLinkUtil.java diff --git a/NOTICE b/NOTICE index c19fbc3..ad1d1ee 100644 --- a/NOTICE +++ b/NOTICE @@ -1,7 +1,13 @@ JGIT Java native GIT core library -see LICENSE for mor information +see LICENSE for more information on JGIT. -This product uses the library jsch-0.1.38.jar as binary, -home page of the project is http://www.jcraft.com/jsch/ + +This product uses the library jsch-0.1.38.jar as binary. +The home page of the project is http://www.jcraft.com/jsch/ +See licenses/JSch.LICENSE.txt for more information. + +This product uses the library args4j-2.0.9.jar as binary, +The home page of the project is https://args4j.dev.java.net/ +See licenses/args4j.LICENSE.txt for more information. diff --git a/org.spearce.jgit.pgm/lib/args4j.LICENSE.txt b/licenses/args4j.LICENSE.txt similarity index 100% rename from org.spearce.jgit.pgm/lib/args4j.LICENSE.txt rename to licenses/args4j.LICENSE.txt diff --git a/make_jgit.sh b/make_jgit.sh deleted file mode 100755 index e3f7ffa..0000000 --- a/make_jgit.sh +++ /dev/null @@ -1,132 +0,0 @@ -#!/bin/sh - -O_CLI=jgit -O_JAR=jgit.jar -O_SRC=jgit_src.zip -O_DOC=jgit_docs.zip - -PLUGINS=" - org.spearce.jgit - org.spearce.jgit.pgm -" -JARS=" - org.spearce.jgit/lib/jsch-0.1.37.jar - org.spearce.jgit.pgm/lib/args4j-2.0.9.jar -" - -PSEP=":" -T=".temp$$.$O_CLI" -T_MF="$T.MF" -R=`pwd` -if [ "$OSTYPE" = "cygwin" ] -then - R=`cygpath -m $R` - PSEP=";" -fi -if [ "$MSYSTEM" = "MINGW" -o "$MSYSTEM" = "MINGW32" ] -then - PSEP=";" - R=`pwd -W` -fi - -if [ -n "$JAVA_HOME" ] -then - PATH=${JAVA_HOME}/bin${PSEP}${PATH} -fi - -cleanup_bin() { - rm -f $T $O_CLI+ $O_JAR+ $O_SRC+ $T_MF - for p in $PLUGINS - do - rm -rf $p/bin2 - done - rm -rf docs -} - -die() { - cleanup_bin - rm -f $O_CLI $O_JAR $O_SRC - echo >&2 "$@" - exit 1 -} - -cleanup_bin -rm -f $O_CLI $O_JAR $O_SRC $O_DOC - -VN=`git describe --abbrev=4 HEAD 2>/dev/null` -git update-index -q --refresh -if [ -n "`git diff-index --name-only HEAD --`" ] -then - VN="$VN-dirty" -fi -VN=${VN:-untagged}`echo "$VN" | sed -e s/-/./g` - -CLASSPATH= -for j in $JARS -do - if [ -z "$CLASSPATH" ] - then - CLASSPATH="$R/$j" - else - CLASSPATH="${CLASSPATH}${PSEP}$R/$j" - fi -done -export CLASSPATH - -for p in $PLUGINS -do - echo "Entering $p ..." - (cd $p/src && - mkdir ../bin2 && - find . -name \*.java -type f | - xargs javac \ - -source 1.5 \ - -target 1.5 \ - -encoding UTF-8 \ - -g \ - -d ../bin2) || die "Building $p failed." - CLASSPATH="${CLASSPATH}${PSEP}$R/$p/bin2" -done -echo - -echo "Version $VN" && -echo Manifest-Version: 1.0 >$T_MF && -echo Implementation-Title: jgit >>$T_MF && -echo Implementation-Version: $VN >>$T_MF && - -java org.spearce.jgit.pgm.build.JarLinkUtil \ - -include org.spearce.jgit/bin2 \ - -file META-INF/MANIFEST.MF=$T_MF \ - >$O_JAR+ && -mv $O_JAR+ $O_JAR && -echo "Created $O_JAR." && - -java org.spearce.jgit.pgm.build.JarLinkUtil \ - -include org.spearce.jgit/src \ - -file META-INF/MANIFEST.MF=$T_MF \ - >$O_SRC+ && -mv $O_SRC+ $O_SRC && -echo "Created $O_SRC." && - -M_TB=META-INF/services/org.spearce.jgit.pgm.TextBuiltin && -sed s/@@use_self@@/1/ jgit.sh >$O_CLI+ && -java org.spearce.jgit.pgm.build.JarLinkUtil \ - `for p in $JARS ; do printf %s " -include $p" ;done` \ - `for p in $PLUGINS; do printf %s " -include $p/bin2";done` \ - -file $M_TB=org.spearce.jgit.pgm/src/$M_TB \ - -file META-INF/MANIFEST.MF=$T_MF \ - >>$O_CLI+ && -chmod 555 $O_CLI+ && -mv $O_CLI+ $O_CLI && -echo "Created $O_CLI." || die "Build failed." - -echo "Building Javadocs ..." -for p in $PLUGINS; do - javadoc -quiet -sourcepath "$p/src/" -d "docs/$p/" \ - `find "$p/src" -name "*.java"` -done - -(cd docs && jar cf "../$O_DOC" .) -echo "Created $O_DOC." - -cleanup_bin diff --git a/org.spearce.jgit.pgm/.gitignore b/org.spearce.jgit.pgm/.gitignore index 934e0e0..ea8c4bf 100644 --- a/org.spearce.jgit.pgm/.gitignore +++ b/org.spearce.jgit.pgm/.gitignore @@ -1,2 +1 @@ -/bin /target diff --git a/jgit.sh b/org.spearce.jgit.pgm/jgit.sh similarity index 79% rename from jgit.sh rename to org.spearce.jgit.pgm/jgit.sh index 6b9b224..5e44356 100755 --- a/jgit.sh +++ b/org.spearce.jgit.pgm/jgit.sh @@ -7,10 +7,9 @@ then cp=$this_script else jgit_home=`dirname $0` - cp="$jgit_home/org.spearce.jgit/bin" - cp="$cp:$jgit_home/org.spearce.jgit/lib/jsch-0.1.37.jar" - cp="$cp:$jgit_home/org.spearce.jgit.pgm/bin" - cp="$cp:$jgit_home/org.spearce.jgit.pgm/lib/args4j-2.0.9.jar" + cp="$jgit_home/../org.spearce.jgit/target/classes" + cp="$cp:$jgit_home/../org.spearce.jgit.pgm/target/classes" + cp="$cp:$jgit_home/target/jgit-cli.jar" unset jgit_home java_args= fi diff --git a/org.spearce.jgit.pgm/lib/args4j-2.0.9.jar b/org.spearce.jgit.pgm/lib/args4j-2.0.9.jar deleted file mode 100644 index a894c6e..0000000 Binary files a/org.spearce.jgit.pgm/lib/args4j-2.0.9.jar and /dev/null differ diff --git a/org.spearce.jgit.pgm/lib/args4j-2.0.9.zip b/org.spearce.jgit.pgm/lib/args4j-2.0.9.zip deleted file mode 100644 index eccd663..0000000 Binary files a/org.spearce.jgit.pgm/lib/args4j-2.0.9.zip and /dev/null differ diff --git a/org.spearce.jgit.pgm/pom.xml b/org.spearce.jgit.pgm/pom.xml index 9501cb5..ab399e5 100644 --- a/org.spearce.jgit.pgm/pom.xml +++ b/org.spearce.jgit.pgm/pom.xml @@ -1,59 +1,120 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +/* + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * - Neither the name of the Git Development Community nor the + * names of its contributors may be used to endorse or promote + * products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +--> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.spearce</groupId> - <artifactId>jgit-parent</artifactId> - <version>0.5.0-SNAPSHOT</version> - </parent> - <artifactId>org.spearce.jgit.pgm</artifactId> - <name>JGit :: Pgm</name> - <dependencies> - <dependency> - <groupId>org.spearce</groupId> - <artifactId>org.spearce.jgit</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>args4j</groupId> - <artifactId>args4j</artifactId> - </dependency> - </dependencies> - <build> - <sourceDirectory>src</sourceDirectory> - <resources> - <resource> - <directory>src</directory> - <includes> - <include>**/services/**</include> - </includes> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>1.2</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <finalName>jgit-cli</finalName> - <createDependencyReducedPom>false</createDependencyReducedPom> - <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> - <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <mainClass>org.spearce.jgit.pgm.Main</mainClass> - </transformer> - </transformers> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.spearce</groupId> + <artifactId>jgit-parent</artifactId> + <version>0.5.0-SNAPSHOT</version> + </parent> + + <artifactId>org.spearce.jgit.pgm</artifactId> + <name>JGit :: Pgm</name> + + <description> + Command line client for the JGit pure Java GIT implementation. + This includes the re-packaging of all dependencies into an 'uberjar' + </description> + + <dependencies> + <dependency> + <groupId>org.spearce</groupId> + <artifactId>org.spearce.jgit</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>args4j</groupId> + <artifactId>args4j</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> +<!-- temporarily DISABLED due to MSHADE-54 <shadedArtifactAttached>true</shadedArtifactAttached>--> + <finalName>jgit-cli</finalName> + <createDependencyReducedPom>false</createDependencyReducedPom> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> + <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <mainClass>org.spearce.jgit.pgm.Main</mainClass> + </transformer> + </transformers> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + <executions> + <execution> + <id>create_jgit</id> + <phase>package</phase> + <configuration> + <tasks> + <concat destfile="${basedir}/jgit" force="no"> + <fileset file="${basedir}/jgit.sh" /> + <fileset file="${basedir}/target/jgit-cli.jar" /> + </concat> + <chmod file="${basedir}/jgit" perm="a+x"/> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/AbstractFetchCommand.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/AbstractFetchCommand.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/AbstractFetchCommand.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/AbstractFetchCommand.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Branch.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Branch.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Branch.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Branch.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Clone.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Clone.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Clone.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Clone.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Command.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Command.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Command.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Command.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/CommandCatalog.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/CommandCatalog.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/CommandCatalog.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/CommandCatalog.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/CommandRef.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/CommandRef.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/CommandRef.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/CommandRef.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Daemon.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Daemon.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Daemon.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Daemon.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Die.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Die.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Die.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Die.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/DiffTree.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/DiffTree.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/DiffTree.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/DiffTree.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Fetch.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Fetch.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Fetch.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Fetch.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Glog.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Glog.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Glog.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Glog.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/IndexPack.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/IndexPack.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/IndexPack.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/IndexPack.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Init.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Init.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Init.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Init.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Log.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Log.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Log.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Log.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/LsRemote.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/LsRemote.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/LsRemote.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/LsRemote.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/LsTree.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/LsTree.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/LsTree.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/LsTree.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Main.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Main.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Main.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Main.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/MergeBase.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/MergeBase.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/MergeBase.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/MergeBase.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Push.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Push.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Push.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Push.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/ReceivePack.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/ReceivePack.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/ReceivePack.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/ReceivePack.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/RevList.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/RevList.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/RevList.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/RevList.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/RevParse.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/RevParse.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/RevParse.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/RevParse.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/RevWalkTextBuiltin.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/RevWalkTextBuiltin.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/RevWalkTextBuiltin.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/RevWalkTextBuiltin.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Rm.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Rm.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Rm.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Rm.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/ShowRef.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/ShowRef.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/ShowRef.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/ShowRef.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Tag.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Tag.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Tag.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Tag.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/TextBuiltin.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/TextBuiltin.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/UploadPack.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/UploadPack.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/UploadPack.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/UploadPack.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Version.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Version.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Version.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Version.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/MakeCacheTree.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/MakeCacheTree.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/MakeCacheTree.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/MakeCacheTree.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/ReadDirCache.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/ReadDirCache.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/ReadDirCache.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/ReadDirCache.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/RebuildCommitGraph.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/RebuildCommitGraph.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/RebuildCommitGraph.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/RebuildCommitGraph.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/ShowCacheTree.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/ShowCacheTree.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/ShowCacheTree.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/ShowCacheTree.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/ShowCommands.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/ShowCommands.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/ShowCommands.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/ShowCommands.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/ShowDirCache.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/ShowDirCache.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/ShowDirCache.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/ShowDirCache.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/WriteDirCache.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/WriteDirCache.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/WriteDirCache.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/WriteDirCache.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/AbstractTreeIteratorHandler.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/AbstractTreeIteratorHandler.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/AbstractTreeIteratorHandler.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/AbstractTreeIteratorHandler.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/CmdLineParser.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/CmdLineParser.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/CmdLineParser.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/CmdLineParser.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/ObjectIdHandler.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/ObjectIdHandler.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/ObjectIdHandler.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/ObjectIdHandler.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/PathTreeFilterHandler.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/PathTreeFilterHandler.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/PathTreeFilterHandler.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/PathTreeFilterHandler.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/RefSpecHandler.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/RefSpecHandler.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/RefSpecHandler.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/RefSpecHandler.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/RevCommitHandler.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/RevCommitHandler.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/RevCommitHandler.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/RevCommitHandler.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/RevTreeHandler.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/RevTreeHandler.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/RevTreeHandler.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/RevTreeHandler.java diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/SubcommandHandler.java b/org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/SubcommandHandler.java similarity index 100% rename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/SubcommandHandler.java rename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/SubcommandHandler.java diff --git a/org.spearce.jgit.pgm/src/META-INF/services/org.spearce.jgit.pgm.TextBuiltin b/org.spearce.jgit.pgm/src/main/resources/META-INF/services/org.spearce.jgit.pgm.TextBuiltin similarity index 100% rename from org.spearce.jgit.pgm/src/META-INF/services/org.spearce.jgit.pgm.TextBuiltin rename to org.spearce.jgit.pgm/src/main/resources/META-INF/services/org.spearce.jgit.pgm.TextBuiltin diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/build/JarLinkUtil.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/build/JarLinkUtil.java deleted file mode 100644 index 929ee55..0000000 --- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/build/JarLinkUtil.java +++ /dev/null @@ -1,206 +0,0 @@ -/* - * Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org> - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * - Neither the name of the Git Development Community nor the - * names of its contributors may be used to endorse or promote - * products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package org.spearce.jgit.pgm.build; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; -import java.util.zip.ZipOutputStream; - -import org.kohsuke.args4j.CmdLineException; -import org.kohsuke.args4j.CmdLineParser; -import org.kohsuke.args4j.Option; -import org.kohsuke.args4j.spi.MapOptionHandler; - -/** - * Combines multiple JAR and directory sources into a single JAR file. - * <p> - * This is a crude command line utility to combine multiple JAR files into a - * single JAR file, without first needing to unpack the individual JARs. - * <p> - * The output ZIP stream is sent to standard out and can be redirected onto the - * end of a shell script which starts the JRE. - */ -public class JarLinkUtil { - /** - * Combine multiple JARs. - * - * @param argv - * the command line arguments indicating the files to pack. - * @throws IOException - * a source file could not be read. - */ - public static void main(final String[] argv) throws IOException { - final JarLinkUtil util = new JarLinkUtil(); - final CmdLineParser clp = new CmdLineParser(util); - try { - clp.parseArgument(argv); - } catch (CmdLineException e) { - clp.printSingleLineUsage(System.err); - System.exit(1); - } - util.run(); - } - - @Option(name = "-include", required = true) - private List<File> includes = new ArrayList<File>(); - - @Option(name = "-file", handler = MapOptionHandler.class) - private Map<String, String> files = new HashMap<String, String>(); - - private final Map<String, File> chosenSources = new HashMap<String, File>(); - - private long creationTime; - - private ZipOutputStream zos; - - private JarLinkUtil() { - // Command line utility only. - } - - private void run() throws IOException { - for (final File src : includes) { - if (src.isFile()) - scanJar(src); - else - scanDirectory(src, src, ""); - } - for (final Map.Entry<String, String> e : files.entrySet()) - chosenSources.put(e.getKey(), new File(e.getValue())); - - creationTime = System.currentTimeMillis(); - zos = new ZipOutputStream(System.out); - zos.setLevel(9); - - for (final File src : includes) { - if (src.isFile()) - appendJar(src); - else - appendDirectory(src, src, ""); - } - for (final String name : files.keySet()) - appendFile(chosenSources.get(name), name); - - zos.close(); - } - - private void scanJar(final File jarPath) throws IOException { - final ZipFile zf = new ZipFile(jarPath); - final Enumeration<? extends ZipEntry> e = zf.entries(); - while (e.hasMoreElements()) - chosenSources.put(e.nextElement().getName(), jarPath); - zf.close(); - } - - private void scanDirectory(final File rootPath, final File dirPath, - final String pfx) throws IOException { - final File[] entries = dirPath.listFiles(); - if (entries == null) - return; - for (final File e : entries) { - if (e.getName().equals(".") || e.getName().equals("..")) - continue; - - if (e.isDirectory()) - scanDirectory(rootPath, e, pfx + e.getName() + "/"); - else - chosenSources.put(pfx + e.getName(), rootPath); - } - } - - private void appendJar(final File jarPath) throws IOException { - final ZipFile zf = new ZipFile(jarPath); - final Enumeration<? extends ZipEntry> e = zf.entries(); - while (e.hasMoreElements()) { - final ZipEntry ze = e.nextElement(); - final String name = ze.getName(); - if (chosenSources.get(name) == jarPath) - appendEntry(name, ze.getSize(), ze.getTime(), zf - .getInputStream(ze)); - } - zf.close(); - } - - private void appendDirectory(final File rootDir, final File dirPath, - final String pfx) throws IOException { - final File[] entries = dirPath.listFiles(); - if (entries == null) - return; - for (final File e : entries) { - if (e.getName().equals(".") || e.getName().equals("..")) - continue; - - if (e.isDirectory()) - appendDirectory(rootDir, e, pfx + e.getName() + "/"); - else if (chosenSources.get(pfx + e.getName()) == rootDir) - appendFile(e, pfx + e.getName()); - } - } - - private void appendFile(final File path, final String name) - throws IOException { - final long len = path.length(); - final InputStream is = new FileInputStream(path); - appendEntry(name, len, creationTime, is); - } - - private void appendEntry(final String name, final long len, - final long time, final InputStream is) throws IOException { - final ZipEntry ze = new ZipEntry(name); - ze.setSize(len); - ze.setTime(time); - zos.putNextEntry(ze); - try { - final byte[] buf = new byte[4096]; - int n; - while ((n = is.read(buf)) >= 0) - zos.write(buf, 0, n); - } finally { - is.close(); - } - zos.closeEntry(); - } -} -- 1.6.2.5 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [JGIT PATCH 6/9] enable missing test cases and fix jgit executable creation 2009-09-23 21:16 ` [JGIT PATCH 5/9] mavenized org.spearce.jgit.pgm Mark Struberg @ 2009-09-23 21:16 ` Mark Struberg 2009-09-23 21:16 ` [JGIT PATCH 7/9] removing eclipse project files Mark Struberg 0 siblings, 1 reply; 19+ messages in thread From: Mark Struberg @ 2009-09-23 21:16 UTC (permalink / raw) To: git, spearce; +Cc: Mark Struberg * enable the T000* tests in surefire * fix the creation of the jgit executable by correcting the use_self filtering and performing the copy task in binary mode Signed-off-by: Mark Struberg <struberg@yahoo.de> --- org.spearce.jgit.pgm/jgit.sh | 2 +- org.spearce.jgit.pgm/pom.xml | 12 +++++++++--- org.spearce.jgit/pom.xml | 5 +++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/org.spearce.jgit.pgm/jgit.sh b/org.spearce.jgit.pgm/jgit.sh index 5e44356..6c101a0 100755 --- a/org.spearce.jgit.pgm/jgit.sh +++ b/org.spearce.jgit.pgm/jgit.sh @@ -1,6 +1,6 @@ #!/bin/sh -if [ "@@use_self@@" = "1" ] +if [ "@use_self@" = "1" ] then this_script=`which "$0" 2>/dev/null` [ $? -gt 0 -a -f "$0" ] && this_script="$0" diff --git a/org.spearce.jgit.pgm/pom.xml b/org.spearce.jgit.pgm/pom.xml index ab399e5..47dfbf1 100644 --- a/org.spearce.jgit.pgm/pom.xml +++ b/org.spearce.jgit.pgm/pom.xml @@ -102,11 +102,17 @@ <phase>package</phase> <configuration> <tasks> - <concat destfile="${basedir}/jgit" force="no"> - <fileset file="${basedir}/jgit.sh" /> + <copy todir="${basedir}/target/"> + <fileset file="${basedir}/jgit.sh"/> + <filterset> + <filter token="use_self" value="1"/> + </filterset> + </copy> + <concat destfile="${basedir}/target/jgit" force="yes" binary="true"> + <fileset file="${basedir}/target/jgit.sh" /> <fileset file="${basedir}/target/jgit-cli.jar" /> </concat> - <chmod file="${basedir}/jgit" perm="a+x"/> + <chmod file="${basedir}/target/jgit" perm="a+x"/> </tasks> </configuration> <goals> diff --git a/org.spearce.jgit/pom.xml b/org.spearce.jgit/pom.xml index eb01e16..f565dda 100644 --- a/org.spearce.jgit/pom.xml +++ b/org.spearce.jgit/pom.xml @@ -107,6 +107,10 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <includes> + <include>**/*Test.java</include> + <include>**/T00*.java</include> + </includes> <excludes> <exclude>**/*TckTest.java</exclude> </excludes> @@ -125,6 +129,7 @@ <configuration> <includes> <include>**/*Test.java</include> + <include>**/T00*.java</include> </includes> </configuration> </plugin> -- 1.6.2.5 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [JGIT PATCH 7/9] removing eclipse project files 2009-09-23 21:16 ` [JGIT PATCH 6/9] enable missing test cases and fix jgit executable creation Mark Struberg @ 2009-09-23 21:16 ` Mark Struberg 2009-09-24 6:29 ` Ferry Huberts 2009-09-24 11:24 ` Sohn, Matthias 0 siblings, 2 replies; 19+ messages in thread From: Mark Struberg @ 2009-09-23 21:16 UTC (permalink / raw) To: git, spearce; +Cc: Mark Struberg All information necessary to build jgit is already available in the maven pom.xmls. Signed-off-by: Mark Struberg <struberg@yahoo.de> --- org.spearce.jgit.pgm/.classpath | 8 - org.spearce.jgit.pgm/.gitignore | 5 + org.spearce.jgit.pgm/.project | 17 - .../.settings/org.eclipse.core.resources.prefs | 3 - .../.settings/org.eclipse.core.runtime.prefs | 3 - .../.settings/org.eclipse.jdt.core.prefs | 321 -------------------- .../.settings/org.eclipse.jdt.ui.prefs | 9 - org.spearce.jgit/.classpath | 10 - org.spearce.jgit/.gitignore | 6 +- org.spearce.jgit/.project | 34 -- .../.settings/org.eclipse.core.resources.prefs | 3 - .../.settings/org.eclipse.core.runtime.prefs | 3 - .../.settings/org.eclipse.jdt.core.prefs | 321 -------------------- .../.settings/org.eclipse.jdt.ui.prefs | 9 - .../.settings/org.maven.ide.eclipse.prefs | 9 - 15 files changed, 10 insertions(+), 751 deletions(-) delete mode 100644 org.spearce.jgit.pgm/.classpath delete mode 100644 org.spearce.jgit.pgm/.project delete mode 100644 org.spearce.jgit.pgm/.settings/org.eclipse.core.resources.prefs delete mode 100644 org.spearce.jgit.pgm/.settings/org.eclipse.core.runtime.prefs delete mode 100644 org.spearce.jgit.pgm/.settings/org.eclipse.jdt.core.prefs delete mode 100644 org.spearce.jgit.pgm/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 org.spearce.jgit/.classpath delete mode 100644 org.spearce.jgit/.project delete mode 100644 org.spearce.jgit/.settings/org.eclipse.core.resources.prefs delete mode 100644 org.spearce.jgit/.settings/org.eclipse.core.runtime.prefs delete mode 100644 org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs delete mode 100644 org.spearce.jgit/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 org.spearce.jgit/.settings/org.maven.ide.eclipse.prefs diff --git a/org.spearce.jgit.pgm/.classpath b/org.spearce.jgit.pgm/.classpath deleted file mode 100644 index 50dd6d3..0000000 --- a/org.spearce.jgit.pgm/.classpath +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry exported="true" kind="lib" path="lib/args4j-2.0.9.jar" sourcepath="lib/args4j-2.0.9.zip"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.spearce.jgit"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/org.spearce.jgit.pgm/.gitignore b/org.spearce.jgit.pgm/.gitignore index ea8c4bf..60a813a 100644 --- a/org.spearce.jgit.pgm/.gitignore +++ b/org.spearce.jgit.pgm/.gitignore @@ -1 +1,6 @@ /target +/.classpath +/.project +/.settings +/*.iwl +/*.ipr diff --git a/org.spearce.jgit.pgm/.project b/org.spearce.jgit.pgm/.project deleted file mode 100644 index e642f9e..0000000 --- a/org.spearce.jgit.pgm/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.spearce.jgit.pgm</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/org.spearce.jgit.pgm/.settings/org.eclipse.core.resources.prefs b/org.spearce.jgit.pgm/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 759548b..0000000 --- a/org.spearce.jgit.pgm/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Mon Aug 11 16:46:23 PDT 2008 -eclipse.preferences.version=1 -encoding/<project>=UTF-8 diff --git a/org.spearce.jgit.pgm/.settings/org.eclipse.core.runtime.prefs b/org.spearce.jgit.pgm/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 006e07e..0000000 --- a/org.spearce.jgit.pgm/.settings/org.eclipse.core.runtime.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Mon Mar 24 18:55:50 EDT 2008 -eclipse.preferences.version=1 -line.separator=\n diff --git a/org.spearce.jgit.pgm/.settings/org.eclipse.jdt.core.prefs b/org.spearce.jgit.pgm/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f0c80d3..0000000 --- a/org.spearce.jgit.pgm/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,321 +0,0 @@ -#Sun Mar 15 19:46:39 CET 2009 -eclipse.preferences.version=1 -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=warning -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=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning -org.eclipse.jdt.core.compiler.problem.fieldHiding=warning -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -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.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=error -org.eclipse.jdt.core.compiler.problem.unusedLabel=error -org.eclipse.jdt.core.compiler.problem.unusedLocal=error -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error -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=1 -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_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=false -org.eclipse.jdt.core.formatter.comment.format_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_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -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=4 -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_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=80 -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 diff --git a/org.spearce.jgit.pgm/.settings/org.eclipse.jdt.ui.prefs b/org.spearce.jgit.pgm/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 709a440..0000000 --- a/org.spearce.jgit.pgm/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Wed May 09 00:20:24 CEST 2007 -eclipse.preferences.version=1 -formatter_profile=_JGit -formatter_settings_version=10 -org.eclipse.jdt.ui.ignorelowercasenames=true -org.eclipse.jdt.ui.importorder=java;javax;org;com; -org.eclipse.jdt.ui.ondemandthreshold=99 -org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/> diff --git a/org.spearce.jgit/.classpath b/org.spearce.jgit/.classpath deleted file mode 100644 index c1c8f51..0000000 --- a/org.spearce.jgit/.classpath +++ /dev/null @@ -1,10 +0,0 @@ -<?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.pde.core.requiredPlugins"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> diff --git a/org.spearce.jgit/.gitignore b/org.spearce.jgit/.gitignore index 934e0e0..60a813a 100644 --- a/org.spearce.jgit/.gitignore +++ b/org.spearce.jgit/.gitignore @@ -1,2 +1,6 @@ -/bin /target +/.classpath +/.project +/.settings +/*.iwl +/*.ipr diff --git a/org.spearce.jgit/.project b/org.spearce.jgit/.project deleted file mode 100644 index da2f7cf..0000000 --- a/org.spearce.jgit/.project +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.spearce.jgit</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <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> -</projectDescription> diff --git a/org.spearce.jgit/.settings/org.eclipse.core.resources.prefs b/org.spearce.jgit/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 66ac15c..0000000 --- a/org.spearce.jgit/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Mon Aug 11 16:46:12 PDT 2008 -eclipse.preferences.version=1 -encoding/<project>=UTF-8 diff --git a/org.spearce.jgit/.settings/org.eclipse.core.runtime.prefs b/org.spearce.jgit/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index cce0568..0000000 --- a/org.spearce.jgit/.settings/org.eclipse.core.runtime.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Mon Mar 24 18:55:50 EDT 2008 -eclipse.preferences.version=1 -line.separator=\n diff --git a/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs b/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 22d560f..0000000 --- a/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,321 +0,0 @@ -#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 -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=warning -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=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning -org.eclipse.jdt.core.compiler.problem.fieldHiding=warning -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -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=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 -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=error -org.eclipse.jdt.core.compiler.problem.unusedLabel=error -org.eclipse.jdt.core.compiler.problem.unusedLocal=error -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error -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=1 -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_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=false -org.eclipse.jdt.core.formatter.comment.format_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_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -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=4 -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_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=80 -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 diff --git a/org.spearce.jgit/.settings/org.eclipse.jdt.ui.prefs b/org.spearce.jgit/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 709a440..0000000 --- a/org.spearce.jgit/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Wed May 09 00:20:24 CEST 2007 -eclipse.preferences.version=1 -formatter_profile=_JGit -formatter_settings_version=10 -org.eclipse.jdt.ui.ignorelowercasenames=true -org.eclipse.jdt.ui.importorder=java;javax;org;com; -org.eclipse.jdt.ui.ondemandthreshold=99 -org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/> diff --git a/org.spearce.jgit/.settings/org.maven.ide.eclipse.prefs b/org.spearce.jgit/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 1e219ee..0000000 --- a/org.spearce.jgit/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#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 -- 1.6.2.5 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [JGIT PATCH 7/9] removing eclipse project files 2009-09-23 21:16 ` [JGIT PATCH 7/9] removing eclipse project files Mark Struberg @ 2009-09-24 6:29 ` Ferry Huberts 2009-09-24 6:55 ` Mark Struberg 2009-09-24 11:24 ` Sohn, Matthias 1 sibling, 1 reply; 19+ messages in thread From: Ferry Huberts @ 2009-09-24 6:29 UTC (permalink / raw) To: Mark Struberg; +Cc: git, spearce Mark Struberg wrote: > All information necessary to build jgit is already available in > the maven pom.xmls. > just out of curiosity, why would you remove the eclipse files? I for one - and I think many others - use Eclipse to work on the code... ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [JGIT PATCH 7/9] removing eclipse project files 2009-09-24 6:29 ` Ferry Huberts @ 2009-09-24 6:55 ` Mark Struberg 2009-09-24 7:57 ` Ferry Huberts 2009-09-25 21:40 ` Robin Rosenberg 0 siblings, 2 replies; 19+ messages in thread From: Mark Struberg @ 2009-09-24 6:55 UTC (permalink / raw) To: Ferry Huberts; +Cc: git, spearce Hi Ferry! I work on a lot of projects and having eclipse (or any other IDEs) project files in the SCM is almost ever causing a problem. In praxis those files are always dirty. There are so many settings which may be different from user to user * different versions of eclipse create different project settings * different JVM settings * changing profiler settings * using different version of various plugins etc, etc And with maven in place we don't need to have them in our SCM anymore. Plus: it works for a lot of IDEs You can easily create the project files for a few IDEs with maven e.g.: $> mvn eclipse:eclipse for creating the eclipse project files $> mvn idea:idea for creating the idea project files Additionally, plugins are available for Eclipse [1], Intellij Idea (native, builtin) and NetBeans (native, builtin). So most of the time it is enough to simply import the parent pom.xml and you get all things setup properly in your IDE. Or is there anything missing? LieGrue, strub [1] http://m2eclipse.sonatype.org --- On Thu, 9/24/09, Ferry Huberts <ferry.huberts@pelagic.nl> wrote: > From: Ferry Huberts <ferry.huberts@pelagic.nl> > Subject: Re: [JGIT PATCH 7/9] removing eclipse project files > To: "Mark Struberg" <struberg@yahoo.de> > Cc: git@vger.kernel.org, spearce@spearce.org > Date: Thursday, September 24, 2009, 8:29 AM > Mark Struberg wrote: > > All information necessary to build jgit is already > available in > > the maven pom.xmls. > > > > just out of curiosity, why would you remove the eclipse > files? > I for one - and I think many others - use Eclipse to work > on the code... > ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [JGIT PATCH 7/9] removing eclipse project files 2009-09-24 6:55 ` Mark Struberg @ 2009-09-24 7:57 ` Ferry Huberts 2009-09-24 8:24 ` Mark Struberg 2009-09-25 21:40 ` Robin Rosenberg 1 sibling, 1 reply; 19+ messages in thread From: Ferry Huberts @ 2009-09-24 7:57 UTC (permalink / raw) To: Mark Struberg; +Cc: Ferry Huberts, git, spearce > I work on a lot of projects and having eclipse (or any other IDEs) project files in the SCM is > almost ever causing a problem. In praxis those files are always dirty. There are so many settings > which may be different from user to user true. however, those problems can easily be avoided by the policy of not ever checking in those eclipse files unless coordinated within the project. we have many big java projects here internally and _do_ have the eclipse settings in git. it makes life so much easier for everyone to start work and we have many more settings in there that we actually want enforced. for example: we enforce a coding standard through eclipse by automatically formatting the source code and organising imports on file save. also, we want everybody to use the same settings when cleaning up the code. we want them to use the same findbugs settings, the same settings for xxx/yyy/.... > * different JVM settings if specified correctly this is actually an advantage: you can standardise your projects on a (minimum) JVM platform, like 1.5 > * using different version of various plugins we see that as an advantage so that we can standardise the development setup, or at least define some sort of minimum setup > You can easily create the project files for a few IDEs with maven e.g.: > $> mvn eclipse:eclipse for creating the eclipse project files > $> mvn idea:idea for creating the idea project files I know, quite handy :-) Think I have more questions now than before by discussing it :-) ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [JGIT PATCH 7/9] removing eclipse project files 2009-09-24 7:57 ` Ferry Huberts @ 2009-09-24 8:24 ` Mark Struberg 2009-09-24 8:57 ` Ferry Huberts 2009-09-24 8:57 ` Ferry Huberts 0 siblings, 2 replies; 19+ messages in thread From: Mark Struberg @ 2009-09-24 8:24 UTC (permalink / raw) To: Ferry Huberts; +Cc: Ferry Huberts, git, spearce Hi again and txs 4 your comments! There are a few problems with dirty files: a) one cannot automated make sure that all builds well and the build is reproducable if there are dirty files lying around. A build script cannot judge which changes doesn't affect the build in a bad way and thus may be ignored. b) therefore the maven-release-plugin will refuse to build a release if you have something dirty or not up2date. c) if people get used to have dirty files, they will simply refuse to merge them because they don't like to apply their local settings every time d) there are a lot of people working with Idea, NetBeans, vi, emacs, etc. All those people would not be forced by the settings in the eclipse config files. e) having all the rules in the underlying build system will allow us to easily enable continuous integration tools like e.g. Hudson. ad the JVM settings: I have up to 4 different JVMs installed on my boxes: 1.4.2, 1.5.x, 1.6.x stable and 1.6.x previews So I have to tell eclipse what exact JVM to use. Please note that the jdk1.5++ rule is already forced in the pom.xml maven-compiler-plugin settings. ad different plugin versions config: having only the settings for a new plugin doesn't do anything (beside crashing/breaking eclipse) if you don't have the right versions of the plugins itself installed actually ;) This is imho only enforcable in a company and not in an OSS project. LieGrue, strub --- On Thu, 9/24/09, Ferry Huberts <ferry.huberts@pelagic.nl> wrote: > From: Ferry Huberts <ferry.huberts@pelagic.nl> > Subject: Re: [JGIT PATCH 7/9] removing eclipse project files > To: "Mark Struberg" <struberg@yahoo.de> > Cc: "Ferry Huberts" <ferry.huberts@pelagic.nl>, git@vger.kernel.org, spearce@spearce.org > Date: Thursday, September 24, 2009, 9:57 AM > > > I work on a lot of projects and having eclipse (or any > other IDEs) project files in the SCM is > > almost ever causing a problem. In praxis those files > are always dirty. There are so many settings > > which may be different from user to user > > true. however, those problems can easily be avoided by the > policy of not ever checking in those eclipse files unless > coordinated within the project. > > we have many big java projects here internally and _do_ > have > the eclipse settings in git. it makes life so much easier > for > everyone to start work and we have many more settings in > there that we actually want enforced. > > for example: we enforce a coding standard through eclipse > by automatically formatting the source code and organising > imports on file save. also, we want everybody to use the > same > settings when cleaning up the code. we want them to use > the > same findbugs settings, the same settings for xxx/yyy/.... > > > * different JVM settings > > if specified correctly this is actually an advantage: you > can > standardise your projects on a (minimum) JVM platform, like > 1.5 > > > * using different version of various plugins > > we see that as an advantage so that we can standardise the > development setup, or at least define some sort of minimum > setup > > > > You can easily create the project files for a few IDEs > with maven e.g.: > > $> mvn eclipse:eclipse for > creating the eclipse project files > > $> mvn idea:idea > for creating the idea project files > > I know, quite handy :-) > > Think I have more questions now than before by discussing > it :-) > > ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [JGIT PATCH 7/9] removing eclipse project files 2009-09-24 8:24 ` Mark Struberg @ 2009-09-24 8:57 ` Ferry Huberts 2009-09-24 8:57 ` Ferry Huberts 1 sibling, 0 replies; 19+ messages in thread From: Ferry Huberts @ 2009-09-24 8:57 UTC (permalink / raw) To: Mark Struberg; +Cc: Ferry Huberts, git, spearce On Thu, September 24, 2009 10:24, Mark Struberg wrote: > Hi again and txs 4 your comments! ok. thanks. much enlightening :-) ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [JGIT PATCH 7/9] removing eclipse project files 2009-09-24 8:24 ` Mark Struberg 2009-09-24 8:57 ` Ferry Huberts @ 2009-09-24 8:57 ` Ferry Huberts 1 sibling, 0 replies; 19+ messages in thread From: Ferry Huberts @ 2009-09-24 8:57 UTC (permalink / raw) To: Mark Struberg; +Cc: Ferry Huberts, git, spearce On Thu, September 24, 2009 10:24, Mark Struberg wrote: > Hi again and txs 4 your comments! ok. thanks. much enlightening :-) ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [JGIT PATCH 7/9] removing eclipse project files 2009-09-24 6:55 ` Mark Struberg 2009-09-24 7:57 ` Ferry Huberts @ 2009-09-25 21:40 ` Robin Rosenberg 1 sibling, 0 replies; 19+ messages in thread From: Robin Rosenberg @ 2009-09-25 21:40 UTC (permalink / raw) To: Mark Struberg; +Cc: Ferry Huberts, git, spearce torsdag 24 september 2009 08:55:16 skrev Mark Struberg <struberg@yahoo.de>: > Hi Ferry! > > I work on a lot of projects and having eclipse (or any other IDEs) project files in the SCM is almost ever causing a problem. In praxis those files are always dirty. There are so many settings which may be different from user to user > > * different versions of eclipse create different project settings > * different JVM settings > * changing profiler settings > * using different version of various plugins > etc, etc > > And with maven in place we don't need to have them in our SCM anymore. Plus: it works for a lot of IDEs > > You can easily create the project files for a few IDEs with maven e.g.: > $> mvn eclipse:eclipse for creating the eclipse project files > $> mvn idea:idea for creating the idea project files > > Additionally, plugins are available for Eclipse [1], Intellij Idea (native, builtin) and NetBeans (native, builtin). > > So most of the time it is enough to simply import the parent pom.xml and you get all things setup properly in your IDE. I want compiler warnings/error and formatting settings to be enforced. Until recently we had roughly zero problems with non-confirming submissions Is there some means for this, even if that would mean having access to only a subset of possible settings. Maybe using checkstyle would do it for the style checks. Not sure how we'd control formatting. -- robin ^ permalink raw reply [flat|nested] 19+ messages in thread
* RE: [JGIT PATCH 7/9] removing eclipse project files 2009-09-23 21:16 ` [JGIT PATCH 7/9] removing eclipse project files Mark Struberg 2009-09-24 6:29 ` Ferry Huberts @ 2009-09-24 11:24 ` Sohn, Matthias 2009-09-24 11:50 ` Mark Struberg 1 sibling, 1 reply; 19+ messages in thread From: Sohn, Matthias @ 2009-09-24 11:24 UTC (permalink / raw) To: Mark Struberg; +Cc: git@vger.kernel.org, spearce@spearce.org Can Maven control compiler settings on the same level as we do currently with .settings/org.eclipse.jdt.core.prefs ? ^ permalink raw reply [flat|nested] 19+ messages in thread
* RE: [JGIT PATCH 7/9] removing eclipse project files 2009-09-24 11:24 ` Sohn, Matthias @ 2009-09-24 11:50 ` Mark Struberg 2009-09-25 13:25 ` Douglas Campos 2009-09-25 21:17 ` Robin Rosenberg 0 siblings, 2 replies; 19+ messages in thread From: Mark Struberg @ 2009-09-24 11:50 UTC (permalink / raw) To: MatthiasSohn; +Cc: git@vger.kernel.org, spearce@spearce.org Hi Matthias! the answer is a clear yes and no - a 'jein' for german speaking people like you ;) yes: we have the same settings for the compiler as used before: jdk 1.5 for source and target. This is exactly what has been taken in the ant build which was used prior to maven. Please note that the settings in org.eclipse.jdt.core.prefs never had (and must not have) any impact on the created jar! and no: currently the very file you mentioned contains a lot more stuff. In fact most of this are only editor settings, preferred formattings etc which has nothing to do with the build per se. Eclipse has the ability to import/export all those settings in a XML file which is version independent. We should go this way and also supply similar setting-files for Idea and NetBeans. But forcing those settings via an internal Eclipse plugin config file is imho bad practice. LieGrue, strub --- On Thu, 9/24/09, Sohn, Matthias <matthias.sohn@sap.com> wrote: > From: Sohn, Matthias <matthias.sohn@sap.com> > Subject: RE: [JGIT PATCH 7/9] removing eclipse project files > To: "Mark Struberg" <struberg@yahoo.de> > Cc: "git@vger.kernel.org" <git@vger.kernel.org>, "spearce@spearce.org" <spearce@spearce.org> > Date: Thursday, September 24, 2009, 1:24 PM > Can Maven control compiler settings > on the same level as we do currently with > .settings/org.eclipse.jdt.core.prefs ? > ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [JGIT PATCH 7/9] removing eclipse project files 2009-09-24 11:50 ` Mark Struberg @ 2009-09-25 13:25 ` Douglas Campos 2009-09-25 21:17 ` Robin Rosenberg 1 sibling, 0 replies; 19+ messages in thread From: Douglas Campos @ 2009-09-25 13:25 UTC (permalink / raw) To: Mark Struberg; +Cc: MatthiasSohn, git@vger.kernel.org, spearce@spearce.org Forwarding to list, as I always forgot to add all recipients (my bad :( ) > and no: currently the very file you mentioned contains a lot more stuff. In fact most of this are only editor settings, preferred formattings etc which has nothing to do with the build per se. Eclipse has the ability to import/export all those settings in a XML file which is version independent. We should go this way and also supply similar setting-files for Idea and NetBeans. But forcing those settings via an internal Eclipse plugin config file is imho bad practice. The problem lies here. JGit, AFAIK, has very _strict_ rules, this is the corner case that makes sense to enforce via IDE. It spares time from everyone here. I like the maven-generated eclipse projects, but I think that we need the same level of service provided by the eclipse settings. IMHO, as always. -- Douglas Campos (qmx) +55 11 7626 5959 ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [JGIT PATCH 7/9] removing eclipse project files 2009-09-24 11:50 ` Mark Struberg 2009-09-25 13:25 ` Douglas Campos @ 2009-09-25 21:17 ` Robin Rosenberg 2009-09-26 20:10 ` Mark Struberg 1 sibling, 1 reply; 19+ messages in thread From: Robin Rosenberg @ 2009-09-25 21:17 UTC (permalink / raw) To: Mark Struberg; +Cc: MatthiasSohn, git@vger.kernel.org, spearce@spearce.org torsdag 24 september 2009 13:50:11 skrev Mark Struberg <struberg@yahoo.de>: > Hi Matthias! > > the answer is a clear yes and no - a 'jein' for german speaking people like you ;) > > yes: we have the same settings for the compiler as used before: jdk 1.5 for source and target. This is exactly what has been taken in the ant build which was used prior to maven. > > Please note that the settings in org.eclipse.jdt.core.prefs never had (and must not have) any impact on the created jar! Not sure what ant files you are referring to here and which jars. The plugins downloadable from jgit.org has been built using PDE build. so some of the .settings should affect the compiler and thus the generated jars. > and no: currently the very file you mentioned contains a lot more stuff. In fact most of this are only editor settings, preferred formattings etc which has nothing to do with the build per se. Eclipse has the ability to import/export all those settings in a XML file which is version independent. We should go this way and also supply similar setting-files for Idea and NetBeans. But forcing those settings via an internal Eclipse plugin config file is imho bad practice. That way is awkward and people to import the settings and screw them up in their workspaces. I've made the projects I'm involved use .settings and make different settings mostly a non-issue because everyone gets new settings automatically as they change. Prior to eclipse 3.3 sharing settings was a big problem, but It's not a big deal nowadays. The most annoying thing is that some settings are not available as project specific settings. We use 3.3 (well I think the last user dropped it recently), 3.4 and 3.5. I often have to fix up new projects but that is typically a one-time per eclipse project problem. (typically the JRE gets bound to a specific install location). The .launch files is another story since they change format all the time. -- robin ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [JGIT PATCH 7/9] removing eclipse project files 2009-09-25 21:17 ` Robin Rosenberg @ 2009-09-26 20:10 ` Mark Struberg 2009-09-27 19:52 ` Robin Rosenberg 0 siblings, 1 reply; 19+ messages in thread From: Mark Struberg @ 2009-09-26 20:10 UTC (permalink / raw) To: Robin Rosenberg; +Cc: MatthiasSohn, git@vger.kernel.org, spearce@spearce.org Hi Robin! Thanks for your comments, answers inside. Please note that all my comments are for JGit only and not for the Egit Eclipse plugin! This should be discussed separately. LieGrue, strub --- On Fri, 9/25/09, Robin Rosenberg <robin.rosenberg.lists@dewire.com> wrote: > From: Robin Rosenberg <robin.rosenberg.lists@dewire.com> > Subject: Re: [JGIT PATCH 7/9] removing eclipse project files > To: "Mark Struberg" <struberg@yahoo.de> > Cc: "MatthiasSohn" <matthias.sohn@sap.com>, "git@vger.kernel.org" <git@vger.kernel.org>, "spearce@spearce.org" <spearce@spearce.org> > Date: Friday, September 25, 2009, 11:17 PM > torsdag 24 september 2009 13:50:11 > skrev Mark Struberg <struberg@yahoo.de>: > > Hi Matthias! > > > > the answer is a clear yes and no - a 'jein' for > german speaking people like you ;) > > > > yes: we have the same settings for the compiler as > used before: jdk 1.5 for source and target. This is exactly > what has been taken in the ant build which was used prior to > maven. > > > > Please note that the settings in > org.eclipse.jdt.core.prefs never had (and must not have) any > impact on the created jar! > > Not sure what ant files you are referring to here and which > jars. The plugins downloadable from jgit.org has been built > using PDE build. so some of the .settings should affect the > compiler and thus the generated jars. Apologise, you are right, no ant files. But a shell script make_jgit.sh which calls the javac directly. So no PDE for JGit as far as I see from the sources. > > > and no: currently the very file you mentioned contains > a lot more stuff. In fact most of this are only editor > settings, preferred formattings etc which has nothing to do > with the build per se. Eclipse has the ability to > import/export all those settings in a XML file which is > version independent. We should go this way and also supply > similar setting-files for Idea and NetBeans. But forcing > those settings via an internal Eclipse plugin config file is > imho bad practice. > > That way is awkward and people to import the settings and > screw them up in their workspaces. I've made the projects > I'm involved use .settings and make different settings > mostly a non-issue because everyone gets new > settings automatically as they change. We should integrate the checkstyle plugin into our pom. This should give you almost the same functionality. > Prior to eclipse 3.3 > sharing settings was a big problem, but It's not a big deal > nowadays. The most annoying thing is that some settings are > not available as project specific settings. As you already pointed to: we have to clearly separate between settings stored in the project itself and settings stored in the workspace. The first are by far not all settings needed, the 2nd are not checked in to git anyway. Maybe I didn't find it yet, but is there an ability to set formatter settings for XML (e.g. Tabs vs spaces policy)? I was only able to specify this for the whole workspace and not on a per project basis. And there is a lot more which imho cannot be set for a project. So checking in the xml sounds like it is way more powerful isn't? And we would have this feature for a lot non-Eclipse users too (e.g. for Jonas who hacks the nbgit NetBeans plugin based on JGit (again: EGit is a different story!)). > > We use 3.3 (well I think the last user dropped it > recently), 3.4 and 3.5. I often have to fix up new projects > but that is typically a one-time per eclipse project > problem. (typically the JRE gets bound to a specific install > location). > > The .launch files is another story since they change format > all the time. And the profiler settings, and and and. It's sad, but the list is long :( We can also let the eclipse settings files checked in currently if you like. But I'd be happy if we continue collecting information and then make a decision. txs, strub ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [JGIT PATCH 7/9] removing eclipse project files 2009-09-26 20:10 ` Mark Struberg @ 2009-09-27 19:52 ` Robin Rosenberg 2009-09-28 2:21 ` Jonas Fonseca 0 siblings, 1 reply; 19+ messages in thread From: Robin Rosenberg @ 2009-09-27 19:52 UTC (permalink / raw) To: Mark Struberg; +Cc: MatthiasSohn, git@vger.kernel.org, spearce@spearce.org lördag 26 september 2009 22:10:16 skrev Mark Struberg <struberg@yahoo.de>: > > As you already pointed to: we have to clearly separate between settings stored in the project itself and settings stored in the workspace. The first are by far not all settings needed, the 2nd are not checked in to git anyway. Maybe I didn't find it yet, but is there an ability to set formatter settings for XML (e.g. Tabs vs spaces policy)? I was only able to specify this for the whole workspace and not on a per project basis. Those are workspace settings in the 3.4, not checked 3.,5 yet. You could add it to bugzilla as a feature request. All settings should be available as project settings I think. > And there is a lot more which imho cannot be set for a project. So checking in the xml sounds like it is way more powerful isn't? And we would have this For JGit, not really. Everything that is not project settings should be left as the default. The only reason is tool constraints. I'm not well versed enough to tell what neatbeans does here. > feature for a lot non-Eclipse users too (e.g. for Jonas who hacks the nbgit NetBeans plugin based on JGit (again: EGit is a different story!)). I'm not sure keeping netbeans settings would be a problem, but that is about how much we could do > > > > > We use 3.3 (well I think the last user dropped it > > recently), 3.4 and 3.5. I often have to fix up new projects > > but that is typically a one-time per eclipse project > > problem. (typically the JRE gets bound to a specific install > > location). > > > > The .launch files is another story since they change format > > all the time. > > And the profiler settings, and and and. It's sad, but the list is long :( Yep... > We can also let the eclipse settings files checked in currently if you like. But I'd be happy if we continue collecting information and then make a decision. I definitely think we should keep them until we find an alternate solution. The projects settings are way too useful to be thrown out. -- robin ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [JGIT PATCH 7/9] removing eclipse project files 2009-09-27 19:52 ` Robin Rosenberg @ 2009-09-28 2:21 ` Jonas Fonseca 2009-09-28 6:34 ` Robin Rosenberg 0 siblings, 1 reply; 19+ messages in thread From: Jonas Fonseca @ 2009-09-28 2:21 UTC (permalink / raw) To: Robin Rosenberg Cc: Mark Struberg, MatthiasSohn, git@vger.kernel.org, spearce@spearce.org On Sun, Sep 27, 2009 at 15:52, Robin Rosenberg <robin.rosenberg.lists@dewire.com> wrote: > lördag 26 september 2009 22:10:16 skrev Mark Struberg <struberg@yahoo.de>: >> And there is a lot more which imho cannot be set for a project. So checking in the xml sounds like it is way more powerful isn't? And we would have this > > For JGit, not really. Everything that is not project settings should be left as the default. The only reason is tool constraints. I'm not well versed > enough to tell what neatbeans does here. It is my impression that NetBeans has far better integration with maven. In terms of code formatting NetBeans supports exporting/importing project specific settings, but I have never personally used that. -- Jonas Fonseca ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [JGIT PATCH 7/9] removing eclipse project files 2009-09-28 2:21 ` Jonas Fonseca @ 2009-09-28 6:34 ` Robin Rosenberg 2009-09-28 6:42 ` Robin Rosenberg 0 siblings, 1 reply; 19+ messages in thread From: Robin Rosenberg @ 2009-09-28 6:34 UTC (permalink / raw) To: Jonas Fonseca Cc: Mark Struberg, MatthiasSohn, git@vger.kernel.org, spearce@spearce.org måndag 28 september 2009 04:21:36 skrev Jonas Fonseca <jonas.fonseca@gmail.com>: > On Sun, Sep 27, 2009 at 15:52, Robin Rosenberg > <robin.rosenberg.lists@dewire.com> wrote: > > lördag 26 september 2009 22:10:16 skrev Mark Struberg <struberg@yahoo.de>: > >> And there is a lot more which imho cannot be set for a project. So checking in the xml sounds like it is way more powerful isn't? And we would have this > > > > For JGit, not really. Everything that is not project settings should be left as the default. The only reason is tool constraints. I'm not well versed > > enough to tell what neatbeans does here. > > It is my impression that NetBeans has far better integration with > maven. In terms of code formatting NetBeans supports > exporting/importing project specific settings, but I have never > personally used that. I was thinking of (project) settings for controlling warnings/errors and formatting. -- robin ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [JGIT PATCH 7/9] removing eclipse project files 2009-09-28 6:34 ` Robin Rosenberg @ 2009-09-28 6:42 ` Robin Rosenberg 0 siblings, 0 replies; 19+ messages in thread From: Robin Rosenberg @ 2009-09-28 6:42 UTC (permalink / raw) To: Jonas Fonseca Cc: Mark Struberg, MatthiasSohn, git@vger.kernel.org, spearce@spearce.org Oh, dear. I should not reply to e-mail this time of the day.... ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2009-09-28 6:42 UTC | newest] Thread overview: 19+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- [not found] <891180.68852.qm@web27805.mail.ukl.yahoo.com> 2009-09-25 15:48 ` [JGIT PATCH 7/9] removing eclipse project files Michael Gaffney 2009-09-25 21:21 ` Robin Rosenberg 2009-09-23 21:16 [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de> Mark Struberg [not found] ` <1253740570-10718-2-git-send-email-struberg@yahoo.de> 2009-09-23 21:16 ` [JGIT PATCH 3/9] moving some license files and META-INF Mark Struberg 2009-09-23 21:16 ` [JGIT PATCH 4/9] checkin all eclipse project file changes Mark Struberg 2009-09-23 21:16 ` [JGIT PATCH 5/9] mavenized org.spearce.jgit.pgm Mark Struberg 2009-09-23 21:16 ` [JGIT PATCH 6/9] enable missing test cases and fix jgit executable creation Mark Struberg 2009-09-23 21:16 ` [JGIT PATCH 7/9] removing eclipse project files Mark Struberg 2009-09-24 6:29 ` Ferry Huberts 2009-09-24 6:55 ` Mark Struberg 2009-09-24 7:57 ` Ferry Huberts 2009-09-24 8:24 ` Mark Struberg 2009-09-24 8:57 ` Ferry Huberts 2009-09-24 8:57 ` Ferry Huberts 2009-09-25 21:40 ` Robin Rosenberg 2009-09-24 11:24 ` Sohn, Matthias 2009-09-24 11:50 ` Mark Struberg 2009-09-25 13:25 ` Douglas Campos 2009-09-25 21:17 ` Robin Rosenberg 2009-09-26 20:10 ` Mark Struberg 2009-09-27 19:52 ` Robin Rosenberg 2009-09-28 2:21 ` Jonas Fonseca 2009-09-28 6:34 ` Robin Rosenberg 2009-09-28 6:42 ` Robin Rosenberg
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).