Attachment #54277 for bug #151602

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 18-23 Link Here

(-)src/org/eclipse/mylar/internal/tasks/web/WebRepositorySettingsPage.java (-3 / +107 lines)
18	import org.eclipse.jface.util.IPropertyChangeListener;	18	import org.eclipse.jface.util.IPropertyChangeListener;
19	import org.eclipse.jface.util.PropertyChangeEvent;	19	import org.eclipse.jface.util.PropertyChangeEvent;
20	import org.eclipse.mylar.internal.tasks.ui.wizards.AbstractRepositorySettingsPage;	20	import org.eclipse.mylar.internal.tasks.ui.wizards.AbstractRepositorySettingsPage;
		21	import org.eclipse.mylar.internal.tasks.web.restui.EHttpMethod;
		22	import org.eclipse.mylar.internal.tasks.web.restui.RESTRequestEditor;
21	import org.eclipse.mylar.tasks.core.RepositoryTemplate;	23	import org.eclipse.mylar.tasks.core.RepositoryTemplate;
22	import org.eclipse.mylar.tasks.core.TaskRepository;	24	import org.eclipse.mylar.tasks.core.TaskRepository;
23	import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;	25	import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
Lines 32-37 Link Here
32	import org.eclipse.swt.widgets.Text;	34	import org.eclipse.swt.widgets.Text;
33	import org.eclipse.ui.forms.events.ExpansionAdapter;	35	import org.eclipse.ui.forms.events.ExpansionAdapter;
34	import org.eclipse.ui.forms.events.ExpansionEvent;	36	import org.eclipse.ui.forms.events.ExpansionEvent;
		37	import org.eclipse.ui.forms.widgets.ColumnLayout;
35	import org.eclipse.ui.forms.widgets.ExpandableComposite;	38	import org.eclipse.ui.forms.widgets.ExpandableComposite;
36	import org.eclipse.ui.forms.widgets.FormToolkit;	39	import org.eclipse.ui.forms.widgets.FormToolkit;
37	import org.eclipse.ui.forms.widgets.Section;	40	import org.eclipse.ui.forms.widgets.Section;
Lines 56-63 Link Here
56		59
57	private Text queryPatternText;	60	private Text queryPatternText;
58		61
		62	private Text loginFormUrlText;
		63
		64	private Text loginTokenPatternText;
		65
59	private ParametersEditor parametersEditor;	66	private ParametersEditor parametersEditor;
60		67
		68	private RESTRequestEditor loginRequestEditor;
		69
61	private FormToolkit toolkit = new FormToolkit(Display.getCurrent());	70	private FormToolkit toolkit = new FormToolkit(Display.getCurrent());
62		71
63	private Map<String, String> oldProperties;	72	private Map<String, String> oldProperties;
Lines 84-89 Link Here
84	newTaskText.setText(template.newTaskUrl);	93	newTaskText.setText(template.newTaskUrl);
85	queryUrlText.setText(template.taskQueryUrl);	94	queryUrlText.setText(template.taskQueryUrl);
86	queryPatternText.setText(template.getAttribute(WebRepositoryConnector.PROPERTY_QUERY_REGEXP));	95	queryPatternText.setText(template.getAttribute(WebRepositoryConnector.PROPERTY_QUERY_REGEXP));
		96	loginFormUrlText
		97	.setText(nvl(template.getAttribute(WebRepositoryConnector.PROPERTY_LOGIN_FORM_URL)));
		98	loginTokenPatternText.setText(nvl(template
		99	.getAttribute(WebRepositoryConnector.PROPERTY_LOGIN_TOKEN_REGEXP)));
		100	String method = template.getAttribute(WebRepositoryConnector.PROPERTY_LOGIN_REQUEST_METHOD);
		101	if (method != null) {
		102	try {
		103	loginRequestEditor.setMethod(EHttpMethod.valueOf(method));
		104	} catch (IllegalArgumentException e1) {
		105	loginRequestEditor.setMethod(null);
		106	}
		107	} else {
		108	loginRequestEditor.setMethod(null);
		109	}
		110	loginRequestEditor.setUrl(nvl(template
		111	.getAttribute(WebRepositoryConnector.PROPERTY_LOGIN_REQUEST_URL)));
87		112
88	parametersEditor.removeAll();	113	parametersEditor.removeAll();
89		114
Lines 114-133 Link Here
114	newTaskText.setText(getTextProperty(WebRepositoryConnector.PROPERTY_TASK_CREATION_URL));	139	newTaskText.setText(getTextProperty(WebRepositoryConnector.PROPERTY_TASK_CREATION_URL));
115	queryUrlText.setText(getTextProperty(WebRepositoryConnector.PROPERTY_QUERY_URL));	140	queryUrlText.setText(getTextProperty(WebRepositoryConnector.PROPERTY_QUERY_URL));
116	queryPatternText.setText(getTextProperty(WebRepositoryConnector.PROPERTY_QUERY_REGEXP));	141	queryPatternText.setText(getTextProperty(WebRepositoryConnector.PROPERTY_QUERY_REGEXP));
		142	loginFormUrlText.setText(getTextProperty(WebRepositoryConnector.PROPERTY_LOGIN_FORM_URL));
		143	loginTokenPatternText.setText(getTextProperty(WebRepositoryConnector.PROPERTY_LOGIN_TOKEN_REGEXP));
		144	try {
		145	loginRequestEditor.setMethod(EHttpMethod
		146	.valueOf(getTextProperty(WebRepositoryConnector.PROPERTY_LOGIN_REQUEST_METHOD)));
		147	} catch (IllegalArgumentException e) {
		148	// ignore
		149	}
		150	loginRequestEditor.setUrl(getTextProperty(WebRepositoryConnector.PROPERTY_LOGIN_REQUEST_URL));
