{"thread":{"id":"21040","subject":"[JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de>","startedAt":"2009-09-23T21:16:02Z","lastAt":"2009-10-01T13:55:16Z","messageCount":35,"participants":["Mark Struberg","Ferry Huberts","Sohn, Matthias","Douglas Campos","Robin Rosenberg","Jonas Fonseca","Shawn O. Pearce","Jason van Zyl"],"isPatch":true,"patchVersion":1,"patchTotal":9},"messages":[{"id":"123692","messageId":"1253740570-10718-1-git-send-email-struberg@yahoo.de","threadId":"21040","inReplyTo":null,"subject":"[JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de>","fromName":"Mark Struberg","fromEmail":"struberg@yahoo.de","sentAt":"2009-09-23T21:16:02Z","receivedAt":"2009-09-23T21:16:02Z","isPatch":true,"sender":{"key":"struberg@yahoo.de","avatar":"https://gravatar.com/avatar/119742c3e8dbc8db35a92bdff0581aec8d364d415f770e60431cba262daa974f?d=mp&s=160"},"body":"From: Jason van Zyl <jvanzyl@sonatype.com>\n\n---\n .gitignore                    |    1 +\n org.spearce.jgit.pgm/pom.xml  |   59 ++++++++++\n org.spearce.jgit.test/pom.xml |   30 +++++\n org.spearce.jgit/pom.xml      |   35 ++++++\n pom.xml                       |  258 +++++++++++++++++++++++++++++++++++++++++\n 5 files changed, 383 insertions(+), 0 deletions(-)\n create mode 100644 org.spearce.jgit.pgm/pom.xml\n create mode 100644 org.spearce.jgit.test/pom.xml\n create mode 100644 org.spearce.jgit/pom.xml\n create mode 100644 pom.xml\n\ndiff --git a/.gitignore b/.gitignore\nindex 5219cbc..37ca28d 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -1,4 +1,5 @@\n /jgit\n /jgit.jar\n /jgit_src.zip\n+target\n /jgit_docs.zip\ndiff --git a/org.spearce.jgit.pgm/pom.xml b/org.spearce.jgit.pgm/pom.xml\nnew file mode 100644\nindex 0000000..9501cb5\n--- /dev/null\n+++ b/org.spearce.jgit.pgm/pom.xml\n@@ -0,0 +1,59 @@\n+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n+  xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\">\n+  <modelVersion>4.0.0</modelVersion>\n+  <parent>\n+    <groupId>org.spearce</groupId>\n+    <artifactId>jgit-parent</artifactId>\n+    <version>0.5.0-SNAPSHOT</version>  \n+  </parent>\n+  <artifactId>org.spearce.jgit.pgm</artifactId>\n+  <name>JGit :: Pgm</name>\n+  <dependencies>\n+        <dependency>\n+            <groupId>org.spearce</groupId>\n+            <artifactId>org.spearce.jgit</artifactId>\n+            <version>${project.version}</version>\n+        </dependency>    \n+        <dependency>\n+            <groupId>args4j</groupId>\n+            <artifactId>args4j</artifactId>\n+        </dependency>\n+  </dependencies>\n+  <build>\n+    <sourceDirectory>src</sourceDirectory>\n+    <resources>\n+      <resource>\n+        <directory>src</directory>\n+        <includes>\n+          <include>**/services/**</include>\n+        </includes>\n+      </resource>\n+    </resources>\n+    <plugins>\n+      <plugin>\n+        <groupId>org.apache.maven.plugins</groupId>\n+        <artifactId>maven-shade-plugin</artifactId>\n+        <version>1.2</version>\n+        <executions>\n+          <execution>\n+            <phase>package</phase>\n+            <goals>\n+              <goal>shade</goal>\n+            </goals>\n+            <configuration>\n+              <finalName>jgit-cli</finalName>\n+              <createDependencyReducedPom>false</createDependencyReducedPom>\n+              <transformers>\n+                <transformer implementation=\"org.apache.maven.plugins.shade.resource.ServicesResourceTransformer\"/>              \n+                <transformer implementation=\"org.apache.maven.plugins.shade.resource.ManifestResourceTransformer\">\n+                  <mainClass>org.spearce.jgit.pgm.Main</mainClass>\n+                </transformer>\n+              </transformers>\n+            </configuration>\n+          </execution>\n+        </executions>\n+      </plugin>\n+    </plugins>      \n+  </build>\n+</project>\ndiff --git a/org.spearce.jgit.test/pom.xml b/org.spearce.jgit.test/pom.xml\nnew file mode 100644\nindex 0000000..db1fc46\n--- /dev/null\n+++ b/org.spearce.jgit.test/pom.xml\n@@ -0,0 +1,30 @@\n+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n+  xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\">\n+  <modelVersion>4.0.0</modelVersion>\n+  <parent>\n+    <groupId>org.spearce</groupId>\n+    <artifactId>jgit-parent</artifactId>\n+    <version>0.5.0-SNAPSHOT</version>  \n+  </parent>\n+  <artifactId>org.spearce.jgit.test</artifactId>\n+  <name>JGit :: Test</name>\n+  <dependencies>\n+        <dependency>\n+            <groupId>org.spearce</groupId>\n+            <artifactId>org.spearce.jgit</artifactId>\n+        </dependency>    \n+    <dependency>\n+      <groupId>com.jcraft</groupId>\n+      <artifactId>jsch</artifactId>\n+    </dependency>    \n+  </dependencies>\n+  <build>\n+        <testResources>\n+            <testResource>\n+                <directory>tst-rsrc/</directory>\n+            </testResource>\n+        </testResources>\n+        <testSourceDirectory>tst/</testSourceDirectory>\n+  </build>\n+</project>\ndiff --git a/org.spearce.jgit/pom.xml b/org.spearce.jgit/pom.xml\nnew file mode 100644\nindex 0000000..2510ff7\n--- /dev/null\n+++ b/org.spearce.jgit/pom.xml\n@@ -0,0 +1,35 @@\n+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n+  xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\">\n+  <modelVersion>4.0.0</modelVersion>\n+  <parent>\n+    <groupId>org.spearce</groupId>\n+    <artifactId>jgit-parent</artifactId>\n+    <version>0.5.0-SNAPSHOT</version>  \n+  </parent>\n+  <artifactId>org.spearce.jgit</artifactId>\n+  <name>JGit :: Core</name>\n+  <dependencies>\n+    <dependency>\n+      <groupId>com.jcraft</groupId>\n+      <artifactId>jsch</artifactId>\n+    </dependency>    \n+  </dependencies>\n+  <build>\n+    <sourceDirectory>src</sourceDirectory>    \n+    <plugins>\n+            <plugin>\n+                <groupId>org.apache.maven.plugins</groupId>\n+                <artifactId>maven-surefire-plugin</artifactId>\n+                <version>2.4.2</version>\n+                <configuration>\n+                    <includes>\n+                        <include>**/*Test.java</include>\n+                        <include>**/*TestCase.java</include>\n+                        <include>**/T000*.java</include>\n+                    </includes>\n+                </configuration>\n+           </plugin>            \n+    </plugins>\n+  </build>\n+</project>\ndiff --git a/pom.xml b/pom.xml\nnew file mode 100644\nindex 0000000..7d52ba2\n--- /dev/null\n+++ b/pom.xml\n@@ -0,0 +1,258 @@\n+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<!--\n+All rights reserved.\n+Redistribution and use in source and binary forms, with or\n+without modification, are permitted provided that the following\n+conditions are met:\n+\n+Redistributions of source code must retain the above copyright\n+notice, this list of conditions and the following disclaimer.\n+\n+Redistributions in binary form must reproduce the above\n+copyright notice, this list of conditions and the following\n+disclaimer in the documentation and/or other materials provided\n+with the distribution.\n+\n+Neither the name of the Git Development Community nor the\n+names of its contributors may be used to endorse or promote\n+products derived from this software without specific prior\n+written permission.\n+\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND\n+CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR\n+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\n+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+-->\n+<project xmlns=\"http://maven.apache.org/POM/4.0.0\"\n+        xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n+        xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\">\n+    <modelVersion>4.0.0</modelVersion>\n+    <groupId>org.spearce</groupId>\n+    <artifactId>jgit-parent</artifactId>\n+    <packaging>pom</packaging>\n+    <version>0.5.0-SNAPSHOT</version>\n+    <name>JGit :: Parent</name>\n+    <url>http://repo.or.cz/w/egit.git</url>\n+    <mailingLists>\n+        <mailingList>\n+            <name>GIT Mailing List</name>\n+            <post>git@vger.kernel.org</post>\n+            <archive>http://marc.info/?l=git</archive>\n+        </mailingList>\n+    </mailingLists>\n+    <description>Pure Java implementation of Git</description>\n+    <developers>\n+        <developer>\n+            <name>Shawn O. Pearce</name>\n+            <email>spearce@spearce.org</email>\n+            <roles>\n+                <role>Maintainer</role>\n+            </roles>\n+        </developer>\n+        <developer>\n+            <name>Robin Rosenberg</name>\n+            <email>robin.rosenberg@dewire.com</email>\n+            <roles>\n+                <role>Maintainer</role>\n+            </roles>\n+        </developer>\n+        <developer>\n+            <name>Dave Watson</name>\n+            <email>dwatson@mimvista.com</email>\n+            <roles>\n+                <role>Developer</role>\n+            </roles>\n+        </developer>\n+        <developer>\n+            <name>Roger C. Soares</name>\n+            <email>rogersoares@intelinet.com.br</email>\n+            <roles>\n+                <role>Developer</role>\n+            </roles>\n+\t</developer>\n+\t<developer>\n+            <name>Marek Zawirski</name>\n+            <email>marek.zawirski@gmail.com</email>\n+            <roles>\n+                <role>Developer</role>\n+            </roles>\n+        </developer>\n+        <developer>\n+            <name>Charles O'Farrell</name>\n+            <email>charleso@charleso.org</email>\n+            <roles>\n+                <role>Contributor</role>\n+            </roles>\n+        </developer>\n+        <developer>\n+            <name>Imran M Yousuf</name>\n+            <email>imyousuf@smartitengineering.com</email>\n+            <organization>Smart IT Engineering</organization>\n+            <roles>\n+                <role>Contributor</role>\n+            </roles>\n+        </developer>\n+    </developers>\n+    <licenses>\n+        <license>\n+            <name>3-clause (new-style) BSD license.</name>\n+            <comments>\n+                All rights reserved.\n+                Redistribution and use in source and binary forms, with or\n+                without modification, are permitted provided that the following\n+                conditions are met:\n+\n+                Redistributions of source code must retain the above copyright\n+                notice, this list of conditions and the following disclaimer.\n+\n+                Redistributions in binary form must reproduce the above\n+                copyright notice, this list of conditions and the following\n+                disclaimer in the documentation and/or other materials provided\n+                with the distribution.\n+\n+                Neither the name of the Git Development Community nor the\n+                names of its contributors may be used to endorse or promote\n+                products derived from this software without specific prior\n+                written permission.\n+\n+                THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND\n+                CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n+                INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n+                OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n+                ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR\n+                CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n+                SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n+                NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n+                LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n+                CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n+                STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\n+                ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n+                ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+            </comments>\n+        </license>\n+    </licenses>\n+    <build>\n+        <plugins>\n+            <plugin>\n+                <groupId>org.apache.maven.plugins</groupId>\n+                <artifactId>maven-compiler-plugin</artifactId>\n+                <version>2.0.1</version>\n+                <configuration>\n+                    <source>1.5</source>\n+                    <target>1.5</target>\n+                    <encoding>UTF-8</encoding>\n+                </configuration>\n+            </plugin>\n+        </plugins>\n+    </build>\n+    <dependencies>\n+        <dependency>\n+            <groupId>junit</groupId>\n+            <artifactId>junit</artifactId>\n+            <version>3.8.1</version>\n+            <scope>test</scope>\n+        </dependency>\n+    </dependencies>\n+    <dependencyManagement>\n+    <dependencies>\n+        <dependency>\n+            <groupId>org.spearce</groupId>\n+            <artifactId>org.spearce.jgit</artifactId>\n+            <version>${project.version}</version>\n+        </dependency>\n+        <dependency>\n+            <groupId>com.jcraft</groupId>\n+            <artifactId>jsch</artifactId>\n+            <version>0.1.38</version>\n+        </dependency>\n+        <dependency>\n+            <groupId>args4j</groupId>\n+            <artifactId>args4j</artifactId>\n+            <version>2.0.9</version>\n+        </dependency>            \n+    </dependencies>\n+    </dependencyManagement>\n+    <distributionManagement>\n+        <snapshotRepository>\n+            <id>jgit-maven-snapshot-repository</id>\n+            <name>JGit Maven Snapshot Repository</name>\n+            <url>dav:https://egit.googlecode.com/svn/maven/snapshot-repository/</url>\n+            <uniqueVersion>true</uniqueVersion>\n+        </snapshotRepository>\n+    </distributionManagement>\n+    <modules>\n+      <module>org.spearce.jgit</module>\n+      <module>org.spearce.jgit.test</module>   \n+      <module>org.spearce.jgit.pgm</module>               \n+    </modules>\n+    <profiles>\n+      <!-- Release -->      \n+      <profile>\n+        <id>jgit-release</id>\n+        <build>\n+        <plugins>\n+          <!-- We want to sign the artifact, the POM, and all attached artifacts -->\n+          <plugin>\n+            <groupId>org.apache.maven.plugins</groupId>\n+            <artifactId>maven-gpg-plugin</artifactId>\n+            <configuration>\n+              <passphrase>${gpg.passphrase}</passphrase>\n+            </configuration>\n+            <executions>\n+              <execution>\n+                <goals>\n+                  <goal>sign</goal>\n+                </goals>\n+              </execution>\n+            </executions>\n+          </plugin>\n+          <!-- We want to deploy the artifact to a staging location for perusal -->\n+          <plugin>\n+            <inherited>true</inherited>\n+            <groupId>org.apache.maven.plugins</groupId>\n+            <artifactId>maven-deploy-plugin</artifactId>\n+            <configuration>\n+              <updateReleaseInfo>true</updateReleaseInfo>\n+            </configuration>\n+          </plugin>\n+          <plugin>\n+            <groupId>org.apache.maven.plugins</groupId>\n+            <artifactId>maven-source-plugin</artifactId>\n+            <executions>\n+              <execution>\n+                <id>attach-sources</id>\n+                <goals>\n+                  <goal>jar</goal>\n+                </goals>\n+              </execution>\n+            </executions>\n+          </plugin>\n+          <plugin>\n+            <groupId>org.apache.maven.plugins</groupId>\n+            <artifactId>maven-javadoc-plugin</artifactId>\n+            <configuration>\n+              <encoding>${project.build.sourceEncoding}</encoding>\n+            </configuration>\n+            <executions>\n+              <execution>\n+                <id>attach-javadocs</id>\n+                <goals>\n+                  <goal>jar</goal>\n+                </goals>\n+              </execution>\n+            </executions>\n+          </plugin>\n+        </plugins>        \n+        </build>\n+      </profile>\n+    </profiles>\n+</project>\n-- \n1.6.2.5\n"},{"id":"123696","messageId":"1253740570-10718-3-git-send-email-struberg@yahoo.de","threadId":"21040","inReplyTo":"1253740570-10718-2-git-send-email-struberg@yahoo.de","subject":"[JGIT PATCH 3/9] moving some license files and META-INF","fromName":"Mark Struberg","fromEmail":"struberg@yahoo.de","sentAt":"2009-09-23T21:16:04Z","receivedAt":"2009-09-23T21:16:04Z","isPatch":true,"sender":{"key":"struberg@yahoo.de","avatar":"https://gravatar.com/avatar/119742c3e8dbc8db35a92bdff0581aec8d364d415f770e60431cba262daa974f?d=mp&s=160"},"body":"Signed-off-by: Mark Struberg <struberg@yahoo.de>\n\nremoved LICENSE files from submodules. One in the parent folder is enough.\n---\n org.spearce.jgit.test/LICENSE => LICENSE           |    0\n NOTICE                                             |    7 ++++\n .../lib => licenses}/JSch.LICENSE.txt              |    0\n org.spearce.jgit/LICENSE                           |   34 --------------------\n org.spearce.jgit/lib/jsch-0.1.37.jar               |  Bin 206178 -> 0 bytes\n org.spearce.jgit/lib/jsch-0.1.37.zip               |  Bin 268804 -> 0 bytes\n .../{ => src/main/resources}/META-INF/MANIFEST.MF  |    0\n 7 files changed, 7 insertions(+), 34 deletions(-)\n rename org.spearce.jgit.test/LICENSE => LICENSE (100%)\n create mode 100644 NOTICE\n rename {org.spearce.jgit/lib => licenses}/JSch.LICENSE.txt (100%)\n delete mode 100644 org.spearce.jgit/LICENSE\n delete mode 100644 org.spearce.jgit/lib/jsch-0.1.37.jar\n delete mode 100644 org.spearce.jgit/lib/jsch-0.1.37.zip\n rename org.spearce.jgit/{ => src/main/resources}/META-INF/MANIFEST.MF (100%)\n\ndiff --git a/org.spearce.jgit.test/LICENSE b/LICENSE\nsimilarity index 100%\nrename from org.spearce.jgit.test/LICENSE\nrename to LICENSE\ndiff --git a/NOTICE b/NOTICE\nnew file mode 100644\nindex 0000000..c19fbc3\n--- /dev/null\n+++ b/NOTICE\n@@ -0,0 +1,7 @@\n+JGIT Java native GIT core library\n+\n+see LICENSE for mor information\n+\n+This product uses the library jsch-0.1.38.jar as binary, \n+home page of the project is http://www.jcraft.com/jsch/ \n+\ndiff --git a/org.spearce.jgit/lib/JSch.LICENSE.txt b/licenses/JSch.LICENSE.txt\nsimilarity index 100%\nrename from org.spearce.jgit/lib/JSch.LICENSE.txt\nrename to licenses/JSch.LICENSE.txt\ndiff --git a/org.spearce.jgit/LICENSE b/org.spearce.jgit/LICENSE\ndeleted file mode 100644\nindex 2917c22..0000000\n--- a/org.spearce.jgit/LICENSE\n+++ /dev/null\n@@ -1,34 +0,0 @@\n-/*\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or\n- * without modification, are permitted provided that the following\n- * conditions are met:\n- *\n- * - Redistributions of source code must retain the above copyright\n- *   notice, this list of conditions and the following disclaimer.\n- *\n- * - Redistributions in binary form must reproduce the above\n- *   copyright notice, this list of conditions and the following\n- *   disclaimer in the documentation and/or other materials provided\n- *   with the distribution.\n- *\n- * - Neither the name of the Git Development Community nor the\n- *   names of its contributors may be used to endorse or promote\n- *   products derived from this software without specific prior\n- *   written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND\n- * CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR\n- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\n- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- */\ndiff --git a/org.spearce.jgit/lib/jsch-0.1.37.jar b/org.spearce.jgit/lib/jsch-0.1.37.jar\ndeleted file mode 100644\nindex e38c4b3..0000000\nBinary files a/org.spearce.jgit/lib/jsch-0.1.37.jar and /dev/null differ\ndiff --git a/org.spearce.jgit/lib/jsch-0.1.37.zip b/org.spearce.jgit/lib/jsch-0.1.37.zip\ndeleted file mode 100644\nindex 63f3575..0000000\nBinary files a/org.spearce.jgit/lib/jsch-0.1.37.zip and /dev/null differ\ndiff --git a/org.spearce.jgit/META-INF/MANIFEST.MF b/org.spearce.jgit/src/main/resources/META-INF/MANIFEST.MF\nsimilarity index 100%\nrename from org.spearce.jgit/META-INF/MANIFEST.MF\nrename to org.spearce.jgit/src/main/resources/META-INF/MANIFEST.MF\n-- \n1.6.2.5\n"},{"id":"123695","messageId":"1253740570-10718-4-git-send-email-struberg@yahoo.de","threadId":"21040","inReplyTo":"1253740570-10718-3-git-send-email-struberg@yahoo.de","subject":"[JGIT PATCH 4/9] checkin all eclipse project file changes","fromName":"Mark Struberg","fromEmail":"struberg@yahoo.de","sentAt":"2009-09-23T21:16:05Z","receivedAt":"2009-09-23T21:16:05Z","isPatch":true,"sender":{"key":"struberg@yahoo.de","avatar":"https://gravatar.com/avatar/119742c3e8dbc8db35a92bdff0581aec8d364d415f770e60431cba262daa974f?d=mp&s=160"},"body":"Signed-off-by: Mark Struberg <struberg@yahoo.de>\n---\n org.spearce.jgit/.classpath                        |    7 +++++--\n org.spearce.jgit/.project                          |    6 ++++++\n .../.settings/org.eclipse.jdt.core.prefs           |    4 ++--\n .../.settings/org.maven.ide.eclipse.prefs          |    9 +++++++++\n org.spearce.jgit/build.properties                  |    6 +++---\n 5 files changed, 25 insertions(+), 7 deletions(-)\n create mode 100644 org.spearce.jgit/.settings/org.maven.ide.eclipse.prefs\n\ndiff --git a/org.spearce.jgit/.classpath b/org.spearce.jgit/.classpath\nindex 304e861..c1c8f51 100644\n--- a/org.spearce.jgit/.classpath\n+++ b/org.spearce.jgit/.classpath\n@@ -1,7 +1,10 @@\n <?xml version=\"1.0\" encoding=\"UTF-8\"?>\n <classpath>\n-\t<classpathentry kind=\"src\" path=\"src\"/>\n+\t<classpathentry kind=\"src\" output=\"target/classes\" path=\"src/main/java\"/>\n+\t<classpathentry kind=\"src\" output=\"target/test-classes\" path=\"src/test/java\"/>\n+\t<classpathentry excluding=\"**\" kind=\"src\" output=\"target/test-classes\" path=\"src/test/resources\"/>\n \t<classpathentry kind=\"con\" path=\"org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5\"/>\n \t<classpathentry kind=\"con\" path=\"org.eclipse.pde.core.requiredPlugins\"/>\n-\t<classpathentry kind=\"output\" path=\"bin\"/>\n+\t<classpathentry kind=\"con\" path=\"org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER\"/>\n+\t<classpathentry kind=\"output\" path=\"target/classes\"/>\n </classpath>\ndiff --git a/org.spearce.jgit/.project b/org.spearce.jgit/.project\nindex 7d38455..da2f7cf 100644\n--- a/org.spearce.jgit/.project\n+++ b/org.spearce.jgit/.project\n@@ -20,8 +20,14 @@\n \t\t\t<arguments>\n \t\t\t</arguments>\n \t\t</buildCommand>\n+\t\t<buildCommand>\n+\t\t\t<name>org.maven.ide.eclipse.maven2Builder</name>\n+\t\t\t<arguments>\n+\t\t\t</arguments>\n+\t\t</buildCommand>\n \t</buildSpec>\n \t<natures>\n+\t\t<nature>org.maven.ide.eclipse.maven2Nature</nature>\n \t\t<nature>org.eclipse.jdt.core.javanature</nature>\n \t\t<nature>org.eclipse.pde.PluginNature</nature>\n \t</natures>\ndiff --git a/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs b/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs\nindex 8e8e172..22d560f 100644\n--- a/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs\n+++ b/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs\n@@ -1,4 +1,4 @@\n-#Sun Mar 15 01:13:43 CET 2009\n+#Fri Sep 04 16:53:41 CEST 2009\n eclipse.preferences.version=1\n org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\n org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5\n@@ -34,7 +34,7 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private\n org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning\n org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error\n org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore\n-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=error\n+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning\n org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled\n org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected\n org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag\ndiff --git a/org.spearce.jgit/.settings/org.maven.ide.eclipse.prefs b/org.spearce.jgit/.settings/org.maven.ide.eclipse.prefs\nnew file mode 100644\nindex 0000000..1e219ee\n--- /dev/null\n+++ b/org.spearce.jgit/.settings/org.maven.ide.eclipse.prefs\n@@ -0,0 +1,9 @@\n+#Fri Sep 04 16:35:48 CEST 2009\n+activeProfiles=\n+eclipse.preferences.version=1\n+fullBuildGoals=process-test-resources\n+includeModules=false\n+resolveWorkspaceProjects=true\n+resourceFilterGoals=process-resources resources\\:testResources\n+skipCompilerPlugin=true\n+version=1\ndiff --git a/org.spearce.jgit/build.properties b/org.spearce.jgit/build.properties\nindex aa1a008..b686345 100644\n--- a/org.spearce.jgit/build.properties\n+++ b/org.spearce.jgit/build.properties\n@@ -1,5 +1,5 @@\n-source.. = src/\n-output.. = bin/\n-bin.includes = META-INF/,\\\n+source.. = src/main/java/\n+output.. = target/classes/\n+bin.includes = src/main/resources/,\\\n                .,\\\n                plugin.properties\n-- \n1.6.2.5\n"},{"id":"123694","messageId":"1253740570-10718-5-git-send-email-struberg@yahoo.de","threadId":"21040","inReplyTo":"1253740570-10718-4-git-send-email-struberg@yahoo.de","subject":"[JGIT PATCH 5/9] mavenized org.spearce.jgit.pgm","fromName":"Mark Struberg","fromEmail":"struberg@yahoo.de","sentAt":"2009-09-23T21:16:06Z","receivedAt":"2009-09-23T21:16:06Z","isPatch":true,"sender":{"key":"struberg@yahoo.de","avatar":"https://gravatar.com/avatar/119742c3e8dbc8db35a92bdff0581aec8d364d415f770e60431cba262daa974f?d=mp&s=160"},"body":"* moved org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/ -> org.spearce.jgit.pgm/src/main/java\n\n* all pgm related stuff has been moved to org.speace.jgit.pgm\n  This includes jgit.sh and the jgit executable\n\n* create the jgit executable with maven; deleted make_jgit.sh.\n  Instead type\n  $>mvn clean install\n  in the root directory and you'll get org.spearce.jgit.pgm/jgit\n\nSigned-off-by: Mark Struberg <struberg@yahoo.de>\n---\n NOTICE                                             |   12 +-\n .../lib => licenses}/args4j.LICENSE.txt            |    0\n make_jgit.sh                                       |  132 -------------\n org.spearce.jgit.pgm/.gitignore                    |    1 -\n jgit.sh => org.spearce.jgit.pgm/jgit.sh            |    7 +-\n org.spearce.jgit.pgm/lib/args4j-2.0.9.jar          |  Bin 40654 -> 0 bytes\n org.spearce.jgit.pgm/lib/args4j-2.0.9.zip          |  Bin 31516 -> 0 bytes\n org.spearce.jgit.pgm/pom.xml                       |  173 +++++++++++------\n .../org/spearce/jgit/pgm/AbstractFetchCommand.java |    0\n .../java}/org/spearce/jgit/pgm/Branch.java         |    0\n .../java}/org/spearce/jgit/pgm/Clone.java          |    0\n .../java}/org/spearce/jgit/pgm/Command.java        |    0\n .../java}/org/spearce/jgit/pgm/CommandCatalog.java |    0\n .../java}/org/spearce/jgit/pgm/CommandRef.java     |    0\n .../java}/org/spearce/jgit/pgm/Daemon.java         |    0\n .../{ => main/java}/org/spearce/jgit/pgm/Die.java  |    0\n .../java}/org/spearce/jgit/pgm/DiffTree.java       |    0\n .../java}/org/spearce/jgit/pgm/Fetch.java          |    0\n .../{ => main/java}/org/spearce/jgit/pgm/Glog.java |    0\n .../java}/org/spearce/jgit/pgm/IndexPack.java      |    0\n .../{ => main/java}/org/spearce/jgit/pgm/Init.java |    0\n .../{ => main/java}/org/spearce/jgit/pgm/Log.java  |    0\n .../java}/org/spearce/jgit/pgm/LsRemote.java       |    0\n .../java}/org/spearce/jgit/pgm/LsTree.java         |    0\n .../{ => main/java}/org/spearce/jgit/pgm/Main.java |    0\n .../java}/org/spearce/jgit/pgm/MergeBase.java      |    0\n .../{ => main/java}/org/spearce/jgit/pgm/Push.java |    0\n .../java}/org/spearce/jgit/pgm/ReceivePack.java    |    0\n .../java}/org/spearce/jgit/pgm/RevList.java        |    0\n .../java}/org/spearce/jgit/pgm/RevParse.java       |    0\n .../org/spearce/jgit/pgm/RevWalkTextBuiltin.java   |    0\n .../{ => main/java}/org/spearce/jgit/pgm/Rm.java   |    0\n .../java}/org/spearce/jgit/pgm/ShowRef.java        |    0\n .../{ => main/java}/org/spearce/jgit/pgm/Tag.java  |    0\n .../java}/org/spearce/jgit/pgm/TextBuiltin.java    |    0\n .../java}/org/spearce/jgit/pgm/UploadPack.java     |    0\n .../java}/org/spearce/jgit/pgm/Version.java        |    0\n .../org/spearce/jgit/pgm/debug/MakeCacheTree.java  |    0\n .../org/spearce/jgit/pgm/debug/ReadDirCache.java   |    0\n .../spearce/jgit/pgm/debug/RebuildCommitGraph.java |    0\n .../org/spearce/jgit/pgm/debug/ShowCacheTree.java  |    0\n .../org/spearce/jgit/pgm/debug/ShowCommands.java   |    0\n .../org/spearce/jgit/pgm/debug/ShowDirCache.java   |    0\n .../org/spearce/jgit/pgm/debug/WriteDirCache.java  |    0\n .../jgit/pgm/opt/AbstractTreeIteratorHandler.java  |    0\n .../org/spearce/jgit/pgm/opt/CmdLineParser.java    |    0\n .../org/spearce/jgit/pgm/opt/ObjectIdHandler.java  |    0\n .../jgit/pgm/opt/PathTreeFilterHandler.java        |    0\n .../org/spearce/jgit/pgm/opt/RefSpecHandler.java   |    0\n .../org/spearce/jgit/pgm/opt/RevCommitHandler.java |    0\n .../org/spearce/jgit/pgm/opt/RevTreeHandler.java   |    0\n .../spearce/jgit/pgm/opt/SubcommandHandler.java    |    0\n .../services/org.spearce.jgit.pgm.TextBuiltin      |    0\n .../org/spearce/jgit/pgm/build/JarLinkUtil.java    |  206 --------------------\n 54 files changed, 129 insertions(+), 402 deletions(-)\n rename {org.spearce.jgit.pgm/lib => licenses}/args4j.LICENSE.txt (100%)\n delete mode 100755 make_jgit.sh\n rename jgit.sh => org.spearce.jgit.pgm/jgit.sh (79%)\n delete mode 100644 org.spearce.jgit.pgm/lib/args4j-2.0.9.jar\n delete mode 100644 org.spearce.jgit.pgm/lib/args4j-2.0.9.zip\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/AbstractFetchCommand.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Branch.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Clone.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Command.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/CommandCatalog.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/CommandRef.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Daemon.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Die.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/DiffTree.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Fetch.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Glog.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/IndexPack.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Init.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Log.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/LsRemote.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/LsTree.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Main.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/MergeBase.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Push.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/ReceivePack.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/RevList.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/RevParse.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/RevWalkTextBuiltin.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Rm.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/ShowRef.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Tag.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/TextBuiltin.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/UploadPack.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/Version.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/debug/MakeCacheTree.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/debug/ReadDirCache.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/debug/RebuildCommitGraph.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/debug/ShowCacheTree.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/debug/ShowCommands.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/debug/ShowDirCache.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/debug/WriteDirCache.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/opt/AbstractTreeIteratorHandler.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/opt/CmdLineParser.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/opt/ObjectIdHandler.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/opt/PathTreeFilterHandler.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/opt/RefSpecHandler.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/opt/RevCommitHandler.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/opt/RevTreeHandler.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/java}/org/spearce/jgit/pgm/opt/SubcommandHandler.java (100%)\n rename org.spearce.jgit.pgm/src/{ => main/resources}/META-INF/services/org.spearce.jgit.pgm.TextBuiltin (100%)\n delete mode 100644 org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/build/JarLinkUtil.java\n\ndiff --git a/NOTICE b/NOTICE\nindex c19fbc3..ad1d1ee 100644\n--- a/NOTICE\n+++ b/NOTICE\n@@ -1,7 +1,13 @@\n JGIT Java native GIT core library\n \n-see LICENSE for mor information\n+see LICENSE for more information on JGIT.\n \n-This product uses the library jsch-0.1.38.jar as binary, \n-home page of the project is http://www.jcraft.com/jsch/ \n+\n+This product uses the library jsch-0.1.38.jar as binary. \n+The home page of the project is http://www.jcraft.com/jsch/ \n+See licenses/JSch.LICENSE.txt for more information.\n+\n+This product uses the library args4j-2.0.9.jar as binary, \n+The home page of the project is https://args4j.dev.java.net/\n+See licenses/args4j.LICENSE.txt for more information.\n \ndiff --git a/org.spearce.jgit.pgm/lib/args4j.LICENSE.txt b/licenses/args4j.LICENSE.txt\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/lib/args4j.LICENSE.txt\nrename to licenses/args4j.LICENSE.txt\ndiff --git a/make_jgit.sh b/make_jgit.sh\ndeleted file mode 100755\nindex e3f7ffa..0000000\n--- a/make_jgit.sh\n+++ /dev/null\n@@ -1,132 +0,0 @@\n-#!/bin/sh\n-\n-O_CLI=jgit\n-O_JAR=jgit.jar\n-O_SRC=jgit_src.zip\n-O_DOC=jgit_docs.zip\n-\n-PLUGINS=\"\n-\torg.spearce.jgit\n-\torg.spearce.jgit.pgm\n-\"\n-JARS=\"\n-\torg.spearce.jgit/lib/jsch-0.1.37.jar\n-\torg.spearce.jgit.pgm/lib/args4j-2.0.9.jar\n-\"\n-\n-PSEP=\":\"\n-T=\".temp$$.$O_CLI\"\n-T_MF=\"$T.MF\"\n-R=`pwd`\n-if [ \"$OSTYPE\" = \"cygwin\" ]\n-then\n-\tR=`cygpath -m $R`\n-\tPSEP=\";\"\n-fi\n-if [ \"$MSYSTEM\" = \"MINGW\" -o \"$MSYSTEM\" = \"MINGW32\" ]\n-then\n-\tPSEP=\";\"\n-\tR=`pwd -W`\n-fi\n-\n-if [ -n \"$JAVA_HOME\" ]\n-then\n-\tPATH=${JAVA_HOME}/bin${PSEP}${PATH}\n-fi\n-\n-cleanup_bin() {\n-\trm -f $T $O_CLI+ $O_JAR+ $O_SRC+ $T_MF\n-\tfor p in $PLUGINS\n-\tdo\n-\t\trm -rf $p/bin2\n-\tdone\n-\trm -rf docs\n-}\n-\n-die() {\n-\tcleanup_bin\n-\trm -f $O_CLI $O_JAR $O_SRC\n-\techo >&2 \"$@\"\n-\texit 1\n-}\n-\n-cleanup_bin\n-rm -f $O_CLI $O_JAR $O_SRC $O_DOC\n-\n-VN=`git describe --abbrev=4 HEAD 2>/dev/null`\n-git update-index -q --refresh\n-if [ -n \"`git diff-index --name-only HEAD --`\" ]\n-then\n-\tVN=\"$VN-dirty\"\n-fi\n-VN=${VN:-untagged}`echo \"$VN\" | sed -e s/-/./g`\n-\n-CLASSPATH=\n-for j in $JARS\n-do\n-\tif [ -z \"$CLASSPATH\" ]\n-\tthen\n-\t\tCLASSPATH=\"$R/$j\"\n-\telse\n-\t\tCLASSPATH=\"${CLASSPATH}${PSEP}$R/$j\"\n-\tfi\n-done\n-export CLASSPATH\n-\n-for p in $PLUGINS\n-do\n-\techo \"Entering $p ...\"\n-\t(cd $p/src &&\n-\t mkdir ../bin2 &&\n-\t find . -name \\*.java -type f |\n-\t xargs javac \\\n-\t\t-source 1.5 \\\n-\t\t-target 1.5 \\\n-\t\t-encoding UTF-8 \\\n-\t\t-g \\\n-\t\t-d ../bin2) || die \"Building $p failed.\"\n-\tCLASSPATH=\"${CLASSPATH}${PSEP}$R/$p/bin2\"\n-done\n-echo\n-\n-echo \"Version $VN\" &&\n-echo Manifest-Version: 1.0 >$T_MF &&\n-echo Implementation-Title: jgit >>$T_MF &&\n-echo Implementation-Version: $VN >>$T_MF &&\n-\n-java org.spearce.jgit.pgm.build.JarLinkUtil \\\n-\t-include org.spearce.jgit/bin2 \\\n-\t-file META-INF/MANIFEST.MF=$T_MF \\\n-\t>$O_JAR+ &&\n-mv $O_JAR+ $O_JAR &&\n-echo \"Created $O_JAR.\" &&\n-\n-java org.spearce.jgit.pgm.build.JarLinkUtil \\\n-\t-include org.spearce.jgit/src \\\n-\t-file META-INF/MANIFEST.MF=$T_MF \\\n-\t>$O_SRC+ &&\n-mv $O_SRC+ $O_SRC &&\n-echo \"Created $O_SRC.\" &&\n-\n-M_TB=META-INF/services/org.spearce.jgit.pgm.TextBuiltin &&\n-sed s/@@use_self@@/1/ jgit.sh >$O_CLI+ &&\n-java org.spearce.jgit.pgm.build.JarLinkUtil \\\n-\t`for p in $JARS   ; do printf %s \" -include $p\"     ;done` \\\n-\t`for p in $PLUGINS; do printf %s \" -include $p/bin2\";done` \\\n-\t-file $M_TB=org.spearce.jgit.pgm/src/$M_TB \\\n-\t-file META-INF/MANIFEST.MF=$T_MF \\\n-\t>>$O_CLI+ &&\n-chmod 555 $O_CLI+ &&\n-mv $O_CLI+ $O_CLI &&\n-echo \"Created $O_CLI.\" || die \"Build failed.\"\n-\n-echo \"Building Javadocs ...\"\n-for p in $PLUGINS; do\n-\tjavadoc -quiet -sourcepath \"$p/src/\" -d \"docs/$p/\" \\\n-\t`find \"$p/src\" -name \"*.java\"`\n-done\n-\n-(cd docs && jar cf \"../$O_DOC\" .)\n-echo \"Created $O_DOC.\"\n-\n-cleanup_bin\ndiff --git a/org.spearce.jgit.pgm/.gitignore b/org.spearce.jgit.pgm/.gitignore\nindex 934e0e0..ea8c4bf 100644\n--- a/org.spearce.jgit.pgm/.gitignore\n+++ b/org.spearce.jgit.pgm/.gitignore\n@@ -1,2 +1 @@\n-/bin\n /target\ndiff --git a/jgit.sh b/org.spearce.jgit.pgm/jgit.sh\nsimilarity index 79%\nrename from jgit.sh\nrename to org.spearce.jgit.pgm/jgit.sh\nindex 6b9b224..5e44356 100755\n--- a/jgit.sh\n+++ b/org.spearce.jgit.pgm/jgit.sh\n@@ -7,10 +7,9 @@ then\n \tcp=$this_script\n else\n \tjgit_home=`dirname $0`\n-\tcp=\"$jgit_home/org.spearce.jgit/bin\"\n-\tcp=\"$cp:$jgit_home/org.spearce.jgit/lib/jsch-0.1.37.jar\"\n-\tcp=\"$cp:$jgit_home/org.spearce.jgit.pgm/bin\"\n-\tcp=\"$cp:$jgit_home/org.spearce.jgit.pgm/lib/args4j-2.0.9.jar\"\n+\tcp=\"$jgit_home/../org.spearce.jgit/target/classes\"\n+\tcp=\"$cp:$jgit_home/../org.spearce.jgit.pgm/target/classes\"\n+\tcp=\"$cp:$jgit_home/target/jgit-cli.jar\"\n \tunset jgit_home\n \tjava_args=\n fi\ndiff --git a/org.spearce.jgit.pgm/lib/args4j-2.0.9.jar b/org.spearce.jgit.pgm/lib/args4j-2.0.9.jar\ndeleted file mode 100644\nindex a894c6e..0000000\nBinary files a/org.spearce.jgit.pgm/lib/args4j-2.0.9.jar and /dev/null differ\ndiff --git a/org.spearce.jgit.pgm/lib/args4j-2.0.9.zip b/org.spearce.jgit.pgm/lib/args4j-2.0.9.zip\ndeleted file mode 100644\nindex eccd663..0000000\nBinary files a/org.spearce.jgit.pgm/lib/args4j-2.0.9.zip and /dev/null differ\ndiff --git a/org.spearce.jgit.pgm/pom.xml b/org.spearce.jgit.pgm/pom.xml\nindex 9501cb5..ab399e5 100644\n--- a/org.spearce.jgit.pgm/pom.xml\n+++ b/org.spearce.jgit.pgm/pom.xml\n@@ -1,59 +1,120 @@\n <?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<!--\n+/*\n+ * All rights reserved.\n+ *\n+ * Redistribution and use in source and binary forms, with or\n+ * without modification, are permitted provided that the following\n+ * conditions are met:\n+ *\n+ * - Redistributions of source code must retain the above copyright\n+ *   notice, this list of conditions and the following disclaimer.\n+ *\n+ * - Redistributions in binary form must reproduce the above\n+ *   copyright notice, this list of conditions and the following\n+ *   disclaimer in the documentation and/or other materials provided\n+ *   with the distribution.\n+ *\n+ * - Neither the name of the Git Development Community nor the\n+ *   names of its contributors may be used to endorse or promote\n+ *   products derived from this software without specific prior\n+ *   written permission.\n+ *\n+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND\n+ * CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR\n+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\n+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+ */\n+-->\n+\n <project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n-  xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\">\n-  <modelVersion>4.0.0</modelVersion>\n-  <parent>\n-    <groupId>org.spearce</groupId>\n-    <artifactId>jgit-parent</artifactId>\n-    <version>0.5.0-SNAPSHOT</version>  \n-  </parent>\n-  <artifactId>org.spearce.jgit.pgm</artifactId>\n-  <name>JGit :: Pgm</name>\n-  <dependencies>\n-        <dependency>\n-            <groupId>org.spearce</groupId>\n-            <artifactId>org.spearce.jgit</artifactId>\n-            <version>${project.version}</version>\n-        </dependency>    \n-        <dependency>\n-            <groupId>args4j</groupId>\n-            <artifactId>args4j</artifactId>\n-        </dependency>\n-  </dependencies>\n-  <build>\n-    <sourceDirectory>src</sourceDirectory>\n-    <resources>\n-      <resource>\n-        <directory>src</directory>\n-        <includes>\n-          <include>**/services/**</include>\n-        </includes>\n-      </resource>\n-    </resources>\n-    <plugins>\n-      <plugin>\n-        <groupId>org.apache.maven.plugins</groupId>\n-        <artifactId>maven-shade-plugin</artifactId>\n-        <version>1.2</version>\n-        <executions>\n-          <execution>\n-            <phase>package</phase>\n-            <goals>\n-              <goal>shade</goal>\n-            </goals>\n-            <configuration>\n-              <finalName>jgit-cli</finalName>\n-              <createDependencyReducedPom>false</createDependencyReducedPom>\n-              <transformers>\n-                <transformer implementation=\"org.apache.maven.plugins.shade.resource.ServicesResourceTransformer\"/>              \n-                <transformer implementation=\"org.apache.maven.plugins.shade.resource.ManifestResourceTransformer\">\n-                  <mainClass>org.spearce.jgit.pgm.Main</mainClass>\n-                </transformer>\n-              </transformers>\n-            </configuration>\n-          </execution>\n-        </executions>\n-      </plugin>\n-    </plugins>      \n-  </build>\n+\txsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\">\n+\t<modelVersion>4.0.0</modelVersion>\n+\n+\t<parent>\n+\t\t<groupId>org.spearce</groupId>\n+\t\t<artifactId>jgit-parent</artifactId>\n+\t\t<version>0.5.0-SNAPSHOT</version>\n+\t</parent>\n+\n+\t<artifactId>org.spearce.jgit.pgm</artifactId>\n+\t<name>JGit :: Pgm</name>\n+\n+\t<description>\n+\tCommand line client for the JGit pure Java GIT implementation.\n+\tThis includes the re-packaging of all dependencies into an 'uberjar'\n+\t</description>\n+\n+\t<dependencies>\n+\t\t<dependency>\n+\t\t\t<groupId>org.spearce</groupId>\n+\t\t\t<artifactId>org.spearce.jgit</artifactId>\n+\t\t\t<version>${project.version}</version>\n+\t\t</dependency>\n+\t\t<dependency>\n+\t\t\t<groupId>args4j</groupId>\n+\t\t\t<artifactId>args4j</artifactId>\n+\t\t</dependency>\n+\t</dependencies>\n+\n+\t<build>\n+\t\t<plugins>\n+\t\t\t<plugin>\n+\t\t\t\t<groupId>org.apache.maven.plugins</groupId>\n+\t\t\t\t<artifactId>maven-shade-plugin</artifactId>\n+\t\t\t\t<version>1.2</version>\n+\t\t\t\t<executions>\n+\t\t\t\t\t<execution>\n+\t\t\t\t\t\t<phase>package</phase>\n+\t\t\t\t\t\t<goals>\n+\t\t\t\t\t\t\t<goal>shade</goal>\n+\t\t\t\t\t\t</goals>\n+\t\t\t\t\t\t<configuration>\n+<!-- temporarily DISABLED due to MSHADE-54\t<shadedArtifactAttached>true</shadedArtifactAttached>-->\n+\t\t\t\t\t\t\t<finalName>jgit-cli</finalName>\n+\t\t\t\t\t\t\t<createDependencyReducedPom>false</createDependencyReducedPom>\n+\t\t\t\t\t\t\t<transformers>\n+\t\t\t\t\t\t\t\t<transformer implementation=\"org.apache.maven.plugins.shade.resource.ServicesResourceTransformer\" />\n+\t\t\t\t\t\t\t\t<transformer implementation=\"org.apache.maven.plugins.shade.resource.ManifestResourceTransformer\">\n+\t\t\t\t\t\t\t\t\t<mainClass>org.spearce.jgit.pgm.Main</mainClass>\n+\t\t\t\t\t\t\t\t</transformer>\n+\t\t\t\t\t\t\t</transformers>\n+\t\t\t\t\t\t</configuration>\n+\t\t\t\t\t</execution>\n+\t\t\t\t</executions>\n+\t\t\t</plugin>\n+\t\t\t<plugin>\n+\t\t\t\t<groupId>org.apache.maven.plugins</groupId>\n+\t\t\t\t<artifactId>maven-antrun-plugin</artifactId>\n+\t\t\t\t<version>1.3</version>\n+\t\t\t\t<executions>\n+\t\t\t\t\t<execution>\n+\t\t\t\t\t\t<id>create_jgit</id>\n+\t\t\t\t\t\t<phase>package</phase>\n+\t\t\t\t\t\t<configuration>\n+\t\t\t\t\t\t\t<tasks>\n+\t\t\t\t\t\t\t\t<concat destfile=\"${basedir}/jgit\" force=\"no\">\n+\t\t\t\t\t\t\t\t\t<fileset file=\"${basedir}/jgit.sh\" />\n+\t\t\t\t\t\t\t\t\t<fileset file=\"${basedir}/target/jgit-cli.jar\" />\n+\t\t\t\t\t\t\t\t</concat>\n+\t\t\t\t\t\t\t\t<chmod file=\"${basedir}/jgit\" perm=\"a+x\"/>\n+\t\t\t\t\t\t\t</tasks>\n+\t\t\t\t\t\t</configuration>\n+\t\t\t\t\t\t<goals>\n+\t\t\t\t\t\t\t<goal>run</goal>\n+\t\t\t\t\t\t</goals>\n+\t\t\t\t\t</execution>\n+\t\t\t\t</executions>\n+\t\t\t</plugin>\n+\t\t</plugins>\n+\t</build>\n </project>\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/AbstractFetchCommand.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/AbstractFetchCommand.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Branch.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Branch.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Clone.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Clone.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Command.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Command.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/CommandCatalog.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/CommandCatalog.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/CommandRef.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/CommandRef.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Daemon.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Daemon.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Die.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Die.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/DiffTree.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/DiffTree.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Fetch.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Fetch.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Glog.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Glog.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/IndexPack.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/IndexPack.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Init.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Init.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Log.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Log.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/LsRemote.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/LsRemote.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/LsTree.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/LsTree.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Main.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Main.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/MergeBase.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/MergeBase.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Push.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Push.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/ReceivePack.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/ReceivePack.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/RevList.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/RevList.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/RevParse.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/RevParse.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/RevWalkTextBuiltin.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/RevWalkTextBuiltin.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Rm.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Rm.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/ShowRef.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/ShowRef.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Tag.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Tag.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/TextBuiltin.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/UploadPack.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/UploadPack.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Version.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/Version.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/MakeCacheTree.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/MakeCacheTree.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/ReadDirCache.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/ReadDirCache.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/RebuildCommitGraph.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/RebuildCommitGraph.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/ShowCacheTree.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/ShowCacheTree.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/ShowCommands.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/ShowCommands.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/ShowDirCache.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/ShowDirCache.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/debug/WriteDirCache.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/debug/WriteDirCache.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/AbstractTreeIteratorHandler.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/AbstractTreeIteratorHandler.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/CmdLineParser.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/CmdLineParser.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/ObjectIdHandler.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/ObjectIdHandler.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/PathTreeFilterHandler.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/PathTreeFilterHandler.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/RefSpecHandler.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/RefSpecHandler.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/RevCommitHandler.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/RevCommitHandler.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/RevTreeHandler.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/RevTreeHandler.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/SubcommandHandler.java\nrename to org.spearce.jgit.pgm/src/main/java/org/spearce/jgit/pgm/opt/SubcommandHandler.java\ndiff --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\nsimilarity index 100%\nrename from org.spearce.jgit.pgm/src/META-INF/services/org.spearce.jgit.pgm.TextBuiltin\nrename to org.spearce.jgit.pgm/src/main/resources/META-INF/services/org.spearce.jgit.pgm.TextBuiltin\ndiff --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\ndeleted file mode 100644\nindex 929ee55..0000000\n--- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/build/JarLinkUtil.java\n+++ /dev/null\n@@ -1,206 +0,0 @@\n-/*\n- * Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org>\n- *\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or\n- * without modification, are permitted provided that the following\n- * conditions are met:\n- *\n- * - Redistributions of source code must retain the above copyright\n- *   notice, this list of conditions and the following disclaimer.\n- *\n- * - Redistributions in binary form must reproduce the above\n- *   copyright notice, this list of conditions and the following\n- *   disclaimer in the documentation and/or other materials provided\n- *   with the distribution.\n- *\n- * - Neither the name of the Git Development Community nor the\n- *   names of its contributors may be used to endorse or promote\n- *   products derived from this software without specific prior\n- *   written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND\n- * CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR\n- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\n- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- */\n-\n-package org.spearce.jgit.pgm.build;\n-\n-import java.io.File;\n-import java.io.FileInputStream;\n-import java.io.IOException;\n-import java.io.InputStream;\n-import java.util.ArrayList;\n-import java.util.Enumeration;\n-import java.util.HashMap;\n-import java.util.List;\n-import java.util.Map;\n-import java.util.zip.ZipEntry;\n-import java.util.zip.ZipFile;\n-import java.util.zip.ZipOutputStream;\n-\n-import org.kohsuke.args4j.CmdLineException;\n-import org.kohsuke.args4j.CmdLineParser;\n-import org.kohsuke.args4j.Option;\n-import org.kohsuke.args4j.spi.MapOptionHandler;\n-\n-/**\n- * Combines multiple JAR and directory sources into a single JAR file.\n- * <p>\n- * This is a crude command line utility to combine multiple JAR files into a\n- * single JAR file, without first needing to unpack the individual JARs.\n- * <p>\n- * The output ZIP stream is sent to standard out and can be redirected onto the\n- * end of a shell script which starts the JRE.\n- */\n-public class JarLinkUtil {\n-\t/**\n-\t * Combine multiple JARs.\n-\t *\n-\t * @param argv\n-\t *            the command line arguments indicating the files to pack.\n-\t * @throws IOException\n-\t *             a source file could not be read.\n-\t */\n-\tpublic static void main(final String[] argv) throws IOException {\n-\t\tfinal JarLinkUtil util = new JarLinkUtil();\n-\t\tfinal CmdLineParser clp = new CmdLineParser(util);\n-\t\ttry {\n-\t\t\tclp.parseArgument(argv);\n-\t\t} catch (CmdLineException e) {\n-\t\t\tclp.printSingleLineUsage(System.err);\n-\t\t\tSystem.exit(1);\n-\t\t}\n-\t\tutil.run();\n-\t}\n-\n-\t@Option(name = \"-include\", required = true)\n-\tprivate List<File> includes = new ArrayList<File>();\n-\n-\t@Option(name = \"-file\", handler = MapOptionHandler.class)\n-\tprivate Map<String, String> files = new HashMap<String, String>();\n-\n-\tprivate final Map<String, File> chosenSources = new HashMap<String, File>();\n-\n-\tprivate long creationTime;\n-\n-\tprivate ZipOutputStream zos;\n-\n-\tprivate JarLinkUtil() {\n-\t\t// Command line utility only.\n-\t}\n-\n-\tprivate void run() throws IOException {\n-\t\tfor (final File src : includes) {\n-\t\t\tif (src.isFile())\n-\t\t\t\tscanJar(src);\n-\t\t\telse\n-\t\t\t\tscanDirectory(src, src, \"\");\n-\t\t}\n-\t\tfor (final Map.Entry<String, String> e : files.entrySet())\n-\t\t\tchosenSources.put(e.getKey(), new File(e.getValue()));\n-\n-\t\tcreationTime = System.currentTimeMillis();\n-\t\tzos = new ZipOutputStream(System.out);\n-\t\tzos.setLevel(9);\n-\n-\t\tfor (final File src : includes) {\n-\t\t\tif (src.isFile())\n-\t\t\t\tappendJar(src);\n-\t\t\telse\n-\t\t\t\tappendDirectory(src, src, \"\");\n-\t\t}\n-\t\tfor (final String name : files.keySet())\n-\t\t\tappendFile(chosenSources.get(name), name);\n-\n-\t\tzos.close();\n-\t}\n-\n-\tprivate void scanJar(final File jarPath) throws IOException {\n-\t\tfinal ZipFile zf = new ZipFile(jarPath);\n-\t\tfinal Enumeration<? extends ZipEntry> e = zf.entries();\n-\t\twhile (e.hasMoreElements())\n-\t\t\tchosenSources.put(e.nextElement().getName(), jarPath);\n-\t\tzf.close();\n-\t}\n-\n-\tprivate void scanDirectory(final File rootPath, final File dirPath,\n-\t\t\tfinal String pfx) throws IOException {\n-\t\tfinal File[] entries = dirPath.listFiles();\n-\t\tif (entries == null)\n-\t\t\treturn;\n-\t\tfor (final File e : entries) {\n-\t\t\tif (e.getName().equals(\".\") || e.getName().equals(\"..\"))\n-\t\t\t\tcontinue;\n-\n-\t\t\tif (e.isDirectory())\n-\t\t\t\tscanDirectory(rootPath, e, pfx + e.getName() + \"/\");\n-\t\t\telse\n-\t\t\t\tchosenSources.put(pfx + e.getName(), rootPath);\n-\t\t}\n-\t}\n-\n-\tprivate void appendJar(final File jarPath) throws IOException {\n-\t\tfinal ZipFile zf = new ZipFile(jarPath);\n-\t\tfinal Enumeration<? extends ZipEntry> e = zf.entries();\n-\t\twhile (e.hasMoreElements()) {\n-\t\t\tfinal ZipEntry ze = e.nextElement();\n-\t\t\tfinal String name = ze.getName();\n-\t\t\tif (chosenSources.get(name) == jarPath)\n-\t\t\t\tappendEntry(name, ze.getSize(), ze.getTime(), zf\n-\t\t\t\t\t\t.getInputStream(ze));\n-\t\t}\n-\t\tzf.close();\n-\t}\n-\n-\tprivate void appendDirectory(final File rootDir, final File dirPath,\n-\t\t\tfinal String pfx) throws IOException {\n-\t\tfinal File[] entries = dirPath.listFiles();\n-\t\tif (entries == null)\n-\t\t\treturn;\n-\t\tfor (final File e : entries) {\n-\t\t\tif (e.getName().equals(\".\") || e.getName().equals(\"..\"))\n-\t\t\t\tcontinue;\n-\n-\t\t\tif (e.isDirectory())\n-\t\t\t\tappendDirectory(rootDir, e, pfx + e.getName() + \"/\");\n-\t\t\telse if (chosenSources.get(pfx + e.getName()) == rootDir)\n-\t\t\t\tappendFile(e, pfx + e.getName());\n-\t\t}\n-\t}\n-\n-\tprivate void appendFile(final File path, final String name)\n-\t\t\tthrows IOException {\n-\t\tfinal long len = path.length();\n-\t\tfinal InputStream is = new FileInputStream(path);\n-\t\tappendEntry(name, len, creationTime, is);\n-\t}\n-\n-\tprivate void appendEntry(final String name, final long len,\n-\t\t\tfinal long time, final InputStream is) throws IOException {\n-\t\tfinal ZipEntry ze = new ZipEntry(name);\n-\t\tze.setSize(len);\n-\t\tze.setTime(time);\n-\t\tzos.putNextEntry(ze);\n-\t\ttry {\n-\t\t\tfinal byte[] buf = new byte[4096];\n-\t\t\tint n;\n-\t\t\twhile ((n = is.read(buf)) >= 0)\n-\t\t\t\tzos.write(buf, 0, n);\n-\t\t} finally {\n-\t\t\tis.close();\n-\t\t}\n-\t\tzos.closeEntry();\n-\t}\n-}\n-- \n1.6.2.5\n"},{"id":"123693","messageId":"1253740570-10718-6-git-send-email-struberg@yahoo.de","threadId":"21040","inReplyTo":"1253740570-10718-5-git-send-email-struberg@yahoo.de","subject":"[JGIT PATCH 6/9] enable missing test cases and fix jgit executable creation","fromName":"Mark Struberg","fromEmail":"struberg@yahoo.de","sentAt":"2009-09-23T21:16:07Z","receivedAt":"2009-09-23T21:16:07Z","isPatch":true,"sender":{"key":"struberg@yahoo.de","avatar":"https://gravatar.com/avatar/119742c3e8dbc8db35a92bdff0581aec8d364d415f770e60431cba262daa974f?d=mp&s=160"},"body":"* enable the T000* tests in surefire\n\n* fix the creation of the jgit executable by correcting the\nuse_self filtering and performing the copy task in binary mode\n\nSigned-off-by: Mark Struberg <struberg@yahoo.de>\n---\n org.spearce.jgit.pgm/jgit.sh |    2 +-\n org.spearce.jgit.pgm/pom.xml |   12 +++++++++---\n org.spearce.jgit/pom.xml     |    5 +++++\n 3 files changed, 15 insertions(+), 4 deletions(-)\n\ndiff --git a/org.spearce.jgit.pgm/jgit.sh b/org.spearce.jgit.pgm/jgit.sh\nindex 5e44356..6c101a0 100755\n--- a/org.spearce.jgit.pgm/jgit.sh\n+++ b/org.spearce.jgit.pgm/jgit.sh\n@@ -1,6 +1,6 @@\n #!/bin/sh\n \n-if [ \"@@use_self@@\" = \"1\" ]\n+if [ \"@use_self@\" = \"1\" ]\n then\n \tthis_script=`which \"$0\" 2>/dev/null`\n \t[ $? -gt 0 -a -f \"$0\" ] && this_script=\"$0\"\ndiff --git a/org.spearce.jgit.pgm/pom.xml b/org.spearce.jgit.pgm/pom.xml\nindex ab399e5..47dfbf1 100644\n--- a/org.spearce.jgit.pgm/pom.xml\n+++ b/org.spearce.jgit.pgm/pom.xml\n@@ -102,11 +102,17 @@\n \t\t\t\t\t\t<phase>package</phase>\n \t\t\t\t\t\t<configuration>\n \t\t\t\t\t\t\t<tasks>\n-\t\t\t\t\t\t\t\t<concat destfile=\"${basedir}/jgit\" force=\"no\">\n-\t\t\t\t\t\t\t\t\t<fileset file=\"${basedir}/jgit.sh\" />\n+\t\t\t\t\t\t\t\t<copy todir=\"${basedir}/target/\">\n+\t\t\t\t\t\t\t\t\t<fileset file=\"${basedir}/jgit.sh\"/>\n+\t\t\t\t\t\t\t\t\t<filterset>\n+\t\t\t\t\t\t\t\t\t\t<filter token=\"use_self\" value=\"1\"/>\n+\t\t\t\t\t\t\t\t\t</filterset>\n+\t\t\t\t\t\t\t\t</copy>\n+\t\t\t\t\t\t\t\t<concat destfile=\"${basedir}/target/jgit\" force=\"yes\" binary=\"true\">\n+\t\t\t\t\t\t\t\t\t<fileset file=\"${basedir}/target/jgit.sh\" />\n \t\t\t\t\t\t\t\t\t<fileset file=\"${basedir}/target/jgit-cli.jar\" />\n \t\t\t\t\t\t\t\t</concat>\n-\t\t\t\t\t\t\t\t<chmod file=\"${basedir}/jgit\" perm=\"a+x\"/>\n+\t\t\t\t\t\t\t\t<chmod file=\"${basedir}/target/jgit\" perm=\"a+x\"/>\n \t\t\t\t\t\t\t</tasks>\n \t\t\t\t\t\t</configuration>\n \t\t\t\t\t\t<goals>\ndiff --git a/org.spearce.jgit/pom.xml b/org.spearce.jgit/pom.xml\nindex eb01e16..f565dda 100644\n--- a/org.spearce.jgit/pom.xml\n+++ b/org.spearce.jgit/pom.xml\n@@ -107,6 +107,10 @@\n \t\t\t\t\t\t<groupId>org.apache.maven.plugins</groupId>\n \t\t\t\t\t\t<artifactId>maven-surefire-plugin</artifactId>\n \t\t\t\t\t\t<configuration>\n+                            <includes>\n+                                <include>**/*Test.java</include>\n+                                <include>**/T00*.java</include>\n+                            </includes>\n \t\t\t\t\t\t\t<excludes>\n \t\t\t\t\t\t\t\t<exclude>**/*TckTest.java</exclude>\n \t\t\t\t\t\t\t</excludes>\n@@ -125,6 +129,7 @@\n \t\t\t\t\t\t<configuration>\n \t\t\t\t\t\t\t<includes>\n \t\t\t\t\t\t\t\t<include>**/*Test.java</include>\n+                                <include>**/T00*.java</include>\n \t\t\t\t\t\t\t</includes>\n \t\t\t\t\t\t</configuration>\n \t\t\t\t\t</plugin>\n-- \n1.6.2.5\n"},{"id":"123699","messageId":"1253740570-10718-7-git-send-email-struberg@yahoo.de","threadId":"21040","inReplyTo":"1253740570-10718-6-git-send-email-struberg@yahoo.de","subject":"[JGIT PATCH 7/9] removing eclipse project files","fromName":"Mark Struberg","fromEmail":"struberg@yahoo.de","sentAt":"2009-09-23T21:16:08Z","receivedAt":"2009-09-23T21:16:08Z","isPatch":true,"sender":{"key":"struberg@yahoo.de","avatar":"https://gravatar.com/avatar/119742c3e8dbc8db35a92bdff0581aec8d364d415f770e60431cba262daa974f?d=mp&s=160"},"body":"All information necessary to build jgit is already available in\nthe maven pom.xmls.\n\nSigned-off-by: Mark Struberg <struberg@yahoo.de>\n---\n org.spearce.jgit.pgm/.classpath                    |    8 -\n org.spearce.jgit.pgm/.gitignore                    |    5 +\n org.spearce.jgit.pgm/.project                      |   17 -\n .../.settings/org.eclipse.core.resources.prefs     |    3 -\n .../.settings/org.eclipse.core.runtime.prefs       |    3 -\n .../.settings/org.eclipse.jdt.core.prefs           |  321 --------------------\n .../.settings/org.eclipse.jdt.ui.prefs             |    9 -\n org.spearce.jgit/.classpath                        |   10 -\n org.spearce.jgit/.gitignore                        |    6 +-\n org.spearce.jgit/.project                          |   34 --\n .../.settings/org.eclipse.core.resources.prefs     |    3 -\n .../.settings/org.eclipse.core.runtime.prefs       |    3 -\n .../.settings/org.eclipse.jdt.core.prefs           |  321 --------------------\n .../.settings/org.eclipse.jdt.ui.prefs             |    9 -\n .../.settings/org.maven.ide.eclipse.prefs          |    9 -\n 15 files changed, 10 insertions(+), 751 deletions(-)\n delete mode 100644 org.spearce.jgit.pgm/.classpath\n delete mode 100644 org.spearce.jgit.pgm/.project\n delete mode 100644 org.spearce.jgit.pgm/.settings/org.eclipse.core.resources.prefs\n delete mode 100644 org.spearce.jgit.pgm/.settings/org.eclipse.core.runtime.prefs\n delete mode 100644 org.spearce.jgit.pgm/.settings/org.eclipse.jdt.core.prefs\n delete mode 100644 org.spearce.jgit.pgm/.settings/org.eclipse.jdt.ui.prefs\n delete mode 100644 org.spearce.jgit/.classpath\n delete mode 100644 org.spearce.jgit/.project\n delete mode 100644 org.spearce.jgit/.settings/org.eclipse.core.resources.prefs\n delete mode 100644 org.spearce.jgit/.settings/org.eclipse.core.runtime.prefs\n delete mode 100644 org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs\n delete mode 100644 org.spearce.jgit/.settings/org.eclipse.jdt.ui.prefs\n delete mode 100644 org.spearce.jgit/.settings/org.maven.ide.eclipse.prefs\n\ndiff --git a/org.spearce.jgit.pgm/.classpath b/org.spearce.jgit.pgm/.classpath\ndeleted file mode 100644\nindex 50dd6d3..0000000\n--- a/org.spearce.jgit.pgm/.classpath\n+++ /dev/null\n@@ -1,8 +0,0 @@\n-<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n-<classpath>\n-\t<classpathentry kind=\"src\" path=\"src\"/>\n-\t<classpathentry exported=\"true\" kind=\"lib\" path=\"lib/args4j-2.0.9.jar\" sourcepath=\"lib/args4j-2.0.9.zip\"/>\n-\t<classpathentry kind=\"con\" path=\"org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5\"/>\n-\t<classpathentry combineaccessrules=\"false\" exported=\"true\" kind=\"src\" path=\"/org.spearce.jgit\"/>\n-\t<classpathentry kind=\"output\" path=\"bin\"/>\n-</classpath>\ndiff --git a/org.spearce.jgit.pgm/.gitignore b/org.spearce.jgit.pgm/.gitignore\nindex ea8c4bf..60a813a 100644\n--- a/org.spearce.jgit.pgm/.gitignore\n+++ b/org.spearce.jgit.pgm/.gitignore\n@@ -1 +1,6 @@\n /target\n+/.classpath\n+/.project\n+/.settings\n+/*.iwl\n+/*.ipr\ndiff --git a/org.spearce.jgit.pgm/.project b/org.spearce.jgit.pgm/.project\ndeleted file mode 100644\nindex e642f9e..0000000\n--- a/org.spearce.jgit.pgm/.project\n+++ /dev/null\n@@ -1,17 +0,0 @@\n-<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n-<projectDescription>\n-\t<name>org.spearce.jgit.pgm</name>\n-\t<comment></comment>\n-\t<projects>\n-\t</projects>\n-\t<buildSpec>\n-\t\t<buildCommand>\n-\t\t\t<name>org.eclipse.jdt.core.javabuilder</name>\n-\t\t\t<arguments>\n-\t\t\t</arguments>\n-\t\t</buildCommand>\n-\t</buildSpec>\n-\t<natures>\n-\t\t<nature>org.eclipse.jdt.core.javanature</nature>\n-\t</natures>\n-</projectDescription>\ndiff --git a/org.spearce.jgit.pgm/.settings/org.eclipse.core.resources.prefs b/org.spearce.jgit.pgm/.settings/org.eclipse.core.resources.prefs\ndeleted file mode 100644\nindex 759548b..0000000\n--- a/org.spearce.jgit.pgm/.settings/org.eclipse.core.resources.prefs\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-#Mon Aug 11 16:46:23 PDT 2008\n-eclipse.preferences.version=1\n-encoding/<project>=UTF-8\ndiff --git a/org.spearce.jgit.pgm/.settings/org.eclipse.core.runtime.prefs b/org.spearce.jgit.pgm/.settings/org.eclipse.core.runtime.prefs\ndeleted file mode 100644\nindex 006e07e..0000000\n--- a/org.spearce.jgit.pgm/.settings/org.eclipse.core.runtime.prefs\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-#Mon Mar 24 18:55:50 EDT 2008\n-eclipse.preferences.version=1\n-line.separator=\\n\ndiff --git a/org.spearce.jgit.pgm/.settings/org.eclipse.jdt.core.prefs b/org.spearce.jgit.pgm/.settings/org.eclipse.jdt.core.prefs\ndeleted file mode 100644\nindex f0c80d3..0000000\n--- a/org.spearce.jgit.pgm/.settings/org.eclipse.jdt.core.prefs\n+++ /dev/null\n@@ -1,321 +0,0 @@\n-#Sun Mar 15 19:46:39 CET 2009\n-eclipse.preferences.version=1\n-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\n-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5\n-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve\n-org.eclipse.jdt.core.compiler.compliance=1.5\n-org.eclipse.jdt.core.compiler.debug.lineNumber=generate\n-org.eclipse.jdt.core.compiler.debug.localVariable=generate\n-org.eclipse.jdt.core.compiler.debug.sourceFile=generate\n-org.eclipse.jdt.core.compiler.doc.comment.support=enabled\n-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning\n-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\n-org.eclipse.jdt.core.compiler.problem.autoboxing=warning\n-org.eclipse.jdt.core.compiler.problem.deprecation=warning\n-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled\n-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled\n-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning\n-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning\n-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\n-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning\n-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning\n-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning\n-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error\n-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error\n-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error\n-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning\n-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning\n-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error\n-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error\n-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled\n-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled\n-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled\n-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private\n-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning\n-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error\n-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore\n-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=error\n-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled\n-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected\n-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag\n-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error\n-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled\n-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected\n-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore\n-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning\n-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error\n-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error\n-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore\n-org.eclipse.jdt.core.compiler.problem.nullReference=warning\n-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning\n-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore\n-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error\n-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning\n-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore\n-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning\n-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled\n-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error\n-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled\n-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning\n-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning\n-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning\n-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning\n-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error\n-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore\n-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning\n-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled\n-org.eclipse.jdt.core.compiler.problem.unusedImport=error\n-org.eclipse.jdt.core.compiler.problem.unusedLabel=error\n-org.eclipse.jdt.core.compiler.problem.unusedLocal=error\n-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning\n-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled\n-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled\n-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error\n-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error\n-org.eclipse.jdt.core.compiler.source=1.5\n-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16\n-org.eclipse.jdt.core.formatter.alignment_for_assignment=0\n-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16\n-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16\n-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80\n-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0\n-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16\n-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16\n-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16\n-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16\n-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16\n-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16\n-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16\n-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16\n-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16\n-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16\n-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1\n-org.eclipse.jdt.core.formatter.blank_lines_after_package=1\n-org.eclipse.jdt.core.formatter.blank_lines_before_field=1\n-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0\n-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1\n-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1\n-org.eclipse.jdt.core.formatter.blank_lines_before_method=1\n-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1\n-org.eclipse.jdt.core.formatter.blank_lines_before_package=0\n-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1\n-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line\n-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line\n-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line\n-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line\n-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line\n-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line\n-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line\n-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line\n-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line\n-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line\n-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line\n-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false\n-org.eclipse.jdt.core.formatter.comment.format_comments=true\n-org.eclipse.jdt.core.formatter.comment.format_header=false\n-org.eclipse.jdt.core.formatter.comment.format_html=true\n-org.eclipse.jdt.core.formatter.comment.format_source_code=true\n-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true\n-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true\n-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert\n-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert\n-org.eclipse.jdt.core.formatter.comment.line_length=80\n-org.eclipse.jdt.core.formatter.compact_else_if=true\n-org.eclipse.jdt.core.formatter.continuation_indentation=2\n-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2\n-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true\n-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true\n-org.eclipse.jdt.core.formatter.indent_empty_lines=false\n-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true\n-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true\n-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true\n-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false\n-org.eclipse.jdt.core.formatter.indentation.size=4\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert\n-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert\n-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert\n-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert\n-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert\n-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert\n-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert\n-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert\n-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false\n-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false\n-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false\n-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false\n-org.eclipse.jdt.core.formatter.lineSplit=80\n-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0\n-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1\n-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true\n-org.eclipse.jdt.core.formatter.tabulation.char=tab\n-org.eclipse.jdt.core.formatter.tabulation.size=4\n-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false\ndiff --git a/org.spearce.jgit.pgm/.settings/org.eclipse.jdt.ui.prefs b/org.spearce.jgit.pgm/.settings/org.eclipse.jdt.ui.prefs\ndeleted file mode 100644\nindex 709a440..0000000\n--- a/org.spearce.jgit.pgm/.settings/org.eclipse.jdt.ui.prefs\n+++ /dev/null\n@@ -1,9 +0,0 @@\n-#Wed May 09 00:20:24 CEST 2007\n-eclipse.preferences.version=1\n-formatter_profile=_JGit\n-formatter_settings_version=10\n-org.eclipse.jdt.ui.ignorelowercasenames=true\n-org.eclipse.jdt.ui.importorder=java;javax;org;com;\n-org.eclipse.jdt.ui.ondemandthreshold=99\n-org.eclipse.jdt.ui.staticondemandthreshold=99\n-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\\=\"1.0\" encoding\\=\"UTF-8\"?><templates/>\ndiff --git a/org.spearce.jgit/.classpath b/org.spearce.jgit/.classpath\ndeleted file mode 100644\nindex c1c8f51..0000000\n--- a/org.spearce.jgit/.classpath\n+++ /dev/null\n@@ -1,10 +0,0 @@\n-<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n-<classpath>\n-\t<classpathentry kind=\"src\" output=\"target/classes\" path=\"src/main/java\"/>\n-\t<classpathentry kind=\"src\" output=\"target/test-classes\" path=\"src/test/java\"/>\n-\t<classpathentry excluding=\"**\" kind=\"src\" output=\"target/test-classes\" path=\"src/test/resources\"/>\n-\t<classpathentry kind=\"con\" path=\"org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5\"/>\n-\t<classpathentry kind=\"con\" path=\"org.eclipse.pde.core.requiredPlugins\"/>\n-\t<classpathentry kind=\"con\" path=\"org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER\"/>\n-\t<classpathentry kind=\"output\" path=\"target/classes\"/>\n-</classpath>\ndiff --git a/org.spearce.jgit/.gitignore b/org.spearce.jgit/.gitignore\nindex 934e0e0..60a813a 100644\n--- a/org.spearce.jgit/.gitignore\n+++ b/org.spearce.jgit/.gitignore\n@@ -1,2 +1,6 @@\n-/bin\n /target\n+/.classpath\n+/.project\n+/.settings\n+/*.iwl\n+/*.ipr\ndiff --git a/org.spearce.jgit/.project b/org.spearce.jgit/.project\ndeleted file mode 100644\nindex da2f7cf..0000000\n--- a/org.spearce.jgit/.project\n+++ /dev/null\n@@ -1,34 +0,0 @@\n-<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n-<projectDescription>\n-\t<name>org.spearce.jgit</name>\n-\t<comment></comment>\n-\t<projects>\n-\t</projects>\n-\t<buildSpec>\n-\t\t<buildCommand>\n-\t\t\t<name>org.eclipse.jdt.core.javabuilder</name>\n-\t\t\t<arguments>\n-\t\t\t</arguments>\n-\t\t</buildCommand>\n-\t\t<buildCommand>\n-\t\t\t<name>org.eclipse.pde.ManifestBuilder</name>\n-\t\t\t<arguments>\n-\t\t\t</arguments>\n-\t\t</buildCommand>\n-\t\t<buildCommand>\n-\t\t\t<name>org.eclipse.pde.SchemaBuilder</name>\n-\t\t\t<arguments>\n-\t\t\t</arguments>\n-\t\t</buildCommand>\n-\t\t<buildCommand>\n-\t\t\t<name>org.maven.ide.eclipse.maven2Builder</name>\n-\t\t\t<arguments>\n-\t\t\t</arguments>\n-\t\t</buildCommand>\n-\t</buildSpec>\n-\t<natures>\n-\t\t<nature>org.maven.ide.eclipse.maven2Nature</nature>\n-\t\t<nature>org.eclipse.jdt.core.javanature</nature>\n-\t\t<nature>org.eclipse.pde.PluginNature</nature>\n-\t</natures>\n-</projectDescription>\ndiff --git a/org.spearce.jgit/.settings/org.eclipse.core.resources.prefs b/org.spearce.jgit/.settings/org.eclipse.core.resources.prefs\ndeleted file mode 100644\nindex 66ac15c..0000000\n--- a/org.spearce.jgit/.settings/org.eclipse.core.resources.prefs\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-#Mon Aug 11 16:46:12 PDT 2008\n-eclipse.preferences.version=1\n-encoding/<project>=UTF-8\ndiff --git a/org.spearce.jgit/.settings/org.eclipse.core.runtime.prefs b/org.spearce.jgit/.settings/org.eclipse.core.runtime.prefs\ndeleted file mode 100644\nindex cce0568..0000000\n--- a/org.spearce.jgit/.settings/org.eclipse.core.runtime.prefs\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-#Mon Mar 24 18:55:50 EDT 2008\n-eclipse.preferences.version=1\n-line.separator=\\n\ndiff --git a/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs b/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs\ndeleted file mode 100644\nindex 22d560f..0000000\n--- a/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs\n+++ /dev/null\n@@ -1,321 +0,0 @@\n-#Fri Sep 04 16:53:41 CEST 2009\n-eclipse.preferences.version=1\n-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\n-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5\n-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve\n-org.eclipse.jdt.core.compiler.compliance=1.5\n-org.eclipse.jdt.core.compiler.debug.lineNumber=generate\n-org.eclipse.jdt.core.compiler.debug.localVariable=generate\n-org.eclipse.jdt.core.compiler.debug.sourceFile=generate\n-org.eclipse.jdt.core.compiler.doc.comment.support=enabled\n-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning\n-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\n-org.eclipse.jdt.core.compiler.problem.autoboxing=warning\n-org.eclipse.jdt.core.compiler.problem.deprecation=warning\n-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled\n-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled\n-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning\n-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning\n-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\n-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning\n-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning\n-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning\n-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error\n-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error\n-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error\n-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning\n-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning\n-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error\n-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error\n-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled\n-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled\n-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled\n-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private\n-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning\n-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error\n-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore\n-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning\n-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled\n-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected\n-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag\n-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error\n-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled\n-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private\n-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore\n-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning\n-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error\n-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error\n-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore\n-org.eclipse.jdt.core.compiler.problem.nullReference=warning\n-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning\n-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore\n-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error\n-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning\n-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore\n-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning\n-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled\n-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error\n-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled\n-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning\n-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning\n-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning\n-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning\n-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error\n-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore\n-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning\n-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled\n-org.eclipse.jdt.core.compiler.problem.unusedImport=error\n-org.eclipse.jdt.core.compiler.problem.unusedLabel=error\n-org.eclipse.jdt.core.compiler.problem.unusedLocal=error\n-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning\n-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled\n-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled\n-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error\n-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error\n-org.eclipse.jdt.core.compiler.source=1.5\n-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16\n-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16\n-org.eclipse.jdt.core.formatter.alignment_for_assignment=0\n-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16\n-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16\n-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80\n-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0\n-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16\n-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16\n-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16\n-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16\n-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16\n-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16\n-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16\n-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16\n-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16\n-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16\n-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1\n-org.eclipse.jdt.core.formatter.blank_lines_after_package=1\n-org.eclipse.jdt.core.formatter.blank_lines_before_field=1\n-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0\n-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1\n-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1\n-org.eclipse.jdt.core.formatter.blank_lines_before_method=1\n-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1\n-org.eclipse.jdt.core.formatter.blank_lines_before_package=0\n-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1\n-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line\n-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line\n-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line\n-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line\n-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line\n-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line\n-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line\n-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line\n-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line\n-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line\n-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line\n-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false\n-org.eclipse.jdt.core.formatter.comment.format_comments=true\n-org.eclipse.jdt.core.formatter.comment.format_header=false\n-org.eclipse.jdt.core.formatter.comment.format_html=true\n-org.eclipse.jdt.core.formatter.comment.format_source_code=true\n-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true\n-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true\n-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert\n-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert\n-org.eclipse.jdt.core.formatter.comment.line_length=80\n-org.eclipse.jdt.core.formatter.compact_else_if=true\n-org.eclipse.jdt.core.formatter.continuation_indentation=2\n-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2\n-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true\n-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true\n-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true\n-org.eclipse.jdt.core.formatter.indent_empty_lines=false\n-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true\n-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true\n-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true\n-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false\n-org.eclipse.jdt.core.formatter.indentation.size=4\n-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert\n-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert\n-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert\n-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert\n-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert\n-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert\n-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert\n-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert\n-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert\n-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert\n-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert\n-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert\n-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false\n-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false\n-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false\n-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false\n-org.eclipse.jdt.core.formatter.lineSplit=80\n-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0\n-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1\n-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true\n-org.eclipse.jdt.core.formatter.tabulation.char=tab\n-org.eclipse.jdt.core.formatter.tabulation.size=4\n-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false\ndiff --git a/org.spearce.jgit/.settings/org.eclipse.jdt.ui.prefs b/org.spearce.jgit/.settings/org.eclipse.jdt.ui.prefs\ndeleted file mode 100644\nindex 709a440..0000000\n--- a/org.spearce.jgit/.settings/org.eclipse.jdt.ui.prefs\n+++ /dev/null\n@@ -1,9 +0,0 @@\n-#Wed May 09 00:20:24 CEST 2007\n-eclipse.preferences.version=1\n-formatter_profile=_JGit\n-formatter_settings_version=10\n-org.eclipse.jdt.ui.ignorelowercasenames=true\n-org.eclipse.jdt.ui.importorder=java;javax;org;com;\n-org.eclipse.jdt.ui.ondemandthreshold=99\n-org.eclipse.jdt.ui.staticondemandthreshold=99\n-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\\=\"1.0\" encoding\\=\"UTF-8\"?><templates/>\ndiff --git a/org.spearce.jgit/.settings/org.maven.ide.eclipse.prefs b/org.spearce.jgit/.settings/org.maven.ide.eclipse.prefs\ndeleted file mode 100644\nindex 1e219ee..0000000\n--- a/org.spearce.jgit/.settings/org.maven.ide.eclipse.prefs\n+++ /dev/null\n@@ -1,9 +0,0 @@\n-#Fri Sep 04 16:35:48 CEST 2009\n-activeProfiles=\n-eclipse.preferences.version=1\n-fullBuildGoals=process-test-resources\n-includeModules=false\n-resolveWorkspaceProjects=true\n-resourceFilterGoals=process-resources resources\\:testResources\n-skipCompilerPlugin=true\n-version=1\n-- \n1.6.2.5\n"},{"id":"123698","messageId":"1253740570-10718-8-git-send-email-struberg@yahoo.de","threadId":"21040","inReplyTo":"1253740570-10718-7-git-send-email-struberg@yahoo.de","subject":"[JGIT PATCH 8/9] renamed the PathSuffixFilter test to JUnit conventions, so it gets executed via maven test.","fromName":"Mark Struberg","fromEmail":"struberg@yahoo.de","sentAt":"2009-09-23T21:16:09Z","receivedAt":"2009-09-23T21:16:09Z","isPatch":true,"sender":{"key":"struberg@yahoo.de","avatar":"https://gravatar.com/avatar/119742c3e8dbc8db35a92bdff0581aec8d364d415f770e60431cba262daa974f?d=mp&s=160"},"body":"Signed-off-by: Mark Struberg <struberg@yahoo.de>\n---\n ...lterTestCase.java => PathSuffixFilterTest.java} |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n rename org.spearce.jgit/src/test/java/org/spearce/jgit/treewalk/filter/{PathSuffixFilterTestCase.java => PathSuffixFilterTest.java} (98%)\n\ndiff --git a/org.spearce.jgit/src/test/java/org/spearce/jgit/treewalk/filter/PathSuffixFilterTestCase.java b/org.spearce.jgit/src/test/java/org/spearce/jgit/treewalk/filter/PathSuffixFilterTest.java\nsimilarity index 98%\nrename from org.spearce.jgit/src/test/java/org/spearce/jgit/treewalk/filter/PathSuffixFilterTestCase.java\nrename to org.spearce.jgit/src/test/java/org/spearce/jgit/treewalk/filter/PathSuffixFilterTest.java\nindex 56d9765..0043a7d 100644\n--- a/org.spearce.jgit/src/test/java/org/spearce/jgit/treewalk/filter/PathSuffixFilterTestCase.java\n+++ b/org.spearce.jgit/src/test/java/org/spearce/jgit/treewalk/filter/PathSuffixFilterTest.java\n@@ -50,7 +50,7 @@\n import org.spearce.jgit.lib.RepositoryTestCase;\n import org.spearce.jgit.treewalk.TreeWalk;\n \n-public class PathSuffixFilterTestCase extends RepositoryTestCase {\n+public class PathSuffixFilterTest extends RepositoryTestCase {\n \n \tpublic void testNonRecursiveFiltering() throws IOException {\n \t\tfinal ObjectWriter ow = new ObjectWriter(db);\n-- \n1.6.2.5\n"},{"id":"123697","messageId":"1253740570-10718-9-git-send-email-struberg@yahoo.de","threadId":"21040","inReplyTo":"1253740570-10718-8-git-send-email-struberg@yahoo.de","subject":"[JGIT PATCH 9/9] Add the <scm> section to the parent pom","fromName":"Mark Struberg","fromEmail":"struberg@yahoo.de","sentAt":"2009-09-23T21:16:10Z","receivedAt":"2009-09-23T21:16:10Z","isPatch":true,"sender":{"key":"struberg@yahoo.de","avatar":"https://gravatar.com/avatar/119742c3e8dbc8db35a92bdff0581aec8d364d415f770e60431cba262daa974f?d=mp&s=160"},"body":"\nSigned-off-by: Mark Struberg <struberg@yahoo.de>\n---\n pom.xml |    6 ++++++\n 1 files changed, 6 insertions(+), 0 deletions(-)\n\ndiff --git a/pom.xml b/pom.xml\nindex 821e92c..ec4857c 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -65,6 +65,12 @@\n \t   <system>google-issue</system>\n \t</issueManagement>\n \t\n+\t<scm>\n+\t\t<connection>scm:git:git://repo.or.cz/jgit</connection>\n+\t\t<developerConnection>scm:git:git://repo.or.cz/jgit</developerConnection>\n+\t\t<url>http://repo.or.cz/r/jgit.git</url>\n+\t</scm>\n+\t\n \t<developers>\n \t\t<developer>\n \t\t\t<name>Shawn O. Pearce</name>\n-- \n1.6.2.5\n"},{"id":"123716","messageId":"20734.77.61.241.211.1253773799.squirrel@hupie.xs4all.nl","threadId":"21040","inReplyTo":"1253740570-10718-7-git-send-email-struberg@yahoo.de","subject":"Re: [JGIT PATCH 7/9] removing eclipse project files","fromName":"Ferry Huberts","fromEmail":"ferry.huberts@pelagic.nl","sentAt":"2009-09-24T06:29:59Z","receivedAt":"2009-09-24T06:29:59Z","isPatch":true,"sender":{"key":"ferry.huberts@pelagic.nl","avatar":"https://gravatar.com/avatar/9f63c0289ad23cbdef0f7609a0af85ff0f4b3babfd066de9ff58f62d48cfd6f2?d=mp&s=160"},"body":"Mark Struberg wrote:\n> All information necessary to build jgit is already available in\n> the maven pom.xmls.\n>\n\njust out of curiosity, why would you remove the eclipse files?\nI for one - and I think many others - use Eclipse to work on the code...\n"},{"id":"123717","messageId":"314006.37617.qm@web27808.mail.ukl.yahoo.com","threadId":"21040","inReplyTo":"20734.77.61.241.211.1253773799.squirrel@hupie.xs4all.nl","subject":"Re: [JGIT PATCH 7/9] removing eclipse project files","fromName":"Mark Struberg","fromEmail":"struberg@yahoo.de","sentAt":"2009-09-24T06:55:16Z","receivedAt":"2009-09-24T06:55:16Z","isPatch":true,"sender":{"key":"struberg@yahoo.de","avatar":"https://gravatar.com/avatar/119742c3e8dbc8db35a92bdff0581aec8d364d415f770e60431cba262daa974f?d=mp&s=160"},"body":"Hi Ferry!\n\nI 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\n\n* different versions of eclipse create different project settings\n* different JVM settings\n* changing profiler settings\n* using different version of various plugins\netc, etc\n\nAnd with maven in place we don't need to have them in our SCM anymore. Plus: it works for a lot of IDEs\n\nYou can easily create the project files for a few IDEs with maven e.g.:\n$> mvn eclipse:eclipse   for creating the eclipse project files\n$> mvn idea:idea         for creating the idea project files\n\nAdditionally, plugins are available for Eclipse [1], Intellij Idea (native, builtin) and NetBeans (native, builtin).\n\nSo most of the time it is enough to simply import the parent pom.xml and you get all things setup properly in your IDE.\n\nOr is there anything missing?\n\nLieGrue,\nstrub\n\n[1] http://m2eclipse.sonatype.org\n\n\n\n--- On Thu, 9/24/09, Ferry Huberts <ferry.huberts@pelagic.nl> wrote:\n\n> From: Ferry Huberts <ferry.huberts@pelagic.nl>\n> Subject: Re: [JGIT PATCH 7/9] removing eclipse project files\n> To: \"Mark Struberg\" <struberg@yahoo.de>\n> Cc: git@vger.kernel.org, spearce@spearce.org\n> Date: Thursday, September 24, 2009, 8:29 AM\n> Mark Struberg wrote:\n> > All information necessary to build jgit is already\n> available in\n> > the maven pom.xmls.\n> >\n> \n> just out of curiosity, why would you remove the eclipse\n> files?\n> I for one - and I think many others - use Eclipse to work\n> on the code...\n> \n\n\n      \n"},{"id":"123721","messageId":"34819.77.61.241.211.1253779041.squirrel@hupie.xs4all.nl","threadId":"21040","inReplyTo":"314006.37617.qm@web27808.mail.ukl.yahoo.com","subject":"Re: [JGIT PATCH 7/9] removing eclipse project files","fromName":"Ferry Huberts","fromEmail":"ferry.huberts@pelagic.nl","sentAt":"2009-09-24T07:57:21Z","receivedAt":"2009-09-24T07:57:21Z","isPatch":true,"sender":{"key":"ferry.huberts@pelagic.nl","avatar":"https://gravatar.com/avatar/9f63c0289ad23cbdef0f7609a0af85ff0f4b3babfd066de9ff58f62d48cfd6f2?d=mp&s=160"},"body":"\n> I work on a lot of projects and having eclipse (or any other IDEs) project files in the SCM is\n> almost ever causing a problem. In praxis those files are always dirty. There are so many settings\n> which may be different from user to user\n\ntrue. however, those problems can easily be avoided by the\npolicy of not ever checking in those eclipse files unless\ncoordinated within the project.\n\nwe have many big java projects here internally and _do_ have\nthe eclipse settings in git. it makes life so much easier for\neveryone to start work and we have many more settings in\nthere that we actually want enforced.\n\nfor example: we enforce a coding standard through eclipse\nby automatically formatting the source code and organising\nimports on file save. also, we want everybody to use the same\nsettings when cleaning up the code. we want them to use the\nsame findbugs settings, the same settings for xxx/yyy/....\n\n> * different JVM settings\n\nif specified correctly this is actually an advantage: you can\nstandardise your projects on a (minimum) JVM platform, like 1.5\n\n> * using different version of various plugins\n\nwe see that as an advantage so that we can standardise the\ndevelopment setup, or at least define some sort of minimum\nsetup\n\n\n> You can easily create the project files for a few IDEs with maven e.g.:\n> $> mvn eclipse:eclipse   for creating the eclipse project files\n> $> mvn idea:idea         for creating the idea project files\n\nI know, quite handy :-)\n\nThink I have more questions now than before by discussing it :-)\n"},{"id":"123722","messageId":"430881.64091.qm@web27803.mail.ukl.yahoo.com","threadId":"21040","inReplyTo":"34819.77.61.241.211.1253779041.squirrel@hupie.xs4all.nl","subject":"Re: [JGIT PATCH 7/9] removing eclipse project files","fromName":"Mark Struberg","fromEmail":"struberg@yahoo.de","sentAt":"2009-09-24T08:24:37Z","receivedAt":"2009-09-24T08:24:37Z","isPatch":true,"sender":{"key":"struberg@yahoo.de","avatar":"https://gravatar.com/avatar/119742c3e8dbc8db35a92bdff0581aec8d364d415f770e60431cba262daa974f?d=mp&s=160"},"body":"Hi again and txs 4 your comments!\n\nThere are a few problems with dirty files:\n\na) 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.\n\nb) therefore the maven-release-plugin will refuse to build a release if you have something dirty or not up2date.\n\nc) 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\n\nd) 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.\n\ne) having all the rules in the underlying build system will allow us to easily enable continuous integration tools like e.g. Hudson.\n\n\nad 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\nSo I have to tell eclipse what exact JVM to use. \nPlease note that the jdk1.5++ rule is already forced in the pom.xml maven-compiler-plugin settings. \n\nad 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.\n\n\nLieGrue,\nstrub\n\n--- On Thu, 9/24/09, Ferry Huberts <ferry.huberts@pelagic.nl> wrote:\n\n> From: Ferry Huberts <ferry.huberts@pelagic.nl>\n> Subject: Re: [JGIT PATCH 7/9] removing eclipse project files\n> To: \"Mark Struberg\" <struberg@yahoo.de>\n> Cc: \"Ferry Huberts\" <ferry.huberts@pelagic.nl>, git@vger.kernel.org, spearce@spearce.org\n> Date: Thursday, September 24, 2009, 9:57 AM\n> \n> > I work on a lot of projects and having eclipse (or any\n> other IDEs) project files in the SCM is\n> > almost ever causing a problem. In praxis those files\n> are always dirty. There are so many settings\n> > which may be different from user to user\n> \n> true. however, those problems can easily be avoided by the\n> policy of not ever checking in those eclipse files unless\n> coordinated within the project.\n> \n> we have many big java projects here internally and _do_\n> have\n> the eclipse settings in git. it makes life so much easier\n> for\n> everyone to start work and we have many more settings in\n> there that we actually want enforced.\n> \n> for example: we enforce a coding standard through eclipse\n> by automatically formatting the source code and organising\n> imports on file save. also, we want everybody to use the\n> same\n> settings when cleaning up the code. we want them to use\n> the\n> same findbugs settings, the same settings for xxx/yyy/....\n> \n> > * different JVM settings\n> \n> if specified correctly this is actually an advantage: you\n> can\n> standardise your projects on a (minimum) JVM platform, like\n> 1.5\n> \n> > * using different version of various plugins\n> \n> we see that as an advantage so that we can standardise the\n> development setup, or at least define some sort of minimum\n> setup\n> \n> \n> > You can easily create the project files for a few IDEs\n> with maven e.g.:\n> > $> mvn eclipse:eclipse   for\n> creating the eclipse project files\n> > $> mvn idea:idea     \n>    for creating the idea project files\n> \n> I know, quite handy :-)\n> \n> Think I have more questions now than before by discussing\n> it :-)\n> \n> \n\n\n      \n"},{"id":"123723","messageId":"44506.77.61.241.211.1253782661.squirrel@hupie.xs4all.nl","threadId":"21040","inReplyTo":"430881.64091.qm@web27803.mail.ukl.yahoo.com","subject":"Re: [JGIT PATCH 7/9] removing eclipse project files","fromName":"Ferry Huberts","fromEmail":"ferry.huberts@pelagic.nl","sentAt":"2009-09-24T08:57:41Z","receivedAt":"2009-09-24T08:57:41Z","isPatch":true,"sender":{"key":"ferry.huberts@pelagic.nl","avatar":"https://gravatar.com/avatar/9f63c0289ad23cbdef0f7609a0af85ff0f4b3babfd066de9ff58f62d48cfd6f2?d=mp&s=160"},"body":"\n\nOn Thu, September 24, 2009 10:24, Mark Struberg wrote:\n> Hi again and txs 4 your comments!\n\nok. thanks. much enlightening :-)\n"},{"id":"123724","messageId":"44545.77.61.241.211.1253782663.squirrel@hupie.xs4all.nl","threadId":"21040","inReplyTo":"430881.64091.qm@web27803.mail.ukl.yahoo.com","subject":"Re: [JGIT PATCH 7/9] removing eclipse project files","fromName":"Ferry Huberts","fromEmail":"ferry.huberts@pelagic.nl","sentAt":"2009-09-24T08:57:43Z","receivedAt":"2009-09-24T08:57:43Z","isPatch":true,"sender":{"key":"ferry.huberts@pelagic.nl","avatar":"https://gravatar.com/avatar/9f63c0289ad23cbdef0f7609a0af85ff0f4b3babfd066de9ff58f62d48cfd6f2?d=mp&s=160"},"body":"\n\nOn Thu, September 24, 2009 10:24, Mark Struberg wrote:\n> Hi again and txs 4 your comments!\n\nok. thanks. much enlightening :-)\n"},{"id":"123728","messageId":"C89280B882467443A695734861B942B296767534@DEWDFECCR09.wdf.sap.corp","threadId":"21040","inReplyTo":"1253740570-10718-7-git-send-email-struberg@yahoo.de","subject":"RE: [JGIT PATCH 7/9] removing eclipse project files","fromName":"Sohn, Matthias","fromEmail":"matthias.sohn@sap.com","sentAt":"2009-09-24T11:24:01Z","receivedAt":"2009-09-24T11:24:01Z","isPatch":true,"sender":{"key":"matthias.sohn@sap.com","avatar":"https://gravatar.com/avatar/88bbb2733bcb977ec2d2cc1916ba8a70d6d41432c146bb8dab4f7f802261194e?d=mp&s=160"},"body":"Can Maven control compiler settings on the same level as we do currently with \n.settings/org.eclipse.jdt.core.prefs ?\n"},{"id":"123731","messageId":"212350.78171.qm@web27802.mail.ukl.yahoo.com","threadId":"21040","inReplyTo":"C89280B882467443A695734861B942B296767534@DEWDFECCR09.wdf.sap.corp","subject":"RE: [JGIT PATCH 7/9] removing eclipse project files","fromName":"Mark Struberg","fromEmail":"struberg@yahoo.de","sentAt":"2009-09-24T11:50:11Z","receivedAt":"2009-09-24T11:50:11Z","isPatch":true,"sender":{"key":"struberg@yahoo.de","avatar":"https://gravatar.com/avatar/119742c3e8dbc8db35a92bdff0581aec8d364d415f770e60431cba262daa974f?d=mp&s=160"},"body":"Hi Matthias!\n\nthe answer is a clear yes and no  - a 'jein' for german speaking people like you ;)\n\nyes: 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. \n\nPlease note that the settings in org.eclipse.jdt.core.prefs never had (and must not have) any impact on the created jar!\n\nand 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.\n\nLieGrue,\nstrub\n\n--- On Thu, 9/24/09, Sohn, Matthias <matthias.sohn@sap.com> wrote:\n\n> From: Sohn, Matthias <matthias.sohn@sap.com>\n> Subject: RE: [JGIT PATCH 7/9] removing eclipse project files\n> To: \"Mark Struberg\" <struberg@yahoo.de>\n> Cc: \"git@vger.kernel.org\" <git@vger.kernel.org>, \"spearce@spearce.org\" <spearce@spearce.org>\n> Date: Thursday, September 24, 2009, 1:24 PM\n> Can Maven control compiler settings\n> on the same level as we do currently with \n> .settings/org.eclipse.jdt.core.prefs ?\n> \n\n\n      \n"},{"id":"123772","messageId":"ed88cb980909250625g7ae4685dh96aae6174c8d90d1@mail.gmail.com","threadId":"21040","inReplyTo":"212350.78171.qm@web27802.mail.ukl.yahoo.com","subject":"Re: [JGIT PATCH 7/9] removing eclipse project files","fromName":"Douglas Campos","fromEmail":"douglas@theros.info","sentAt":"2009-09-25T13:25:24Z","receivedAt":"2009-09-25T13:25:24Z","isPatch":true,"sender":{"key":"douglas@theros.info","avatar":"https://gravatar.com/avatar/bca8e0e43e860dab00ec17dd3f1b60df6af911655fae70a0bbdeebeb889de421?d=mp&s=160"},"body":"Forwarding to list, as I always forgot to add all recipients (my bad :( )\n\n> 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.\n\nThe problem lies here. JGit, AFAIK, has very _strict_ rules, this is\nthe corner case that makes sense to enforce via IDE. It spares time\nfrom everyone here.\n\nI like the maven-generated eclipse projects, but I think that we need\nthe same level of service provided by the eclipse settings.\n\nIMHO, as always.\n\n-- \nDouglas Campos (qmx)\n+55 11 7626 5959\n"},{"id":"123805","messageId":"200909252317.02296.robin.rosenberg.lists@dewire.com","threadId":"21040","inReplyTo":"212350.78171.qm@web27802.mail.ukl.yahoo.com","subject":"Re: [JGIT PATCH 7/9] removing eclipse project files","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2009-09-25T21:17:01Z","receivedAt":"2009-09-25T21:17:01Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"torsdag 24 september 2009 13:50:11 skrev Mark Struberg <struberg@yahoo.de>:\n> Hi Matthias!\n> \n> the answer is a clear yes and no  - a 'jein' for german speaking people like you ;)\n> \n> 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. \n>\n> Please note that the settings in org.eclipse.jdt.core.prefs never had (and must not have) any impact on the created jar!\n\nNot 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.\n\n> 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.\n\nThat 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\nsettings 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. \n\nWe 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).\n\nThe .launch files is another story since they change format all the time.\n\n-- robin\n"},{"id":"123809","messageId":"200909252333.56756.robin.rosenberg.lists@dewire.com","threadId":"21040","inReplyTo":"1253740570-10718-1-git-send-email-struberg@yahoo.de","subject":"Re: [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de>","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2009-09-25T21:33:56Z","receivedAt":"2009-09-25T21:33:56Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"\nWhere are the 0/9 and 2/9 mails?\n\n-- robin\n"},{"id":"123812","messageId":"200909252340.07363.robin.rosenberg.lists@dewire.com","threadId":"21040","inReplyTo":"314006.37617.qm@web27808.mail.ukl.yahoo.com","subject":"Re: [JGIT PATCH 7/9] removing eclipse project files","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2009-09-25T21:40:07Z","receivedAt":"2009-09-25T21:40:07Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"torsdag 24 september 2009 08:55:16 skrev Mark Struberg <struberg@yahoo.de>:\n> Hi Ferry!\n> \n> 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\n> \n> * different versions of eclipse create different project settings\n> * different JVM settings\n> * changing profiler settings\n> * using different version of various plugins\n> etc, etc\n> \n> And with maven in place we don't need to have them in our SCM anymore. Plus: it works for a lot of IDEs\n> \n> You can easily create the project files for a few IDEs with maven e.g.:\n> $> mvn eclipse:eclipse   for creating the eclipse project files\n> $> mvn idea:idea         for creating the idea project files\n> \n> Additionally, plugins are available for Eclipse [1], Intellij Idea (native, builtin) and NetBeans (native, builtin).\n> \n> 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.\n\nI want compiler warnings/error and formatting settings to be enforced. Until recently we had roughly zero problems with non-confirming submissions\n\nIs there some means for this, even if that would mean having access to only\na subset of possible settings. Maybe using checkstyle would do it for the\nstyle checks. Not sure how we'd control formatting.\n\n-- robin\n"},{"id":"123860","messageId":"901099.90084.qm@web27801.mail.ukl.yahoo.com","threadId":"21040","inReplyTo":"200909252333.56756.robin.rosenberg.lists@dewire.com","subject":"Re: [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de>","fromName":"Mark Struberg","fromEmail":"struberg@yahoo.de","sentAt":"2009-09-26T19:50:27Z","receivedAt":"2009-09-26T19:50:27Z","isPatch":true,"sender":{"key":"struberg@yahoo.de","avatar":"https://gravatar.com/avatar/119742c3e8dbc8db35a92bdff0581aec8d364d415f770e60431cba262daa974f?d=mp&s=160"},"body":"Hi Robin!\n\na) Actually git-format-patch only created 0001-0009 so there is no 0/9.\n\nb) 2/9 is the actual directory structure moving. I received it, but since it is pretty large (330k already with -M -l0) it might got filtered out?\nIf so then may I ask you to please fetch it from http://github.com/sonatype/JGit branch 'mavenize'? It has the same content I sent to the list.\n\ntxs and LieGrue,\nstrub\n\n--- On Fri, 9/25/09, Robin Rosenberg <robin.rosenberg.lists@dewire.com> wrote:\n\n> From: Robin Rosenberg <robin.rosenberg.lists@dewire.com>\n> Subject: Re: [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de>\n> To: \"Mark Struberg\" <struberg@yahoo.de>\n> Cc: git@vger.kernel.org, spearce@spearce.org, \"Jason van Zyl\" <jvanzyl@sonatype.com>\n> Date: Friday, September 25, 2009, 11:33 PM\n> \n> Where are the 0/9 and 2/9 mails?\n> \n> -- robin\n> \n> \n> \n\n\n      \n"},{"id":"123864","messageId":"892492.1652.qm@web27801.mail.ukl.yahoo.com","threadId":"21040","inReplyTo":"200909252317.02296.robin.rosenberg.lists@dewire.com","subject":"Re: [JGIT PATCH 7/9] removing eclipse project files","fromName":"Mark Struberg","fromEmail":"struberg@yahoo.de","sentAt":"2009-09-26T20:10:16Z","receivedAt":"2009-09-26T20:10:16Z","isPatch":true,"sender":{"key":"struberg@yahoo.de","avatar":"https://gravatar.com/avatar/119742c3e8dbc8db35a92bdff0581aec8d364d415f770e60431cba262daa974f?d=mp&s=160"},"body":"Hi Robin!\n\nThanks for your comments, answers inside.\n\nPlease note that all my comments are for JGit only and not for the Egit Eclipse plugin! This should be discussed separately.\n\nLieGrue,\nstrub\n\n--- On Fri, 9/25/09, Robin Rosenberg <robin.rosenberg.lists@dewire.com> wrote:\n\n> From: Robin Rosenberg <robin.rosenberg.lists@dewire.com>\n> Subject: Re: [JGIT PATCH 7/9] removing eclipse project files\n> To: \"Mark Struberg\" <struberg@yahoo.de>\n> Cc: \"MatthiasSohn\" <matthias.sohn@sap.com>, \"git@vger.kernel.org\" <git@vger.kernel.org>, \"spearce@spearce.org\" <spearce@spearce.org>\n> Date: Friday, September 25, 2009, 11:17 PM\n> torsdag 24 september 2009 13:50:11\n> skrev Mark Struberg <struberg@yahoo.de>:\n> > Hi Matthias!\n> > \n> > the answer is a clear yes and no  - a 'jein' for\n> german speaking people like you ;)\n> > \n> > yes: we have the same settings for the compiler as\n> used before: jdk 1.5 for source and target. This is exactly\n> what has been taken in the ant build which was used prior to\n> maven. \n> >\n> > Please note that the settings in\n> org.eclipse.jdt.core.prefs never had (and must not have) any\n> impact on the created jar!\n> \n> Not sure what ant files you are referring to here and which\n> jars. The plugins downloadable from jgit.org has been built\n> using PDE build. so some of the .settings should affect the\n> compiler and thus the generated jars.\n\n\nApologise, 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.\n\n> \n> > and no: currently the very file you mentioned contains\n> a lot more stuff. In fact most of this are only editor\n> settings, preferred formattings etc which has nothing to do\n> with the build per se. Eclipse has the ability to\n> import/export all those settings in a XML file which is\n> version independent. We should go this way and also supply\n> similar setting-files for Idea and NetBeans. But forcing\n> those settings via an internal Eclipse plugin config file is\n> imho bad practice.\n> \n> That way is awkward and people to import the settings and\n> screw them up in their workspaces. I've made the projects\n> I'm involved use .settings and make different settings\n> mostly a non-issue because everyone gets new\n> settings automatically as they change. \n\nWe should integrate the checkstyle plugin into our pom. This should give you almost the same functionality.\n\n> Prior to eclipse 3.3\n> sharing settings was a big problem, but It's not a big deal\n> nowadays. The most annoying thing is that some settings are\n> not available as project specific settings. \n\nAs 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!)).\n\n> \n> We use 3.3 (well I think the last user dropped it\n> recently), 3.4 and 3.5. I often have to fix up new projects\n> but that is typically a one-time per eclipse project\n> problem. (typically the JRE gets bound to a specific install\n> location).\n> \n> The .launch files is another story since they change format\n> all the time.\n\nAnd the profiler settings, and and and. It's sad, but the list is long :(\n\nWe 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.\n\ntxs, \nstrub\n\n\n\n\n      \n"},{"id":"123908","messageId":"200909272152.33224.robin.rosenberg.lists@dewire.com","threadId":"21040","inReplyTo":"892492.1652.qm@web27801.mail.ukl.yahoo.com","subject":"Re: [JGIT PATCH 7/9] removing eclipse project files","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2009-09-27T19:52:32Z","receivedAt":"2009-09-27T19:52:32Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"lördag 26 september 2009 22:10:16 skrev Mark Struberg <struberg@yahoo.de>:\n> \n> 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.\n\nThose are workspace settings in the 3.4, not checked 3.,5 yet. You could add\nit to bugzilla as a feature request. All settings should be available as project settings I think.\n\n> 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 \n\nFor 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\nenough to tell what neatbeans does here.\n\n> 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!)).\n\nI'm not sure keeping netbeans settings would be a problem, but that is\nabout how much we could do\n\n> \n> > \n> > We use 3.3 (well I think the last user dropped it\n> > recently), 3.4 and 3.5. I often have to fix up new projects\n> > but that is typically a one-time per eclipse project\n> > problem. (typically the JRE gets bound to a specific install\n> > location).\n> > \n> > The .launch files is another story since they change format\n> > all the time.\n> \n> And the profiler settings, and and and. It's sad, but the list is long :(\n\nYep...\n\n> 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.\n\nI definitely think we should keep them until we find an alternate solution. The\nprojects settings are way too useful to be thrown out.\n\n-- robin\n"},{"id":"123912","messageId":"2c6b72b30909271921y4b191f1fo42b1ffb5f08d3468@mail.gmail.com","threadId":"21040","inReplyTo":"200909272152.33224.robin.rosenberg.lists@dewire.com","subject":"Re: [JGIT PATCH 7/9] removing eclipse project files","fromName":"Jonas Fonseca","fromEmail":"jonas.fonseca@gmail.com","sentAt":"2009-09-28T02:21:36Z","receivedAt":"2009-09-28T02:21:36Z","isPatch":true,"sender":{"key":"jonas.fonseca@gmail.com","avatar":"https://gravatar.com/avatar/9b7fa23cce50269e5d164312b6ac5ae818a180f837b38f28f3bdf689dd7f96cd?d=mp&s=160"},"body":"On Sun, Sep 27, 2009 at 15:52, Robin Rosenberg\n<robin.rosenberg.lists@dewire.com> wrote:\n> lördag 26 september 2009 22:10:16 skrev Mark Struberg <struberg@yahoo.de>:\n>> 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\n>\n> 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\n> enough to tell what neatbeans does here.\n\nIt is my impression that NetBeans has far better integration with\nmaven. In terms of code formatting NetBeans supports\nexporting/importing project specific settings, but I have never\npersonally used that.\n\n-- \nJonas Fonseca\n"},{"id":"123916","messageId":"200909280834.45360.robin.rosenberg.lists@dewire.com","threadId":"21040","inReplyTo":"2c6b72b30909271921y4b191f1fo42b1ffb5f08d3468@mail.gmail.com","subject":"Re: [JGIT PATCH 7/9] removing eclipse project files","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2009-09-28T06:34:44Z","receivedAt":"2009-09-28T06:34:44Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"måndag 28 september 2009 04:21:36 skrev Jonas Fonseca <jonas.fonseca@gmail.com>:\n> On Sun, Sep 27, 2009 at 15:52, Robin Rosenberg\n> <robin.rosenberg.lists@dewire.com> wrote:\n> > lördag 26 september 2009 22:10:16 skrev Mark Struberg <struberg@yahoo.de>:\n> >> 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\n> >\n> > 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\n> > enough to tell what neatbeans does here.\n> \n> It is my impression that NetBeans has far better integration with\n> maven. In terms of code formatting NetBeans supports\n> exporting/importing project specific settings, but I have never\n> personally used that.\n\nI was thinking of (project) settings for controlling warnings/errors and formatting.\n\n-- robin\n"},{"id":"123917","messageId":"200909280842.29389.robin.rosenberg.lists@dewire.com","threadId":"21040","inReplyTo":"200909280834.45360.robin.rosenberg.lists@dewire.com","subject":"Re: [JGIT PATCH 7/9] removing eclipse project files","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2009-09-28T06:42:29Z","receivedAt":"2009-09-28T06:42:29Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"Oh, dear. I should not reply to e-mail this time of the day....\n"},{"id":"123946","messageId":"2c6b72b30909280546l62a6ef9cm21112ca071cdef4c@mail.gmail.com","threadId":"21040","inReplyTo":"901099.90084.qm@web27801.mail.ukl.yahoo.com","subject":"Re: [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de>","fromName":"Jonas Fonseca","fromEmail":"jonas.fonseca@gmail.com","sentAt":"2009-09-28T12:46:36Z","receivedAt":"2009-09-28T12:46:36Z","isPatch":true,"sender":{"key":"jonas.fonseca@gmail.com","avatar":"https://gravatar.com/avatar/9b7fa23cce50269e5d164312b6ac5ae818a180f837b38f28f3bdf689dd7f96cd?d=mp&s=160"},"body":"On Sat, Sep 26, 2009 at 15:50, Mark Struberg <struberg@yahoo.de> wrote:\n> Hi Robin!\n>\n> a) Actually git-format-patch only created 0001-0009 so there is no 0/9.\n\nFor larger patch series, it is good practice (at least on git@vger) to\nprovide a \"cover letter\" (see git-format-patch --cover-letter) to give\nreviewers of the patch series an idea of what code is touched and for\nyou to give additional information, such as the state of the patch\nseries.\n\n> b) 2/9 is the actual directory structure moving. I received it, but since it is pretty large (330k already with -M -l0) it might got filtered out?\n> If so then may I ask you to please fetch it from http://github.com/sonatype/JGit branch 'mavenize'? It has the same content I sent to the list.\n\nSome general notes on the patch series. First, I am glad you posted it\nto have something to discuss and as I have stated in a private mail I\nam glad you are doing this. However, I also think it needs a lot more\npolish before being integrated.\n\nWhile I understand that you want to credit Jason for doing the initial\nprobe into fully mavenizing JGit, I now think it is wrong to base the\npatch series on his patch. My first impression is that it actually\nremoves features (by not keeping the JGit specific settings), which\nyou then try to amend later in the patch series.\n\nIn terms of making the patch series more manageable for you, I think\nthe best approach is to start with the patches not relevant to the\nmavenizing (renaming PathSuffixTestCase). After this comes patches\nwhich only touch pom.xml files. For example, move\njgit-maven/jgit/pom.xml to the top-level pom.xml, extract relevant\npieces to org.spearce.jgit/pom.xml and org.spearce.jgit.test/pom.xml,\nimproving the pom.xml`s by adding checkstyle/<scm> integration, and\nmavenizing org.spearce.jgit.pgm/. The final and most invasive parts\n(renaming/(re)moving code/eclipse files etc) should come last!\n\nTaking this approach Robin and Spearce can start integrating initial\npatces and we can all start testing the \"mavenization\" sooner rather\nthan after deciding how to rename things and whether or not to remove\ncertain files.\n\nThe above is a proposal and if you and other agree that it is the\nright approach _and_ you do not feel you have the time necessary to\nrealize it, I am willing to work on it.\n\n-- \nJonas Fonseca\n"},{"id":"124041","messageId":"287437.36328.qm@web27806.mail.ukl.yahoo.com","threadId":"21040","inReplyTo":"2c6b72b30909280546l62a6ef9cm21112ca071cdef4c@mail.gmail.com","subject":"Re: [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de>","fromName":"Mark Struberg","fromEmail":"struberg@yahoo.de","sentAt":"2009-09-30T19:51:02Z","receivedAt":"2009-09-30T19:51:02Z","isPatch":true,"sender":{"key":"struberg@yahoo.de","avatar":"https://gravatar.com/avatar/119742c3e8dbc8db35a92bdff0581aec8d364d415f770e60431cba262daa974f?d=mp&s=160"},"body":"Hi Jonas!\n\nanswers inside\n\nLieGrue,\nstrub\n\n--- On Mon, 9/28/09, Jonas Fonseca <jonas.fonseca@gmail.com> wrote:\n\n> From: Jonas Fonseca <jonas.fonseca@gmail.com>\n> Subject: Re: [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms  from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de>\n> To: \"Mark Struberg\" <struberg@yahoo.de>\n> Cc: \"Robin Rosenberg\" <robin.rosenberg.lists@dewire.com>, git@vger.kernel.org, spearce@spearce.org, \"Jason van Zyl\" <jvanzyl@sonatype.com>\n> Date: Monday, September 28, 2009, 2:46 PM\n> On Sat, Sep 26, 2009 at 15:50, Mark\n> Struberg <struberg@yahoo.de>\n> wrote:\n> > Hi Robin!\n> >\n> > a) Actually git-format-patch only created 0001-0009 so\n> there is no 0/9.\n> \n> For larger patch series, it is good practice (at least on\n> git@vger) to\n> provide a \"cover letter\" (see git-format-patch\n> --cover-letter) to give\n> reviewers of the patch series an idea of what code is\n> touched and for\n> you to give additional information, such as the state of\n> the patch\n> series.\n\ntxs 4 pointing this out.\n\n> \n> > b) 2/9 is the actual directory structure moving. I\n> received it, but since it is pretty large (330k already with\n> -M -l0) it might got filtered out?\n> > If so then may I ask you to please fetch it from http://github.com/sonatype/JGit branch 'mavenize'? It\n> has the same content I sent to the list.\n> \n> Some general notes on the patch series. First, I am glad\n> you posted it\n> to have something to discuss and as I have stated in a\n> private mail I\n> am glad you are doing this. However, I also think it needs\n> a lot more\n> polish before being integrated.\n> \n> While I understand that you want to credit Jason for doing\n> the initial\n> probe into fully mavenizing JGit, I now think it is wrong\n> to base the\n> patch series on his patch. My first impression is that it\n> actually\n> removes features (by not keeping the JGit specific\n> settings), which\n> you then try to amend later in the patch series.\n\nI'm not sure what JGit specific settings you speak about?\n\n\n> In terms of making the patch series more manageable for\n> you, I think\n> the best approach is to start with the patches not relevant\n> to the\n> mavenizing (renaming PathSuffixTestCase). \n\nIn fact the fix of the PathSuffixTestCase came a few days later after I found the reason why I miss a few tests. This should be fixed in the current master anyway and has not so much todo with the mavenization itself.\n\n\n> After this comespatches\n> which only touch pom.xml files. For example, move\n> jgit-maven/jgit/pom.xml to the top-level pom.xml, extract\n> relevant\n> pieces to org.spearce.jgit/pom.xml and\n> org.spearce.jgit.test/pom.xml,\n> improving the pom.xml`s by adding checkstyle/<scm>\n> integration, and\n> mavenizing org.spearce.jgit.pgm/. The final and most\n> invasive parts\n> (renaming/(re)moving code/eclipse files etc) should come\n> last!\n\nI had the following in mind: every single commit should be compileable and working. So it's not easily manageable to move the directory structure in one patch and apply all the changes into the poms in another commit.\nWe could for sure squash the later few commits, but I didn't liked to rebase and push since there have been a few forks of the mavenize branch and I hoped I could pull back a few commits from others and later do a rebase -i.\n\n \n> Taking this approach Robin and Spearce can start\n> integrating initial\n> patces and we can all start testing the \"mavenization\"\n> sooner rather\n> than after deciding how to rename things and whether or not\n> to remove\n> certain files.\n> \n> The above is a proposal and if you and other agree that it\n> is the\n> right approach _and_ you do not feel you have the time\n> necessary to\n> realize it, I am willing to work on it.\n\nAny help is always welcome :)\n\n\n\n      \n"},{"id":"124049","messageId":"20090930211646.GM14660@spearce.org","threadId":"21040","inReplyTo":"287437.36328.qm@web27806.mail.ukl.yahoo.com","subject":"Re: [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de>","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-09-30T21:16:46Z","receivedAt":"2009-09-30T21:16:46Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Mark Struberg <struberg@yahoo.de> wrote:\n> > From: Jonas Fonseca <jonas.fonseca@gmail.com>\n> > actually\n> > removes features (by not keeping the JGit specific\n> > settings), which\n> > you then try to amend later in the patch series.\n> \n> I'm not sure what JGit specific settings you speak about?\n\nI think he's talking about the Eclipse settings files?  Or is it\nsomething else?\n \n> > In terms of making the patch series more manageable for\n> > you, I think\n> > the best approach is to start with the patches not relevant\n> > to the\n> > mavenizing (renaming PathSuffixTestCase). \n> \n> In fact the fix of the PathSuffixTestCase came a few days later\n> after I found the reason why I miss a few tests. This should be\n> fixed in the current master anyway and has not so much todo with\n> the mavenization itself.\n\nBut it should be earlier in the series because its easier to apply.\nUse rebase -i to swap the order of the patches.\n\n> I had the following in mind: every single commit should be\n>  compileable and working. So it's not easily manageable to move the\n> directory structure in one patch and apply all the changes into\n> the poms in another commit.\n\nWell, you need to edit the pom to change the source directory and do\nthe move in one commit, and then edit the pom further in another,\npossibly removing the source directory directories once it is the\nstandard maven layout.\n\n> We could for sure squash the later few commits, but I didn't\n> liked to rebase and push since there have been a few forks of the\n> mavenize branch and I hoped I could pull back a few commits from\n> others and later do a rebase -i.\n\nTrue.\n\nAt this point we need to rebase the patches on the new history in\nthe eclipse.org-post branch, which contains a massive rename of\norg.spearce to org.eclipse.  That may make the tree reorg patch in\nyour Maven series harder to bring over to the new history, sorry.\n\nWorse, we now have to start following the Eclipse IP process[1]\nfor submissions to JGit...\n\n[1] http://www.eclipse.org/projects/dev_process/ip-process-in-cartoons.php\n\n-- \nShawn.\n"},{"id":"124053","messageId":"949779.47404.qm@web27804.mail.ukl.yahoo.com","threadId":"21040","inReplyTo":"20090930211646.GM14660@spearce.org","subject":"Re: [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de>","fromName":"Mark Struberg","fromEmail":"struberg@yahoo.de","sentAt":"2009-09-30T23:13:10Z","receivedAt":"2009-09-30T23:13:10Z","isPatch":true,"sender":{"key":"struberg@yahoo.de","avatar":"https://gravatar.com/avatar/119742c3e8dbc8db35a92bdff0581aec8d364d415f770e60431cba262daa974f?d=mp&s=160"},"body":"Hi!\n\nI now squashed all my changes into 2 commits and omitted the eclipse parts. They are available at \n\nhttp://github.com/sonatype/JGit/commits/mavenize2\n\nAs Shawn pointed out on IRC, the next step would be to migrate this patch over to the eclipe.org-post branch which I will do tomorrow evening.\n\nLieGrue,\nstrub\n\n--- On Wed, 9/30/09, Shawn O. Pearce <spearce@spearce.org> wrote:\n\n> From: Shawn O. Pearce <spearce@spearce.org>\n> Subject: Re: [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms  from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo..de>\n> To: \"Mark Struberg\" <struberg@yahoo.de>\n> Cc: \"Jonas Fonseca\" <jonas.fonseca@gmail.com>, \"Robin Rosenberg\" <robin.rosenberg.lists@dewire.com>, git@vger.kernel.org, \"Jason van Zyl\" <jvanzyl@sonatype.com>\n> Date: Wednesday, September 30, 2009, 11:16 PM\n> Mark Struberg <struberg@yahoo.de>\n> wrote:\n> > > From: Jonas Fonseca <jonas.fonseca@gmail.com>\n> > > actually\n> > > removes features (by not keeping the JGit\n> specific\n> > > settings), which\n> > > you then try to amend later in the patch series.\n> > \n> > I'm not sure what JGit specific settings you speak\n> about?\n> \n> I think he's talking about the Eclipse settings\n> files?  Or is it\n> something else?\n>  \n> > > In terms of making the patch series more\n> manageable for\n> > > you, I think\n> > > the best approach is to start with the patches\n> not relevant\n> > > to the\n> > > mavenizing (renaming PathSuffixTestCase). \n> > \n> > In fact the fix of the PathSuffixTestCase came a few\n> days later\n> > after I found the reason why I miss a few tests. This\n> should be\n> > fixed in the current master anyway and has not so much\n> todo with\n> > the mavenization itself.\n> \n> But it should be earlier in the series because its easier\n> to apply.\n> Use rebase -i to swap the order of the patches.\n> \n> > I had the following in mind: every single commit\n> should be\n> >  compileable and working. So it's not easily\n> manageable to move the\n> > directory structure in one patch and apply all the\n> changes into\n> > the poms in another commit.\n> \n> Well, you need to edit the pom to change the source\n> directory and do\n> the move in one commit, and then edit the pom further in\n> another,\n> possibly removing the source directory directories once it\n> is the\n> standard maven layout.\n> \n> > We could for sure squash the later few commits, but I\n> didn't\n> > liked to rebase and push since there have been a few\n> forks of the\n> > mavenize branch and I hoped I could pull back a few\n> commits from\n> > others and later do a rebase -i.\n> \n> True.\n> \n> At this point we need to rebase the patches on the new\n> history in\n> the eclipse.org-post branch, which contains a massive\n> rename of\n> org.spearce to org.eclipse.  That may make the tree\n> reorg patch in\n> your Maven series harder to bring over to the new history,\n> sorry.\n> \n> Worse, we now have to start following the Eclipse IP\n> process[1]\n> for submissions to JGit...\n> \n> [1] http://www.eclipse.org/projects/dev_process/ip-process-in-cartoons.php\n> \n> -- \n> Shawn.\n> --\n> To unsubscribe from this list: send the line \"unsubscribe\n> git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n> \n\n\n      \n"},{"id":"124055","messageId":"7BE83B1E-200A-4E19-979D-7A53CE582468@sonatype.com","threadId":"21040","inReplyTo":"949779.47404.qm@web27804.mail.ukl.yahoo.com","subject":"Re: [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de>","fromName":"Jason van Zyl","fromEmail":"jason@sonatype.com","sentAt":"2009-09-30T23:16:01Z","receivedAt":"2009-09-30T23:16:01Z","isPatch":true,"sender":{"key":"jason@sonatype.com","avatar":null},"body":"\nOn 2009-09-30, at 4:13 PM, Mark Struberg wrote:\n\n> Hi!\n>\n> I now squashed all my changes into 2 commits and omitted the eclipse  \n> parts. They are available at\n>\n> http://github.com/sonatype/JGit/commits/mavenize2\n>\n> As Shawn pointed out on IRC, the next step would be to migrate this  \n> patch over to the eclipe.org-post branch which I will do tomorrow  \n> evening.\n>\n\nI also have a Tycho build for the EGIT part, and I have bundle  \ncreation working for the JGIT part. I've already integrated these two  \nbuilds into our product so it all works. I can put it somewhere as  \nyou're ready to absorb it if you want it.\n\n> LieGrue,\n> strub\n>\n> --- On Wed, 9/30/09, Shawn O. Pearce <spearce@spearce.org> wrote:\n>\n>> From: Shawn O. Pearce <spearce@spearce.org>\n>> Subject: Re: [JGIT PATCH 1/9] mavenizing step 1: moved over the  \n>> initial poms  from Jasons branch Signed-off-by: Mark Struberg  \n>> <struberg@yahoo..de>\n>> To: \"Mark Struberg\" <struberg@yahoo.de>\n>> Cc: \"Jonas Fonseca\" <jonas.fonseca@gmail.com>, \"Robin Rosenberg\" <robin.rosenberg.lists@dewire.com \n>> >, git@vger.kernel.org, \"Jason van Zyl\" <jvanzyl@sonatype.com>\n>> Date: Wednesday, September 30, 2009, 11:16 PM\n>> Mark Struberg <struberg@yahoo.de>\n>> wrote:\n>>>> From: Jonas Fonseca <jonas.fonseca@gmail.com>\n>>>> actually\n>>>> removes features (by not keeping the JGit\n>> specific\n>>>> settings), which\n>>>> you then try to amend later in the patch series.\n>>>\n>>> I'm not sure what JGit specific settings you speak\n>> about?\n>>\n>> I think he's talking about the Eclipse settings\n>> files?  Or is it\n>> something else?\n>>\n>>>> In terms of making the patch series more\n>> manageable for\n>>>> you, I think\n>>>> the best approach is to start with the patches\n>> not relevant\n>>>> to the\n>>>> mavenizing (renaming PathSuffixTestCase).\n>>>\n>>> In fact the fix of the PathSuffixTestCase came a few\n>> days later\n>>> after I found the reason why I miss a few tests. This\n>> should be\n>>> fixed in the current master anyway and has not so much\n>> todo with\n>>> the mavenization itself.\n>>\n>> But it should be earlier in the series because its easier\n>> to apply.\n>> Use rebase -i to swap the order of the patches.\n>>\n>>> I had the following in mind: every single commit\n>> should be\n>>>   compileable and working. So it's not easily\n>> manageable to move the\n>>> directory structure in one patch and apply all the\n>> changes into\n>>> the poms in another commit.\n>>\n>> Well, you need to edit the pom to change the source\n>> directory and do\n>> the move in one commit, and then edit the pom further in\n>> another,\n>> possibly removing the source directory directories once it\n>> is the\n>> standard maven layout.\n>>\n>>> We could for sure squash the later few commits, but I\n>> didn't\n>>> liked to rebase and push since there have been a few\n>> forks of the\n>>> mavenize branch and I hoped I could pull back a few\n>> commits from\n>>> others and later do a rebase -i.\n>>\n>> True.\n>>\n>> At this point we need to rebase the patches on the new\n>> history in\n>> the eclipse.org-post branch, which contains a massive\n>> rename of\n>> org.spearce to org.eclipse.  That may make the tree\n>> reorg patch in\n>> your Maven series harder to bring over to the new history,\n>> sorry.\n>>\n>> Worse, we now have to start following the Eclipse IP\n>> process[1]\n>> for submissions to JGit...\n>>\n>> [1] http://www.eclipse.org/projects/dev_process/ip-process-in-cartoons.php\n>>\n>> -- \n>> Shawn.\n>> --\n>> To unsubscribe from this list: send the line \"unsubscribe\n>> git\" in\n>> the body of a message to majordomo@vger.kernel.org\n>> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n>>\n>\n>\n>\n>\n\nThanks,\n\nJason\n\n----------------------------------------------------------\nJason van Zyl\nFounder,  Apache Maven\nhttp://twitter.com/jvanzyl\n----------------------------------------------------------\n"},{"id":"124061","messageId":"2c6b72b30909301833w1c30742dxd881047a9e0f898f@mail.gmail.com","threadId":"21040","inReplyTo":"20090930211646.GM14660@spearce.org","subject":"Re: [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de>","fromName":"Jonas Fonseca","fromEmail":"jonas.fonseca@gmail.com","sentAt":"2009-10-01T01:33:21Z","receivedAt":"2009-10-01T01:33:21Z","isPatch":true,"sender":{"key":"jonas.fonseca@gmail.com","avatar":"https://gravatar.com/avatar/9b7fa23cce50269e5d164312b6ac5ae818a180f837b38f28f3bdf689dd7f96cd?d=mp&s=160"},"body":"On Wed, Sep 30, 2009 at 17:16, Shawn O. Pearce <spearce@spearce.org> wrote:\n> Mark Struberg <struberg@yahoo.de> wrote:\n>> > From: Jonas Fonseca <jonas.fonseca@gmail.com>\n>> > actually\n>> > removes features (by not keeping the JGit specific\n>> > settings), which\n>> > you then try to amend later in the patch series.\n>>\n>> I'm not sure what JGit specific settings you speak about?\n>\n> I think he's talking about the Eclipse settings files?  Or is it\n> something else?\n\nSorry for the confusion, I meant the tweaks in the current pom.xml for\nmatching tests such as T000* ..\n\n-- \nJonas Fonseca\n"},{"id":"124062","messageId":"ed88cb980909301905u5e57f046kd7426e3090cf95c6@mail.gmail.com","threadId":"21040","inReplyTo":"20090930211646.GM14660@spearce.org","subject":"Re: [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de>","fromName":"Douglas Campos","fromEmail":"douglas@theros.info","sentAt":"2009-10-01T02:05:29Z","receivedAt":"2009-10-01T02:05:29Z","isPatch":true,"sender":{"key":"douglas@theros.info","avatar":"https://gravatar.com/avatar/bca8e0e43e860dab00ec17dd3f1b60df6af911655fae70a0bbdeebeb889de421?d=mp&s=160"},"body":"> Worse, we now have to start following the Eclipse IP process[1]\n> for submissions to JGit...\n>\n> [1] http://www.eclipse.org/projects/dev_process/ip-process-in-cartoons.php\n>\n\nHow we'll handle this? Are the acks/signoffs that we use with mail\npatches enough for this?\n\nPainful process, BTW\n\n-- \nDouglas Campos (qmx)\n+55 11 7626 5959\n"},{"id":"124074","messageId":"138076.57408.qm@web27806.mail.ukl.yahoo.com","threadId":"21040","inReplyTo":"7BE83B1E-200A-4E19-979D-7A53CE582468@sonatype.com","subject":"Re: [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de>","fromName":"Mark Struberg","fromEmail":"struberg@yahoo.de","sentAt":"2009-10-01T11:15:29Z","receivedAt":"2009-10-01T11:15:29Z","isPatch":true,"sender":{"key":"struberg@yahoo.de","avatar":"https://gravatar.com/avatar/119742c3e8dbc8db35a92bdff0581aec8d364d415f770e60431cba262daa974f?d=mp&s=160"},"body":"Can you please create an EGit repo on github.com/sonatype and push the JGit changes to a fresh branch in sonatype/JGit ?\n\ntxs,\nstrub\n\n--- On Thu, 10/1/09, Jason van Zyl <jason@sonatype.com> wrote:\n\n> From: Jason van Zyl <jason@sonatype.com>\n> Subject: Re: [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms  from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de>\n> To: \"Mark Struberg\" <struberg@yahoo.de>\n> Cc: \"Shawn O. Pearce\" <spearce@spearce.org>, \"Jonas Fonseca\" <jonas.fonseca@gmail.com>, \"Robin Rosenberg\" <robin.rosenberg.lists@dewire.com>, git@vger.kernel.org\n> Date: Thursday, October 1, 2009, 1:16 AM\n> \n> On 2009-09-30, at 4:13 PM, Mark Struberg wrote:\n> \n> > Hi!\n> > \n> > I now squashed all my changes into 2 commits and\n> omitted the eclipse parts. They are available at\n> > \n> > http://github.com/sonatype/JGit/commits/mavenize2\n> > \n> > As Shawn pointed out on IRC, the next step would be to\n> migrate this patch over to the eclipe.org-post branch which\n> I will do tomorrow evening.\n> > \n> \n> I also have a Tycho build for the EGIT part, and I have\n> bundle creation working for the JGIT part. I've already\n> integrated these two builds into our product so it all\n> works. I can put it somewhere as you're ready to absorb it\n> if you want it.\n> \n> > LieGrue,\n> > strub\n> > \n> > --- On Wed, 9/30/09, Shawn O. Pearce <spearce@spearce.org>\n> wrote:\n> > \n> >> From: Shawn O. Pearce <spearce@spearce.org>\n> >> Subject: Re: [JGIT PATCH 1/9] mavenizing step 1:\n> moved over the initial poms  from Jasons branch\n> Signed-off-by: Mark Struberg <struberg@yahoo..de>\n> >> To: \"Mark Struberg\" <struberg@yahoo.de>\n> >> Cc: \"Jonas Fonseca\" <jonas.fonseca@gmail.com>,\n> \"Robin Rosenberg\" <robin.rosenberg.lists@dewire.com>,\n> git@vger.kernel.org,\n> \"Jason van Zyl\" <jvanzyl@sonatype.com>\n> >> Date: Wednesday, September 30, 2009, 11:16 PM\n> >> Mark Struberg <struberg@yahoo.de>\n> >> wrote:\n> >>>> From: Jonas Fonseca <jonas.fonseca@gmail.com>\n> >>>> actually\n> >>>> removes features (by not keeping the JGit\n> >> specific\n> >>>> settings), which\n> >>>> you then try to amend later in the patch\n> series.\n> >>> \n> >>> I'm not sure what JGit specific settings you\n> speak\n> >> about?\n> >> \n> >> I think he's talking about the Eclipse settings\n> >> files?  Or is it\n> >> something else?\n> >> \n> >>>> In terms of making the patch series more\n> >> manageable for\n> >>>> you, I think\n> >>>> the best approach is to start with the\n> patches\n> >> not relevant\n> >>>> to the\n> >>>> mavenizing (renaming PathSuffixTestCase).\n> >>> \n> >>> In fact the fix of the PathSuffixTestCase came\n> a few\n> >> days later\n> >>> after I found the reason why I miss a few\n> tests. This\n> >> should be\n> >>> fixed in the current master anyway and has not\n> so much\n> >> todo with\n> >>> the mavenization itself.\n> >> \n> >> But it should be earlier in the series because its\n> easier\n> >> to apply.\n> >> Use rebase -i to swap the order of the patches.\n> >> \n> >>> I had the following in mind: every single\n> commit\n> >> should be\n> >>>   compileable and working. So\n> it's not easily\n> >> manageable to move the\n> >>> directory structure in one patch and apply all\n> the\n> >> changes into\n> >>> the poms in another commit.\n> >> \n> >> Well, you need to edit the pom to change the\n> source\n> >> directory and do\n> >> the move in one commit, and then edit the pom\n> further in\n> >> another,\n> >> possibly removing the source directory directories\n> once it\n> >> is the\n> >> standard maven layout.\n> >> \n> >>> We could for sure squash the later few\n> commits, but I\n> >> didn't\n> >>> liked to rebase and push since there have been\n> a few\n> >> forks of the\n> >>> mavenize branch and I hoped I could pull back\n> a few\n> >> commits from\n> >>> others and later do a rebase -i.\n> >> \n> >> True.\n> >> \n> >> At this point we need to rebase the patches on the\n> new\n> >> history in\n> >> the eclipse.org-post branch, which contains a\n> massive\n> >> rename of\n> >> org.spearce to org.eclipse.  That may make\n> the tree\n> >> reorg patch in\n> >> your Maven series harder to bring over to the new\n> history,\n> >> sorry.\n> >> \n> >> Worse, we now have to start following the Eclipse\n> IP\n> >> process[1]\n> >> for submissions to JGit...\n> >> \n> >> [1] http://www.eclipse.org/projects/dev_process/ip-process-in-cartoons.php\n> >> \n> >> --Shawn.\n> >> --\n> >> To unsubscribe from this list: send the line\n> \"unsubscribe\n> >> git\" in\n> >> the body of a message to majordomo@vger.kernel.org\n> >> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n> >> \n> > \n> > \n> > \n> > \n> \n> Thanks,\n> \n> Jason\n> \n> ----------------------------------------------------------\n> Jason van Zyl\n> Founder,  Apache Maven\n> http://twitter.com/jvanzyl\n> ----------------------------------------------------------\n> \n> --\n> To unsubscribe from this list: send the line \"unsubscribe\n> git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n> \n\n\n      \n"},{"id":"124081","messageId":"AA4C92B2-36CB-48A0-A373-AA4012AB2C05@sonatype.com","threadId":"21040","inReplyTo":"138076.57408.qm@web27806.mail.ukl.yahoo.com","subject":"Re: [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de>","fromName":"Jason van Zyl","fromEmail":"jason@sonatype.com","sentAt":"2009-10-01T13:55:16Z","receivedAt":"2009-10-01T13:55:16Z","isPatch":true,"sender":{"key":"jason@sonatype.com","avatar":null},"body":"Sorry, what do you want?\n\nA fork of the EGit repository with the EGit specific changes we have  \nmade to use Tycho to build EGit?\n\nOr do you want a fork of the JGit repo with the Maven build (i.e. not  \nTycho) changes?\n\nOn 2009-10-01, at 4:15 AM, Mark Struberg wrote:\n\n> Can you please create an EGit repo on github.com/sonatype and push  \n> the JGit changes to a fresh branch in sonatype/JGit ?\n>\n> txs,\n> strub\n>\n> --- On Thu, 10/1/09, Jason van Zyl <jason@sonatype.com> wrote:\n>\n>> From: Jason van Zyl <jason@sonatype.com>\n>> Subject: Re: [JGIT PATCH 1/9] mavenizing step 1: moved over the  \n>> initial poms  from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de \n>> >\n>> To: \"Mark Struberg\" <struberg@yahoo.de>\n>> Cc: \"Shawn O. Pearce\" <spearce@spearce.org>, \"Jonas Fonseca\" <jonas.fonseca@gmail.com \n>> >, \"Robin Rosenberg\" <robin.rosenberg.lists@dewire.com>, git@vger.kernel.org\n>> Date: Thursday, October 1, 2009, 1:16 AM\n>>\n>> On 2009-09-30, at 4:13 PM, Mark Struberg wrote:\n>>\n>>> Hi!\n>>>\n>>> I now squashed all my changes into 2 commits and\n>> omitted the eclipse parts. They are available at\n>>>\n>>> http://github.com/sonatype/JGit/commits/mavenize2\n>>>\n>>> As Shawn pointed out on IRC, the next step would be to\n>> migrate this patch over to the eclipe.org-post branch which\n>> I will do tomorrow evening.\n>>>\n>>\n>> I also have a Tycho build for the EGIT part, and I have\n>> bundle creation working for the JGIT part. I've already\n>> integrated these two builds into our product so it all\n>> works. I can put it somewhere as you're ready to absorb it\n>> if you want it.\n>>\n>>> LieGrue,\n>>> strub\n>>>\n>>> --- On Wed, 9/30/09, Shawn O. Pearce <spearce@spearce.org>\n>> wrote:\n>>>\n>>>> From: Shawn O. Pearce <spearce@spearce.org>\n>>>> Subject: Re: [JGIT PATCH 1/9] mavenizing step 1:\n>> moved over the initial poms  from Jasons branch\n>> Signed-off-by: Mark Struberg <struberg@yahoo..de>\n>>>> To: \"Mark Struberg\" <struberg@yahoo.de>\n>>>> Cc: \"Jonas Fonseca\" <jonas.fonseca@gmail.com>,\n>> \"Robin Rosenberg\" <robin.rosenberg.lists@dewire.com>,\n>> git@vger.kernel.org,\n>> \"Jason van Zyl\" <jvanzyl@sonatype.com>\n>>>> Date: Wednesday, September 30, 2009, 11:16 PM\n>>>> Mark Struberg <struberg@yahoo.de>\n>>>> wrote:\n>>>>>> From: Jonas Fonseca <jonas.fonseca@gmail.com>\n>>>>>> actually\n>>>>>> removes features (by not keeping the JGit\n>>>> specific\n>>>>>> settings), which\n>>>>>> you then try to amend later in the patch\n>> series.\n>>>>>\n>>>>> I'm not sure what JGit specific settings you\n>> speak\n>>>> about?\n>>>>\n>>>> I think he's talking about the Eclipse settings\n>>>> files?  Or is it\n>>>> something else?\n>>>>\n>>>>>> In terms of making the patch series more\n>>>> manageable for\n>>>>>> you, I think\n>>>>>> the best approach is to start with the\n>> patches\n>>>> not relevant\n>>>>>> to the\n>>>>>> mavenizing (renaming PathSuffixTestCase).\n>>>>>\n>>>>> In fact the fix of the PathSuffixTestCase came\n>> a few\n>>>> days later\n>>>>> after I found the reason why I miss a few\n>> tests. This\n>>>> should be\n>>>>> fixed in the current master anyway and has not\n>> so much\n>>>> todo with\n>>>>> the mavenization itself.\n>>>>\n>>>> But it should be earlier in the series because its\n>> easier\n>>>> to apply.\n>>>> Use rebase -i to swap the order of the patches.\n>>>>\n>>>>> I had the following in mind: every single\n>> commit\n>>>> should be\n>>>>>    compileable and working. So\n>> it's not easily\n>>>> manageable to move the\n>>>>> directory structure in one patch and apply all\n>> the\n>>>> changes into\n>>>>> the poms in another commit.\n>>>>\n>>>> Well, you need to edit the pom to change the\n>> source\n>>>> directory and do\n>>>> the move in one commit, and then edit the pom\n>> further in\n>>>> another,\n>>>> possibly removing the source directory directories\n>> once it\n>>>> is the\n>>>> standard maven layout.\n>>>>\n>>>>> We could for sure squash the later few\n>> commits, but I\n>>>> didn't\n>>>>> liked to rebase and push since there have been\n>> a few\n>>>> forks of the\n>>>>> mavenize branch and I hoped I could pull back\n>> a few\n>>>> commits from\n>>>>> others and later do a rebase -i.\n>>>>\n>>>> True.\n>>>>\n>>>> At this point we need to rebase the patches on the\n>> new\n>>>> history in\n>>>> the eclipse.org-post branch, which contains a\n>> massive\n>>>> rename of\n>>>> org.spearce to org.eclipse.  That may make\n>> the tree\n>>>> reorg patch in\n>>>> your Maven series harder to bring over to the new\n>> history,\n>>>> sorry.\n>>>>\n>>>> Worse, we now have to start following the Eclipse\n>> IP\n>>>> process[1]\n>>>> for submissions to JGit...\n>>>>\n>>>> [1] http://www.eclipse.org/projects/dev_process/ip-process-in-cartoons.php\n>>>>\n>>>> --Shawn.\n>>>> --\n>>>> To unsubscribe from this list: send the line\n>> \"unsubscribe\n>>>> git\" in\n>>>> the body of a message to majordomo@vger.kernel.org\n>>>> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n>>>>\n>>>\n>>>\n>>>\n>>>\n>>\n>> Thanks,\n>>\n>> Jason\n>>\n>> ----------------------------------------------------------\n>> Jason van Zyl\n>> Founder,  Apache Maven\n>> http://twitter.com/jvanzyl\n>> ----------------------------------------------------------\n>>\n>> --\n>> To unsubscribe from this list: send the line \"unsubscribe\n>> git\" in\n>> the body of a message to majordomo@vger.kernel.org\n>> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n>>\n>\n>\n>\n\nThanks,\n\nJason\n\n----------------------------------------------------------\nJason van Zyl\nFounder,  Apache Maven\nhttp://twitter.com/jvanzyl\n----------------------------------------------------------\n"}]}