diff options
author | cvs2git | 2009-04-11 05:15:13 +0000 |
---|---|---|
committer | cvs2git | 2009-04-11 05:15:13 +0000 |
commit | 75899b742cd3905f5d931fb4680588c22e412957 (patch) | |
tree | b3c9a5e465394536106ef00a659179f89d2df407 | |
parent | 5fa2f571e3e0aa62bf9bae035eb87256e34eac39 (diff) | |
download | org.eclipse.mylyn.tasks-75899b742cd3905f5d931fb4680588c22e412957.tar.gz org.eclipse.mylyn.tasks-75899b742cd3905f5d931fb4680588c22e412957.tar.xz org.eclipse.mylyn.tasks-75899b742cd3905f5d931fb4680588c22e412957.zip |
This commit was manufactured by cvs2svn to create tag 'R_3_1_1_e_3_3'.R_3_1_1_e_3_3
Sprout from e_3_3_m_3_1_x 2009-04-11 03:40:52 UTC spingel 'NEW - bug 271019: [patch] prepare 3.1.1 maintenance release'
Cherrypick from e_3_3_m_3_1_x 2009-04-11 05:15:12 UTC spingel '271019: [patch] prepare 3.1.1 maintenance release':
org.eclipse.mylyn.bugzilla-feature/feature.xml
Cherrypick from e_3_4_m_3_1_x 2009-04-11 02:40:30 UTC spingel 'RESOLVED - bug 269323: [regression] authentification fails with mod_auth_sspi or NTLM':
org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF
org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF
org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF
org.eclipse.mylyn.sdk-feature/feature.xml
org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
org.eclipse.mylyn.test-feature/feature.xml
org.eclipse.mylyn.trac-feature/feature.xml
org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracXmlRpcClient.java
org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF
12 files changed, 16 insertions, 17 deletions
diff --git a/org.eclipse.mylyn.bugzilla-feature/feature.xml b/org.eclipse.mylyn.bugzilla-feature/feature.xml index d4b051873..e07b675af 100644 --- a/org.eclipse.mylyn.bugzilla-feature/feature.xml +++ b/org.eclipse.mylyn.bugzilla-feature/feature.xml @@ -38,7 +38,7 @@ <import plugin="org.eclipse.ui.workbench.texteditor"/> <import plugin="org.eclipse.mylyn.tasks.ui" version="3.0.0" match="compatible"/> <import plugin="org.eclipse.mylyn.commons.ui" version="3.0.0" match="compatible"/> - <import feature="org.eclipse.mylyn_feature" version="3.1.0.qualifier" match="perfect"/> + <import feature="org.eclipse.mylyn_feature" version="3.1.1.qualifier" match="perfect"/> <import plugin="org.eclipse.mylyn.bugzilla.core" version="3.0.0" match="compatible"/> </requires> @@ -46,14 +46,14 @@ id="org.eclipse.mylyn.bugzilla.core" download-size="0" install-size="0" - version="3.1.0.qualifier" + version="3.1.1.qualifier" unpack="false"/> <plugin id="org.eclipse.mylyn.bugzilla.ui" download-size="0" install-size="0" - version="3.1.0.qualifier" + version="3.1.1.qualifier" unpack="false"/> </feature> diff --git a/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF index 1fde9c257..601cdc84e 100644 --- a/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.mylyn.bugzilla.core;singleton:=true -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Activator: org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.mylyn.tasks.core;bundle-version="[3.0.0,4.0.0)", diff --git a/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF index 4bc61ec1d..f4f7952ed 100644 --- a/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.mylyn.bugzilla.ui; singleton:=true -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Activator: org.eclipse.mylyn.internal.bugzilla.ui.BugzillaUiPlugin Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.ui, diff --git a/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF index f33e1ace1..38cb0e459 100644 --- a/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.mylyn.help.ui;singleton:=true -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.core.runtime, diff --git a/org.eclipse.mylyn.sdk-feature/feature.xml b/org.eclipse.mylyn.sdk-feature/feature.xml index 70774b9b8..49a3d21e3 100644 --- a/org.eclipse.mylyn.sdk-feature/feature.xml +++ b/org.eclipse.mylyn.sdk-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.mylyn.sdk_feature" label="%featureName" - version="3.1.0.qualifier" + version="3.1.1.qualifier" provider-name="%providerName" plugin="org.eclipse.mylyn"> diff --git a/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF index 516646594..9b579dc38 100644 --- a/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.mylyn.tasks.core;singleton:=true -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.runtime, diff --git a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF index 8200a6f2d..b69e8179a 100644 --- a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.mylyn.tasks.ui;singleton:=true -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Activator: org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin Require-Bundle: org.eclipse.ui, org.eclipse.compare, diff --git a/org.eclipse.mylyn.test-feature/feature.xml b/org.eclipse.mylyn.test-feature/feature.xml index e6adca029..205c145ce 100644 --- a/org.eclipse.mylyn.test-feature/feature.xml +++ b/org.eclipse.mylyn.test-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.mylyn.test_feature" label="Mylyn Test Feature" - version="3.1.0.qualifier" + version="3.1.1.qualifier" plugin="org.eclipse.mylyn"> <description url="http://eclipse.org/mylyn"> diff --git a/org.eclipse.mylyn.trac-feature/feature.xml b/org.eclipse.mylyn.trac-feature/feature.xml index 72683a62e..bd5b5a063 100644 --- a/org.eclipse.mylyn.trac-feature/feature.xml +++ b/org.eclipse.mylyn.trac-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.mylyn.trac_feature" label="%featureName" - version="3.1.0.qualifier" + version="3.1.1.qualifier" provider-name="%providerName" plugin="org.eclipse.mylyn"> @@ -43,14 +43,14 @@ id="org.eclipse.mylyn.trac.ui" download-size="0" install-size="0" - version="3.1.0.qualifier" + version="3.1.1.qualifier" unpack="false"/> <plugin id="org.eclipse.mylyn.trac.core" download-size="0" install-size="0" - version="3.1.0.qualifier" + version="3.1.1.qualifier" unpack="false"/> <plugin diff --git a/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF index befdabc93..6d2a50c33 100644 --- a/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.mylyn.trac.core;singleton:=true -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.core.runtime, org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)", diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracXmlRpcClient.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracXmlRpcClient.java index 627462b79..ce4499de5 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracXmlRpcClient.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracXmlRpcClient.java @@ -34,7 +34,6 @@ import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpMethod; import org.apache.commons.httpclient.HttpState; import org.apache.commons.httpclient.HttpStatus; -import org.apache.commons.httpclient.UsernamePasswordCredentials; import org.apache.commons.httpclient.auth.AuthScheme; import org.apache.commons.httpclient.auth.AuthScope; import org.apache.commons.httpclient.auth.BasicScheme; @@ -265,7 +264,7 @@ public class TracXmlRpcClient extends AbstractTracClient implements ITracWikiCli AuthenticationCredentials credentials = location.getCredentials(AuthenticationType.REPOSITORY); config.setServerURL(getXmlRpcUrl(credentials)); if (credentialsValid(credentials)) { - Credentials creds = new UsernamePasswordCredentials(credentials.getUserName(), credentials.getPassword()); + Credentials creds = WebUtil.getHttpClientCredentials(credentials, WebUtil.getHost(location.getUrl())); httpClient.getState().setCredentials(authScope, creds); } else { httpClient.getState().clearCredentials(); diff --git a/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF index 7f5c18cbe..bb9aee11b 100644 --- a/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.mylyn.trac.ui;singleton:=true -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Activator: org.eclipse.mylyn.internal.trac.ui.TracUiPlugin Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.core.runtime, |