117		151
118	oldProperties = repository.getProperties();	152	oldProperties = repository.getProperties();
119	parametersEditor.addParams(oldProperties, new LinkedHashMap<String, String>());	153	parametersEditor.addParams(oldProperties, new LinkedHashMap<String, String>());
120	}	154	}
121	}	155	}
122		156
123	private String getTextProperty(String name) {	157	private String nvl(String value) {
124	String value = repository.getProperty(name);
125	if (value == null) {	158	if (value == null) {
126	return "";	159	return "";
127	}	160	}
128	return value;	161	return value;
129	}	162	}
130		163
		164	private String getTextProperty(String name) {
		165	return nvl(repository.getProperty(name));
		166	}
		167
131	protected boolean isValidUrl(String name) {	168	protected boolean isValidUrl(String name) {
132	return true;	169	return true;
133	}	170	}
Lines 153-158 Link Here
153	gridData_1.minimumHeight = 80;	190	gridData_1.minimumHeight = 80;
154	parametersEditor.setLayoutData(gridData_1);	191	parametersEditor.setLayoutData(gridData_1);
155		192
		193	createAdvancedComposite(parent, composite);
		194	createLoginComposite(parent, composite);
		195
		196	return composite;
		197	}
		198
		199	private void createAdvancedComposite(Composite parent, final Composite composite) {
156	ExpandableComposite expComposite = toolkit.createExpandableComposite(composite, Section.COMPACT	200	ExpandableComposite expComposite = toolkit.createExpandableComposite(composite, Section.COMPACT
157	\| Section.TWISTIE \| Section.TITLE_BAR);	201	\| Section.TWISTIE \| Section.TITLE_BAR);
158	expComposite.clientVerticalSpacing = 0;	202	expComposite.clientVerticalSpacing = 0;
Lines 201-208 Link Here
201	GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);	245	GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
202	gridData.heightHint = 40;	246	gridData.heightHint = 40;
203	queryPatternText.setLayoutData(gridData);	247	queryPatternText.setLayoutData(gridData);
		248	}
204		249
205	return composite;	250	private void createLoginComposite(final Composite parent, final Composite composite) {
		251	ExpandableComposite expComposite = toolkit.createExpandableComposite(composite, Section.COMPACT
		252	\| Section.TWISTIE \| Section.TITLE_BAR);
		253	expComposite.clientVerticalSpacing = 0;
		254	GridData gridData_2 = new GridData(SWT.FILL, SWT.FILL, true, false);
		255	gridData_2.horizontalIndent = -5;
		256	expComposite.setLayoutData(gridData_2);
		257	expComposite.setFont(parent.getFont());
		258	expComposite.setBackground(parent.getBackground());
		259	expComposite.setText("&Login Configuration (Expert)");
		260	expComposite.addExpansionListener(new ExpansionAdapter() {
		261	public void expansionStateChanged(ExpansionEvent e) {
		262	composite.layout();
		263	}
		264	});
		265
		266	Composite loginComposite = toolkit.createComposite(expComposite, SWT.BORDER);
		267	loginComposite.setLayout(new ColumnLayout());
		268	Section loginTokenSection = toolkit.createSection(loginComposite, Section.TWISTIE \| Section.TITLE_BAR);
		269	loginTokenSection.setText("Step 1. Retrieve login token (optional)");
		270	Composite composite2 = toolkit.createComposite(loginTokenSection);
		271	GridLayout gridLayout2 = new GridLayout();
		272	gridLayout2.numColumns = 2;
		273	gridLayout2.verticalSpacing = 0;
		274	composite2.setLayout(gridLayout2);
		275
		276	Label queryUrlLabel = toolkit.createLabel(composite2, "Login &Page URL:", SWT.NONE);
		277	queryUrlLabel.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));
		278
		279	loginFormUrlText = new Text(composite2, SWT.BORDER);
		280	loginFormUrlText.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
		281
		282	Label queryPatternLabel = toolkit.createLabel(composite2, "Login &Token Pattern:", SWT.NONE);
		283	queryPatternLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, false, true));
		284
		285	loginTokenPatternText = new Text(composite2, SWT.V_SCROLL \| SWT.MULTI \| SWT.BORDER \| SWT.WRAP);
		286	GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
		287	gridData.heightHint = 40;
		288	loginTokenPatternText.setLayoutData(gridData);
		289
		290	loginTokenSection.setClient(composite2);
		291
		292	Section loginRequestSection = toolkit.createSection(loginComposite, Section.TWISTIE \| Section.TITLE_BAR
		293	\| Section.EXPANDED);
		294	loginRequestSection.setText("Step 2. Login request");
		295
		296	loginRequestEditor = new RESTRequestEditor(loginRequestSection, SWT.NONE);
		297	toolkit.adapt(loginRequestEditor);
		298	loginRequestSection.setClient(loginRequestEditor);
		299
		300	expComposite.setClient(loginComposite);
