Re: IVYDE-382 proposed patch
Good afternoon, sorry for the delay in my reply. The last two weeks I was very busy with exams and work. We are glad that our proposed patch found its way back to the main development path and that perhaps it will be a part of a following release :-) Is there a way we can support you? Should we extend the official IvyDE doc by providing a more sophisticated description about the new feature (like you suggested in the previous mail)? Many greetings from Austria, Alexander Am 14.06.2017 23:56, schrieb Nicolas Lalevée: > Hi, > > For some reason git apply was refusing to process the patch and was just > returning an error: corrupt patch at line 1964 > > So I played with git commands and work with the sources available on github. > I have create a branch on the ASF repo, ivyDECredentials, which has one > commit which squash all the forked commit on github. > I have then created another branch, ivyDECredentials-cleaned, which rebase > the work, remove unnecessary changes like the readme file, and did some file > formatting. > > Now it needs some review and testing in order to be merged. I'll take time to > do it but if somebody else if wants to help, another pair of eyes on this is > very welcomed. > > Also would be welcomed some documentation about this new feature. The IvyDE > doc is quite complete, it would be really nice to keep it at this level. > > Nicolas > >> Le 14 juin 2017 à 05:18, J Pai <jai.forums2...@gmail.com> a écrit : >> >> Hi Alexander, >> >> I actually just realized that your initial mail actually had a patch file >> attached. I didn't notice that before and only today noticed it while >> looking at the mail list archive. So assuming this applies cleanly on latest >> master branch of IvyDE, I think this should be fine too, instead of creating >> a PR. I am not experienced with Eclipse plugins, so I personally won't be >> able to help much, but hopefully someone from the IvyDE team will be able to >> review and decide about this patch. Thank you again for contributing this. >> >> -Jaikiran >> On 26-May-2017, at 8:28 AM, J Pai <jai.forums2...@gmail.com> wrote: >> >> Hi Alexander, >> >> Thank you for volunteering to provide this feature patch. I had a look a the >> repo you pointed to and read the README. It does seem to contain a good >> amount of work in that branch in multiple commits. >> >> To make it easier for whoever will decide about merging these to upstream >> ant-ivyde project, would it to be possible for you to do the following: >> >> 1. *Fork* the ant-ivyde project (on github) >> https://github.com/apache/ant-ivyde/ into your account. There's a "Fork" >> button on the right corner of the github page for the repo. >> 2. Once forked into your account, you can push your enhancement and bug fix >> related commits to either your master branch of your repo or any specific >> branch of your choice. >> - If the bug fixes are independent of the feature, then it would be good if >> they are done in separate branches, so that a separate pull request (PR) can >> be issued. >> 3. Once you are ready with the commits, you can then issue a pull request >> (PR) from your repo to the "master" branch of the ant-ivyde upstream repo >> https://github.com/apache/ant-ivyde/. Typically PRs are meant to contain >> commits that are all specific to a single feature or for a specific bug fix. >> >> Once the PRs are submitted, I'm sure one or more members of the development >> team who have relevant knowledge of Eclipse and the project will review this >> and either merge it or provide inputs. >> >> Thanks again for this, both Ivy and IvyDE project has been stagnant for a >> while and with contributions like these, we should be able to release out a >> new version soon. >> >> -Jaikiran >> >> On 25-May-2017, at 1:12 PM, alexander.bl...@arctis.at wrote: >> >> Dear Sir or Madam, >> >> as it was suggested in >> https://issues.apache.org/jira/browse/IVYDE-382?focusedCommentId=16018847=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-16018847, >> we are sending you our proposed patch for >> https://issues.apache.org/jira/browse/IVYDE-382. The corresponding >> patch-file is attached to this email. The source code is available at >> https://github.com/alex-bl/ivyDEextension/tree/ivyDECredentials in the >> branch "ivyDECredentials". >> >> Yours sincerely, >> >> Alexander Blaas >> >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org >> For additional commands, e-mail: dev-h...@ant.apache.org >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org >> For additional commands, e-mail: dev-h...@ant.apache.org
IVYDE-382 proposed patch
Dear Sir or Madam, as it was suggested in https://issues.apache.org/jira/browse/IVYDE-382?focusedCommentId=16018847=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-16018847, we are sending you our proposed patch for https://issues.apache.org/jira/browse/IVYDE-382. The corresponding patch-file is attached to this email. The source code is available at https://github.com/alex-bl/ivyDEextension/tree/ivyDECredentials in the branch "ivyDECredentials". Yours sincerely, Alexander Blaasdiff --git a/org.apache.ivyde.eclipse/.classpath b/org.apache.ivyde.eclipse/.classpath index 85c53c9..16c3e8e 100644 --- a/org.apache.ivyde.eclipse/.classpath +++ b/org.apache.ivyde.eclipse/.classpath @@ -1,22 +1,4 @@ - diff --git a/org.apache.ivyde.eclipse/.settings/org.eclipse.jdt.core.prefs b/org.apache.ivyde.eclipse/.settings/org.eclipse.jdt.core.prefs index ac46b41..3eff64b 100644 --- a/org.apache.ivyde.eclipse/.settings/org.eclipse.jdt.core.prefs +++ b/org.apache.ivyde.eclipse/.settings/org.eclipse.jdt.core.prefs @@ -1,21 +1,3 @@ -#*** -#* Licensed to the Apache Software Foundation (ASF) under one -#* or more contributor license agreements. See the NOTICE file -#* distributed with this work for additional information -#* regarding copyright ownership. The ASF licenses this file -#* to you under the Apache License, Version 2.0 (the -#* "License"); you may not use this file except in compliance -#* with the License. You may obtain a copy of the License at -#* -#* http://www.apache.org/licenses/LICENSE-2.0 -#* -#* Unless required by applicable law or agreed to in writing, -#* software distributed under the License is distributed on an -#* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -#* KIND, either express or implied. See the License for the -#* specific language governing permissions and limitations -#* under the License. -#*** eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate @@ -95,7 +77,12 @@ org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert diff --git a/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF b/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF index f354d8e..94b6ae8 100644 --- a/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF +++ b/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Apache IvyDE -Bundle-SymbolicName: org.apache.ivyde.eclipse; singleton:=true -Bundle-Version: 2.3.0.qualifier +Bundle-SymbolicName: org.apache.ivyde.eclipse;singleton:=true +Bundle-Version: 2.3.1.qualifier Bundle-ClassPath: ivyde-eclipse.jar Bundle-Activator: org.apache.ivyde.internal.eclipse.IvyPlugin Bundle-Vendor: Apache Software Foundation @@ -33,6 +33,11 @@ org.eclipse.debug.core;bundle-version="[3.4.0,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)", org.eclipse.debug.ui;bundle-version="[3.4.0,4.0.0)", - org.eclipse.core.variables;bundle-version="[3.2.0,4.0.0)" + org.eclipse.core.variables;bundle-version="[3.2.0,4.0.0)", + org.eclipse.equinox.security;bundle-version="[1.1.100,2.0.0)", + org.eclipse.core.databinding;bundle-version="[1.4.1,2.0.0)", + org.eclipse.core.databinding.property;bundle-version="[1.4.100,2.0.0)", + org.eclipse.core.databinding.beans;bundle-version="[1.2.200,2.0.0)", + org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/org.apache.ivyde.eclipse/build.properties b/org.apache.ivyde.eclipse/build.properties index bf2f878..0cf07a1 100644 --- a/org.apache.ivyde.eclipse/build.properties +++