206	}	301	}
207		302
208	public void propertyChange(PropertyChangeEvent event) {	303	public void propertyChange(PropertyChangeEvent event) {
Lines 218-223 Link Here
218	repository.setProperty(WebRepositoryConnector.PROPERTY_TASK_CREATION_URL, newTaskText.getText());	313	repository.setProperty(WebRepositoryConnector.PROPERTY_TASK_CREATION_URL, newTaskText.getText());
219	repository.setProperty(WebRepositoryConnector.PROPERTY_QUERY_URL, queryUrlText.getText());	314	repository.setProperty(WebRepositoryConnector.PROPERTY_QUERY_URL, queryUrlText.getText());
220	repository.setProperty(WebRepositoryConnector.PROPERTY_QUERY_REGEXP, queryPatternText.getText());	315	repository.setProperty(WebRepositoryConnector.PROPERTY_QUERY_REGEXP, queryPatternText.getText());
		316	repository.setProperty(WebRepositoryConnector.PROPERTY_LOGIN_FORM_URL, loginFormUrlText.getText());
		317	repository.setProperty(WebRepositoryConnector.PROPERTY_LOGIN_TOKEN_REGEXP, loginTokenPatternText.getText());
		318	EHttpMethod method = loginRequestEditor.getMethod();
		319	if (method == null) {
		320	repository.removeProperty(WebRepositoryConnector.PROPERTY_LOGIN_REQUEST_METHOD);
		321	} else {
		322	repository.setProperty(WebRepositoryConnector.PROPERTY_LOGIN_REQUEST_METHOD, method.name());
		323	}
		324	repository.setProperty(WebRepositoryConnector.PROPERTY_LOGIN_REQUEST_URL, loginRequestEditor.getUrl());
221		325
222	if (oldProperties != null) {	326	if (oldProperties != null) {
223	for (Map.Entry<String, String> e : oldProperties.entrySet()) {	327	for (Map.Entry<String, String> e : oldProperties.entrySet()) {




import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.Proxy;
import java.net.URL;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;

import org.eclipse.mylar.internal.tasks.core.WebQueryHit;
import org.eclipse.mylar.internal.tasks.core.WebTask;
import org.eclipse.mylar.internal.tasks.ui.RetrieveTitleFromUrlJob;
import org.eclipse.mylar.internal.tasks.web.restui.EHttpMethod;
import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector;
import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylar.tasks.core.AbstractRepositoryTask;


	public static final String PROPERTY_QUERY_REGEXP = "queryPattern";

	public static final String PROPERTY_LOGIN_FORM_URL = "loginFormUrl";

	public static final String PROPERTY_LOGIN_TOKEN_REGEXP = "loginTokenPattern";

	public static final String PROPERTY_LOGIN_REQUEST_METHOD = "loginRequestMethod";

	public static final String PROPERTY_LOGIN_REQUEST_URL = "loginRequestUrl";

	public static final String PARAM_PREFIX = "param_";

	public static final String PARAM_SERVER_URL = "serverUrl";


	public static final String PARAM_PASSWORD = "password";

	public static final String PARAM_LOGIN_TOKEN = "loginToken";

	public String getRepositoryType() {
		return WebTask.REPOSITORY_TYPE;
	}

	}

	@Override
	public IStatus performQuery(AbstractRepositoryQuery query, TaskRepository repository, IProgressMonitor monitor,
			QueryHitCollector resultCollector) {
		if (query instanceof WebQuery) {
			String repositoryUser = repository.getUserName();
			String repositoryPassword = repository.getPassword();

			String queryUrl = evaluateParams(query.getUrl(), queryParameters, repository);
			String queryPattern = evaluateParams(webQuery.getQueryPattern(), queryParameters, repository);
			String taskPrefix = evaluateParams(webQuery.getTaskPrefix(), queryParameters, repository);
			Map<String, String> loginParams = new HashMap<String, String>();
			loginParams.put(WebRepositoryConnector.PROPERTY_LOGIN_FORM_URL, evaluateParams(repository
					.getProperty(WebRepositoryConnector.PROPERTY_LOGIN_FORM_URL), queryParameters, repository));
			loginParams.put(WebRepositoryConnector.PROPERTY_LOGIN_TOKEN_REGEXP, evaluateParams(repository
					.getProperty(WebRepositoryConnector.PROPERTY_LOGIN_TOKEN_REGEXP), queryParameters, repository));
			loginParams.put(WebRepositoryConnector.PROPERTY_LOGIN_REQUEST_METHOD, evaluateParams(repository
					.getProperty(WebRepositoryConnector.PROPERTY_LOGIN_REQUEST_METHOD), queryParameters, repository));
			loginParams.put(WebRepositoryConnector.PROPERTY_LOGIN_REQUEST_URL, repository
					.getProperty(WebRepositoryConnector.PROPERTY_LOGIN_REQUEST_URL));

			try {
				// if (regexp != null && regexp.trim().length() > 0) {
				return performQuery(fetchResource(queryUrl, repositoryUser, repositoryPassword, loginParams,
						queryParameters, repository, repository.getProxy()), queryPattern, taskPrefix, monitor, resultCollector, repository);
				// } else {
				// return performRssQuery(queryUrl, taskPrefix, repositoryUrl,
				// repositoryUser, repositoryPassword,

	 * try { collector.accept(new WebQueryHit(id, id+": "+entry.getTitle(),
	 * taskPrefix, repositoryUrl)); } catch (CoreException e) { return new
	 * Status(IStatus.ERROR, TasksUiPlugin.PLUGIN_ID, IStatus.ERROR, "Unable
	 * collect results.", e); } } } return Status.OK_STATUS; } catch (Exception
	 * ex) { return new Status(IStatus.OK, TasksUiPlugin.PLUGIN_ID, IStatus.OK,
	 * "Could not fetch resource: " + queryUrl, ex); } }
	 * queryUrl, ex); } }
	 */

	public static String fetchResource(String url, String user, String password, Map<String, String> loginParams,
			Map<String, String> params, TaskRepository repository, Proxy proxySettings) throws IOException {
		HttpClient client = new HttpClient();
		Proxy proxySettings = TasksUiPlugin.getDefault().getProxySettings();
		WebClientUtil.setupHttpClient(client, proxySettings, url, user, password);

		if (loginParams != null) {
			String loginFormUrl = loginParams.get(PROPERTY_LOGIN_FORM_URL);
			if (loginFormUrl != null && !"".equals(loginFormUrl)) {
				GetMethod get = new GetMethod(loginFormUrl);
				String loginFormPage = null;
				try {
					client.executeMethod(get);
					Header locationHeader = get.getResponseHeader("Location");
					if (locationHeader != null) {
						get = new GetMethod(locationHeader.getValue());
						client.executeMethod(get);
					}
					Header refreshHeader = get.getResponseHeader("Refresh");
					if (refreshHeader != null) {
						String value = refreshHeader.getValue();
						int n = value.indexOf(";url=");
						if (n != -1) {
							value = value.substring(n + 5);
							int requestPath;
							if (value.charAt(0) == '/') {
								int colonSlashSlash = url.indexOf("://");
								requestPath = url.indexOf('/', colonSlashSlash + 3);
							} else {
								requestPath = url.lastIndexOf('/');
							}

							String refreshUrl;
							if (requestPath == -1) {
								refreshUrl = url + "/" + value;
							} else {
								refreshUrl = url.substring(0, requestPath + 1) + value;
							}

							get = new GetMethod(refreshUrl);
							client.executeMethod(get);
						}
					}
					loginFormPage = get.getResponseBodyAsString();
				} catch (Exception e) {
					// ignore
					e.printStackTrace();
				} finally {
					get.releaseConnection();
				}
				if (loginFormPage != null) {
					String loginTokenPattern = loginParams.get(PROPERTY_LOGIN_TOKEN_REGEXP);
					if (loginTokenPattern != null && !"".equals(loginTokenPattern)) {
						Pattern p = Pattern.compile(loginTokenPattern);
						Matcher m = p.matcher(loginFormPage);
						if (m.find()) {
							// TODO is it ok to modify the params map?
							params.put(PARAM_PREFIX + PARAM_LOGIN_TOKEN, m.group(1));
						}
					}
				}
			}
			HttpMethod method = null;
			try {
				String loginUrlStr = loginParams.get(PROPERTY_LOGIN_REQUEST_URL);
				loginUrlStr = evaluateParams(loginUrlStr, params, repository);
				switch (EHttpMethod.valueOf(loginParams.get(PROPERTY_LOGIN_REQUEST_METHOD))) {
				case GET:
					method = new GetMethod(loginUrlStr);
					break;
				case POST:
					String query = new URL(loginUrlStr).getQuery();
					if (query != null) {
						StringTokenizer tokenizer = new StringTokenizer(query, "&");
						method = new PostMethod(loginUrlStr.substring(0, loginUrlStr.indexOf(query) - 1));
						while (tokenizer.hasMoreTokens()) {
							String nameValuePair = tokenizer.nextToken();
							String[] nv = nameValuePair.split("=");
							if (nv.length < 2) {
								((PostMethod) method).addParameter(nv[0], "");
							} else {
								((PostMethod) method).addParameter(nv[0], nv[1]);
							}
						}
					}
					break;
				}
				client.executeMethod(method);
			} catch (Exception e) {
				// ignore
			} finally {
				if (method != null) {
					method.releaseConnection();
				}
			}
		}

		GetMethod get = new GetMethod(url);
		try {
			client.executeMethod(get);





import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

				final MultiStatus queryStatus = new MultiStatus(TasksUiPlugin.PLUGIN_ID, IStatus.OK, "Query result", null);
				final List<AbstractQueryHit> queryHits = new ArrayList<AbstractQueryHit>();
				try {
					if (webPage == null) {
						HashMap<String, String> loginParams = new HashMap<String, String>();
						loginParams.put(WebRepositoryConnector.PROPERTY_LOGIN_FORM_URL, WebRepositoryConnector
								.evaluateParams(repository.getProperty(WebRepositoryConnector.PROPERTY_LOGIN_FORM_URL),
										params, repository));
						loginParams.put(WebRepositoryConnector.PROPERTY_LOGIN_TOKEN_REGEXP, WebRepositoryConnector
								.evaluateParams(repository
										.getProperty(WebRepositoryConnector.PROPERTY_LOGIN_TOKEN_REGEXP), params,
										repository));
						loginParams.put(WebRepositoryConnector.PROPERTY_LOGIN_REQUEST_METHOD, WebRepositoryConnector
								.evaluateParams(repository
										.getProperty(WebRepositoryConnector.PROPERTY_LOGIN_REQUEST_METHOD), params,
										repository));
						loginParams.put(WebRepositoryConnector.PROPERTY_LOGIN_REQUEST_URL, repository
								.getProperty(WebRepositoryConnector.PROPERTY_LOGIN_REQUEST_URL));
						webPage = WebRepositoryConnector.fetchResource(evaluatedUrl, repository.getUserName(),
								repository.getPassword(), loginParams, params, repository, repository.getProxy());
					}

					QueryHitCollector collector = new QueryHitCollector(TasksUiPlugin.getTaskListManager().getTaskList()) {

Lines 24-28 Link Here

(-).project (+1 lines)
24	<natures>	24	<natures>
25	<nature>org.eclipse.pde.PluginNature</nature>	25	<nature>org.eclipse.pde.PluginNature</nature>
26	<nature>org.eclipse.jdt.core.javanature</nature>	26	<nature>org.eclipse.jdt.core.javanature</nature>
		27	<nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
27	</natures>	28	</natures>
28	</projectDescription>	29	</projectDescription>




        <attribute name="queryPattern"
                   value="&lt;tr .+?&lt;a href=&quot;view.php\?id=(.+?)&quot;&gt;.+?&lt;td class=&quot;left&quot;&gt;(.+?)&lt;/td&gt;&lt;/tr&gt;"/>
     </repository>
     <repository
           anonymous="true"
           label="ChangeLogic (anonymous)"
           repositoryKind="web"
           urlNewTask="${serverUrl}/index.php?event=Add_task"
           urlRepository="http://changelogic.araneaframework.org"
           urlTask="${serverUrl}/index.php?event=Show_public_task&amp;task_id="
           urlTaskQuery="${serverUrl}/index.php?event=Show_public_task_list">
        <attribute
              name="queryPattern"
              value="&lt;a href=&quot;index.php\?event\=Show_public_task&amp;amp;task_id\=.+?&amp;amp;project_id\=0&quot;&gt;(.+?)&lt;/a&gt;.+?&lt;/td&gt;.+?&lt;td&gt;.+?&lt;/td&gt;.+?&lt;td&gt;.+?&lt;/td&gt;.+?&lt;td&gt;.+?&lt;/td&gt;.+?&lt;td&gt;(.+?)&lt;/td&gt;">
        </attribute>
        <attribute
              name="loginFormUrl"
              value="${serverUrl}">
        </attribute>
     </repository>
     <repository
           anonymous="false"
           label="ChangeLogic (private)"
           repositoryKind="web"
           urlNewTask="${serverUrl}/index.php?event=Add_task&amp;project_id=${projectId}"
           urlRepository="http://changelogic.araneaframework.org"
           urlTask="${serverUrl}/index.php?event=Show_task&amp;task_id="
           urlTaskQuery="${serverUrl}/index.php?event=Show_task_list&amp;project_id=${projectId}">
        <attribute
              name="loginFormUrl"
              value="${serverUrl}">
        </attribute>
        <attribute
              name="loginTokenPattern"
              value="&lt;form name=&quot;Login_form&quot; method=&quot;POST&quot; action=&quot;index.php\?event\=Login&amp;amp;project_id\=0&amp;amp;link_uid\=(\p{Alnum}+?)\&quot;(?:.*?)&gt;">
        </attribute>
        <attribute
              name="loginRequestMethod"
              value="POST">
        </attribute>
        <attribute
              name="loginRequestUrl"
              value="${serverUrl}/index.php?event=Login&amp;link_uid=${loginToken}&amp;username=${userId}&amp;password=${password}">
        </attribute>
        <attribute
              name="queryPattern"
              value="&lt;a href=&quot;index.php\?event\=Show_task&amp;amp;task_id\=.+?&amp;amp;project_id\=${projectId}&amp;amp;recent_list_id=.+?&quot;&gt;(.+?)&lt;/a&gt;.+?&lt;/td&gt;.+?&lt;td&gt;.+?&lt;/td&gt;.+?&lt;td&gt;.+?&lt;/td&gt;.+?&lt;td&gt;.+?&lt;/td&gt;.+?&lt;td&gt;.+?&lt;/td&gt;.+?&lt;td&gt;(.+?)&lt;/td&gt;">
        </attribute>
        <attribute
              name="param_projectId"
              value="1">
        </attribute>
     </repository>
   </extension>

</plugin>




/*******************************************************************************
 * Copyright (c) 2005, 2006 Erkki Lindpere and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Erkki Lindpere - initial API and implementation
 *******************************************************************************/
package org.eclipse.mylar.internal.tasks.web.restui;

import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.Viewer;

public class MethodTypeContentProvider implements IStructuredContentProvider {

	public Object[] getElements(Object inputElement) {
		return EHttpMethod.values();
	}

	public void dispose() {
	}

	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
	}

}




/*******************************************************************************
 * Copyright (c) 2005, 2006 Erkki Lindpere and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Erkki Lindpere - initial API and implementation
 *******************************************************************************/
package org.eclipse.mylar.internal.tasks.web.restui;

/**
 * Represents a subset of HTTP methods: GET and POST
 * 
 * @author Erkki Lindpere
 */
public enum EHttpMethod {
	GET, POST
}




/*******************************************************************************
 * Copyright (c) 2005, 2006 Erkki Lindpere and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Erkki Lindpere - initial API and implementation
 *******************************************************************************/
package org.eclipse.mylar.internal.tasks.web.restui;

import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;

public class RESTRequestEditor extends Composite {

	private Label urlLabel = null;

	private Text urlText = null;

	private Combo methodCombo = null;

	private ComboViewer comboViewer = null;

	public RESTRequestEditor(Composite parent, int style) {
		super(parent, style);
		initialize();
	}

	private void initialize() {
		GridData gridData = new GridData();
		gridData.grabExcessHorizontalSpace = true;
		gridData.verticalAlignment = GridData.CENTER;
		gridData.horizontalAlignment = GridData.FILL;
		GridLayout gridLayout = new GridLayout();
		gridLayout.numColumns = 3;
		createMethodCombo();
		urlLabel = new Label(this, SWT.NONE);
		urlLabel.setText("URL:");
		urlText = new Text(this, SWT.BORDER);
		urlText.setLayoutData(gridData);
		this.setLayout(gridLayout);
	}

	/**
	 * This method initializes methodCombo
	 * 
	 */
	private void createMethodCombo() {
		methodCombo = new Combo(this, SWT.NONE);
		comboViewer = new ComboViewer(methodCombo);
		comboViewer.setContentProvider(new MethodTypeContentProvider());
		comboViewer.setInput(new Object());
		comboViewer.setLabelProvider(new MethodTypeLabelProvider());
	}

	public String getUrl() {
		return urlText.getText();
	}

	public void setUrl(String url) {
		urlText.setText(url);
	}

	public EHttpMethod getMethod() {
		return (EHttpMethod) ((IStructuredSelection) comboViewer.getSelection()).getFirstElement();
	}

	public void setMethod(EHttpMethod method) {
		ISelection selection = null;
		if (method == null) {
			selection = new StructuredSelection();
		} else {
			selection = new StructuredSelection(method);
		}
		comboViewer.setSelection(selection);
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2006 Erkki Lindpere and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Erkki Lindpere - initial API and implementation
 *******************************************************************************/
package org.eclipse.mylar.internal.tasks.web.restui;

import org.eclipse.jface.viewers.LabelProvider;

public class MethodTypeLabelProvider extends LabelProvider {

	@Override
	public String getText(Object element) {
		if (element instanceof EHttpMethod) {
			EHttpMethod type = (EHttpMethod) element;
			return type.name();
		}
		return super.getText(element);
	}

}

Return to bug 151602

Lines 14-31 Link Here

(-)src/org/eclipse/mylar/internal/tasks/web/WebRepositoryConnector.java (-10 / +125 lines)
14	import java.io.IOException;	14	import java.io.IOException;
15	import java.io.UnsupportedEncodingException;	15	import java.io.UnsupportedEncodingException;
16	import java.net.Proxy;	16	import java.net.Proxy;
		17	import java.net.URL;
17	import java.net.URLDecoder;	18	import java.net.URLDecoder;
18	import java.util.ArrayList;	19	import java.util.ArrayList;
19	import java.util.Collections;	20	import java.util.Collections;
		21	import java.util.HashMap;
20	import java.util.List;	22	import java.util.List;
21	import java.util.Map;	23	import java.util.Map;
22	import java.util.Set;	24	import java.util.Set;
		25	import java.util.StringTokenizer;
23	import java.util.regex.Matcher;	26	import java.util.regex.Matcher;
24	import java.util.regex.Pattern;	27	import java.util.regex.Pattern;
25		28
26	import org.apache.commons.httpclient.Header;	29	import org.apache.commons.httpclient.Header;
27	import org.apache.commons.httpclient.HttpClient;	30	import org.apache.commons.httpclient.HttpClient;
		31	import org.apache.commons.httpclient.HttpMethod;
28	import org.apache.commons.httpclient.methods.GetMethod;	32	import org.apache.commons.httpclient.methods.GetMethod;
		33	import org.apache.commons.httpclient.methods.PostMethod;
29	import org.eclipse.core.runtime.CoreException;	34	import org.eclipse.core.runtime.CoreException;
30	import org.eclipse.core.runtime.IProgressMonitor;	35	import org.eclipse.core.runtime.IProgressMonitor;
31	import org.eclipse.core.runtime.IStatus;	36	import org.eclipse.core.runtime.IStatus;
Lines 34-39 Link Here
34	import org.eclipse.mylar.internal.tasks.core.WebQueryHit;	39	import org.eclipse.mylar.internal.tasks.core.WebQueryHit;
35	import org.eclipse.mylar.internal.tasks.core.WebTask;	40	import org.eclipse.mylar.internal.tasks.core.WebTask;
36	import org.eclipse.mylar.internal.tasks.ui.RetrieveTitleFromUrlJob;	41	import org.eclipse.mylar.internal.tasks.ui.RetrieveTitleFromUrlJob;
		42	import org.eclipse.mylar.internal.tasks.web.restui.EHttpMethod;
37	import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector;	43	import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector;
38	import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery;	44	import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery;
39	import org.eclipse.mylar.tasks.core.AbstractRepositoryTask;	45	import org.eclipse.mylar.tasks.core.AbstractRepositoryTask;
Lines 60-65 Link Here
60		66
61	public static final String PROPERTY_QUERY_REGEXP = "queryPattern";	67	public static final String PROPERTY_QUERY_REGEXP = "queryPattern";
62		68
		69	public static final String PROPERTY_LOGIN_FORM_URL = "loginFormUrl";
		70
		71	public static final String PROPERTY_LOGIN_TOKEN_REGEXP = "loginTokenPattern";
		72
		73	public static final String PROPERTY_LOGIN_REQUEST_METHOD = "loginRequestMethod";
		74
		75	public static final String PROPERTY_LOGIN_REQUEST_URL = "loginRequestUrl";
		76
63	public static final String PARAM_PREFIX = "param_";	77	public static final String PARAM_PREFIX = "param_";
64		78
65	public static final String PARAM_SERVER_URL = "serverUrl";	79	public static final String PARAM_SERVER_URL = "serverUrl";
Lines 68-73 Link Here
68		82
69	public static final String PARAM_PASSWORD = "password";	83	public static final String PARAM_PASSWORD = "password";
70		84
		85	public static final String PARAM_LOGIN_TOKEN = "loginToken";
		86
71	public String getRepositoryType() {	87	public String getRepositoryType() {
72	return WebTask.REPOSITORY_TYPE;	88	return WebTask.REPOSITORY_TYPE;
73	}	89	}
Lines 148-155 Link Here
148	}	164	}
149		165
150	@Override	166	@Override
151	public IStatus performQuery(AbstractRepositoryQuery query, TaskRepository repository, Proxy proxySettings,	167	public IStatus performQuery(AbstractRepositoryQuery query, TaskRepository repository, IProgressMonitor monitor,
152	IProgressMonitor monitor, QueryHitCollector resultCollector) {	168	QueryHitCollector resultCollector) {
153	if (query instanceof WebQuery) {	169	if (query instanceof WebQuery) {
154	String repositoryUser = repository.getUserName();	170	String repositoryUser = repository.getUserName();
155	String repositoryPassword = repository.getPassword();	171	String repositoryPassword = repository.getPassword();
Lines 159-169 Link Here
159	String queryUrl = evaluateParams(query.getUrl(), queryParameters, repository);	175	String queryUrl = evaluateParams(query.getUrl(), queryParameters, repository);
160	String queryPattern = evaluateParams(webQuery.getQueryPattern(), queryParameters, repository);	176	String queryPattern = evaluateParams(webQuery.getQueryPattern(), queryParameters, repository);
161	String taskPrefix = evaluateParams(webQuery.getTaskPrefix(), queryParameters, repository);	177	String taskPrefix = evaluateParams(webQuery.getTaskPrefix(), queryParameters, repository);
		178	Map<String, String> loginParams = new HashMap<String, String>();
		179	loginParams.put(WebRepositoryConnector.PROPERTY_LOGIN_FORM_URL, evaluateParams(repository
		180	.getProperty(WebRepositoryConnector.PROPERTY_LOGIN_FORM_URL), queryParameters, repository));
		181	loginParams.put(WebRepositoryConnector.PROPERTY_LOGIN_TOKEN_REGEXP, evaluateParams(repository
		182	.getProperty(WebRepositoryConnector.PROPERTY_LOGIN_TOKEN_REGEXP), queryParameters, repository));
		183	loginParams.put(WebRepositoryConnector.PROPERTY_LOGIN_REQUEST_METHOD, evaluateParams(repository
		184	.getProperty(WebRepositoryConnector.PROPERTY_LOGIN_REQUEST_METHOD), queryParameters, repository));
		185	loginParams.put(WebRepositoryConnector.PROPERTY_LOGIN_REQUEST_URL, repository
		186	.getProperty(WebRepositoryConnector.PROPERTY_LOGIN_REQUEST_URL));
162		187
163	try {	188	try {
164	// if (regexp != null && regexp.trim().length() > 0) {	189	// if (regexp != null && regexp.trim().length() > 0) {
165	return performQuery(fetchResource(queryUrl, repositoryUser, repositoryPassword), queryPattern,	190	return performQuery(fetchResource(queryUrl, repositoryUser, repositoryPassword, loginParams,
166	taskPrefix, monitor, resultCollector, repository);	191	queryParameters, repository, repository.getProxy()), queryPattern, taskPrefix, monitor, resultCollector, repository);
167	// } else {	192	// } else {
168	// return performRssQuery(queryUrl, taskPrefix, repositoryUrl,	193	// return performRssQuery(queryUrl, taskPrefix, repositoryUrl,
169	// repositoryUser, repositoryPassword,	194	// repositoryUser, repositoryPassword,
Lines 270-286 Link Here
270	* try { collector.accept(new WebQueryHit(id, id+": "+entry.getTitle(),	295	* try { collector.accept(new WebQueryHit(id, id+": "+entry.getTitle(),
271	* taskPrefix, repositoryUrl)); } catch (CoreException e) { return new	296	* taskPrefix, repositoryUrl)); } catch (CoreException e) { return new
272	* Status(IStatus.ERROR, TasksUiPlugin.PLUGIN_ID, IStatus.ERROR, "Unable	297	* Status(IStatus.ERROR, TasksUiPlugin.PLUGIN_ID, IStatus.ERROR, "Unable
273	* collect results.", e); } } } return Status.OK_STATUS;	298	* collect results.", e); } } } return Status.OK_STATUS; } catch (Exception
274	* } catch (Exception ex) { return new Status(IStatus.OK,	299	* ex) { return new Status(IStatus.OK, TasksUiPlugin.PLUGIN_ID, IStatus.OK,
275	* TasksUiPlugin.PLUGIN_ID, IStatus.OK, "Could not fetch resource: " +	300	* "Could not fetch resource: " + queryUrl, ex); } }
276	* queryUrl, ex); } }
277	*/	301	*/
278		302
279	public static String fetchResource(String url, String user, String password) throws IOException {	303	public static String fetchResource(String url, String user, String password, Map<String, String> loginParams,
		304	Map<String, String> params, TaskRepository repository, Proxy proxySettings) throws IOException {
280	HttpClient client = new HttpClient();	305	HttpClient client = new HttpClient();
281	Proxy proxySettings = TasksUiPlugin.getDefault().getProxySettings();
282	WebClientUtil.setupHttpClient(client, proxySettings, url, user, password);	306	WebClientUtil.setupHttpClient(client, proxySettings, url, user, password);
283		307
		308	if (loginParams != null) {
		309	String loginFormUrl = loginParams.get(PROPERTY_LOGIN_FORM_URL);
		310	if (loginFormUrl != null && !"".equals(loginFormUrl)) {
		311	GetMethod get = new GetMethod(loginFormUrl);
		312	String loginFormPage = null;
		313	try {
		314	client.executeMethod(get);
		315	Header locationHeader = get.getResponseHeader("Location");
		316	if (locationHeader != null) {
		317	get = new GetMethod(locationHeader.getValue());
		318	client.executeMethod(get);
		319	}
		320	Header refreshHeader = get.getResponseHeader("Refresh");
		321	if (refreshHeader != null) {
		322	String value = refreshHeader.getValue();
		323	int n = value.indexOf(";url=");
		324	if (n != -1) {
		325	value = value.substring(n + 5);
		326	int requestPath;
		327	if (value.charAt(0) == '/') {
		328	int colonSlashSlash = url.indexOf("://");
		329	requestPath = url.indexOf('/', colonSlashSlash + 3);
		330	} else {
		331	requestPath = url.lastIndexOf('/');
		332	}
		333
		334	String refreshUrl;
		335	if (requestPath == -1) {
		336	refreshUrl = url + "/" + value;
		337	} else {
		338	refreshUrl = url.substring(0, requestPath + 1) + value;
		339	}
		340
		341	get = new GetMethod(refreshUrl);
		342	client.executeMethod(get);
		343	}
		344	}
		345	loginFormPage = get.getResponseBodyAsString();
		346	} catch (Exception e) {
		347	// ignore
		348	e.printStackTrace();
		349	} finally {
		350	get.releaseConnection();
		351	}
		352	if (loginFormPage != null) {
		353	String loginTokenPattern = loginParams.get(PROPERTY_LOGIN_TOKEN_REGEXP);
		354	if (loginTokenPattern != null && !"".equals(loginTokenPattern)) {
		355	Pattern p = Pattern.compile(loginTokenPattern);
		356	Matcher m = p.matcher(loginFormPage);
		357	if (m.find()) {
		358	// TODO is it ok to modify the params map?
		359	params.put(PARAM_PREFIX + PARAM_LOGIN_TOKEN, m.group(1));
		360	}
		361	}
		362	}
		363	}
		364	HttpMethod method = null;
		365	try {
		366	String loginUrlStr = loginParams.get(PROPERTY_LOGIN_REQUEST_URL);
		367	loginUrlStr = evaluateParams(loginUrlStr, params, repository);
		368	switch (EHttpMethod.valueOf(loginParams.get(PROPERTY_LOGIN_REQUEST_METHOD))) {
		369	case GET:
		370	method = new GetMethod(loginUrlStr);
		371	break;
372	case POST:
373	String query = new URL(loginUrlStr).getQuery();
374	if (query != null) {
375	StringTokenizer tokenizer = new StringTokenizer(query, "&");
376	method = new PostMethod(loginUrlStr.substring(0, loginUrlStr.indexOf(query) - 1));
377	while (tokenizer.hasMoreTokens()) {
378	String nameValuePair = tokenizer.nextToken();
379	String[] nv = nameValuePair.split("=");
380	if (nv.length < 2) {
381	((PostMethod) method).addParameter(nv[0], "");
382	} else {
383	((PostMethod) method).addParameter(nv[0], nv[1]);
384	}
385	}
386	}
387	break;
388	}
389	client.executeMethod(method);
390	} catch (Exception e) {
391	// ignore
392	} finally {
393	if (method != null) {
394	method.releaseConnection();
395	}
396	}
397	}
398
284	GetMethod get = new GetMethod(url);	399	GetMethod get = new GetMethod(url);
285	try {	400	try {
286	client.executeMethod(get);	401	client.executeMethod(get);

Lines 141-146 Link Here

(-)plugin.xml (+50 lines)
141	<attribute name="queryPattern"	141	<attribute name="queryPattern"
142	value="<tr .+?<a href="view.php\?id=(.+?)">.+?<td class="left">(.+?)</td></tr>"/>	142	value="<tr .+?<a href="view.php\?id=(.+?)">.+?<td class="left">(.+?)</td></tr>"/>
143	</repository>	143	</repository>
		144	<repository
		145	anonymous="true"
		146	label="ChangeLogic (anonymous)"
		147	repositoryKind="web"
		148	urlNewTask="${serverUrl}/index.php?event=Add_task"
		149	urlRepository="http://changelogic.araneaframework.org"
		150	urlTask="${serverUrl}/index.php?event=Show_public_task&task_id="
		151	urlTaskQuery="${serverUrl}/index.php?event=Show_public_task_list">
		152	<attribute
		153	name="queryPattern"
		154	value="<a href="index.php\?event\=Show_public_task&amp;task_id\=.+?&amp;project_id\=0">(.+?)</a>.+?</td>.+?<td>.+?</td>.+?<td>.+?</td>.+?<td>.+?</td>.+?<td>(.+?)</td>">
		155	</attribute>
		156	<attribute
		157	name="loginFormUrl"
		158	value="${serverUrl}">
		159	</attribute>
		160	</repository>
		161	<repository
		162	anonymous="false"
		163	label="ChangeLogic (private)"
		164	repositoryKind="web"
		165	urlNewTask="${serverUrl}/index.php?event=Add_task&project_id=${projectId}"
		166	urlRepository="http://changelogic.araneaframework.org"
		167	urlTask="${serverUrl}/index.php?event=Show_task&task_id="
		168	urlTaskQuery="${serverUrl}/index.php?event=Show_task_list&project_id=${projectId}">
		169	<attribute
		170	name="loginFormUrl"
		171	value="${serverUrl}">
		172	</attribute>
		173	<attribute
		174	name="loginTokenPattern"
		175	value="<form name="Login_form" method="POST" action="index.php\?event\=Login&amp;project_id\=0&amp;link_uid\=(\p{Alnum}+?)\"(?:.*?)>">
		176	</attribute>
		177	<attribute
		178	name="loginRequestMethod"
		179	value="POST">
		180	</attribute>
		181	<attribute
		182	name="loginRequestUrl"
		183	value="${serverUrl}/index.php?event=Login&link_uid=${loginToken}&username=${userId}&password=${password}">
		184	</attribute>
		185	<attribute
		186	name="queryPattern"
		187	value="<a href="index.php\?event\=Show_task&amp;task_id\=.+?&amp;project_id\=${projectId}&amp;recent_list_id=.+?">(.+?)</a>.+?</td>.+?<td>.+?</td>.+?<td>.+?</td>.+?<td>.+?</td>.+?<td>.+?</td>.+?<td>(.+?)</td>">
		188	</attribute>
		189	<attribute
		190	name="param_projectId"
		191	value="1">
		192	</attribute>
		193	</repository>
144	</extension>	194	</extension>
145		195
146	</plugin>	196	</plugin>

Added Link Here

(-)src/org/eclipse/mylar/internal/tasks/web/restui/MethodTypeContentProvider.java (+28 lines)
1	/*******************************************************************************
2	* Copyright (c) 2005, 2006 Erkki Lindpere and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Erkki Lindpere - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.mylar.internal.tasks.web.restui;
12
13	import org.eclipse.jface.viewers.IStructuredContentProvider;
14	import org.eclipse.jface.viewers.Viewer;
15
16	public class MethodTypeContentProvider implements IStructuredContentProvider {
17
18	public Object[] getElements(Object inputElement) {
19	return EHttpMethod.values();
20	}
21
22	public void dispose() {
23	}
24
25	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
26	}
27
28	}