summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorMalgorzata Janczarska2011-05-17 10:38:02 (EDT)
committer skaegi2011-05-18 15:20:19 (EDT)
commit86e47ba9f107c2908078e0f1bf3d1d5bb1fbb7cd (patch)
treeb030a92b9c5786cbb39a8b27f611f3206750954e
parent34c12466b3019242b30c062fd271d16e163767fa (diff)
parent1ff19e30a8ab84b1ee771c33096ca853300bdb07 (diff)
downloadorg.eclipse.orion.server-86e47ba9f107c2908078e0f1bf3d1d5bb1fbb7cd.zip
org.eclipse.orion.server-86e47ba9f107c2908078e0f1bf3d1d5bb1fbb7cd.tar.gz
org.eclipse.orion.server-86e47ba9f107c2908078e0f1bf3d1d5bb1fbb7cd.tar.bz2
Merge remote branch 'origin/master'
-rw-r--r--bundles/org.eclipse.orion.server.configurator/plugin.xml24
-rw-r--r--bundles/org.eclipse.orion.server.git/about.html23
-rw-r--r--bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/GitConstants.java14
-rw-r--r--bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/Diff.java55
-rw-r--r--bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/GitCloneHandlerV1.java5
-rw-r--r--bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/GitCommitHandlerV1.java26
-rw-r--r--bundles/org.eclipse.orion.server.hosting/src/org/eclipse/orion/internal/server/hosting/HostedSiteServlet.java2
-rw-r--r--bundles/org.eclipse.orion.server.servlets/src/org/eclipse/orion/internal/server/servlets/file/EditSupportFilter.java4
-rw-r--r--releng/org.eclipse.orion.releng/builder/scripts/closure.xml16
-rw-r--r--releng/org.eclipse.orion.releng/sniff-test/demo-script-1.0-M4.txt4
-rw-r--r--tests/org.eclipse.orion.server.tests/launchConfigurations/All Server Tests.launch10
-rw-r--r--tests/org.eclipse.orion.server.tests/launchConfigurations/One Server Test.launch2
12 files changed, 135 insertions, 50 deletions
diff --git a/bundles/org.eclipse.orion.server.configurator/plugin.xml b/bundles/org.eclipse.orion.server.configurator/plugin.xml
index 326ab97..29d3b6b 100644
--- a/bundles/org.eclipse.orion.server.configurator/plugin.xml
+++ b/bundles/org.eclipse.orion.server.configurator/plugin.xml
@@ -132,7 +132,8 @@
id="org.eclipse.orion.server.configurator.httpcontext.webide">
<resource-mapping
bundle="org.eclipse.orion.client.core"
- path="/static"></resource-mapping>
+ path="/static">
+ </resource-mapping>
<resource-mapping
bundle="org.eclipse.orion.client.git"
path="/static">
@@ -180,28 +181,13 @@
path="/static">
</resource-mapping>
</httpcontext>
- <httpcontext
+ <httpcontext
id="org.eclipse.orion.server.configurator.httpcontext.userprofile">
<resource-mapping
bundle="org.eclipse.orion.client.users.ui"
path="/static/profile">
</resource-mapping>
- <resource-mapping
- bundle="org.eclipse.orion.client.users.ui"
- path="/static/user-profile.css">
- </resource-mapping>
- <resource-mapping bundle="org.eclipse.orion.client.users.ui"
- path="/static/manage-users.html">
- </resource-mapping>
- <resource-mapping
- bundle="org.eclipse.orion.client.users.ui"
- path="/static/manage-users.html">
- </resource-mapping>
- <resource-mapping
- bundle="org.eclipse.orion.client.users.ui"
- path="/static/profile">
- </resource-mapping>
- </httpcontext>
+ </httpcontext>
</extension>
<extension
point="org.eclipse.equinox.http.registry.resources">
@@ -227,7 +213,7 @@
</resource>
<resource
alias="/usersstatic"
- httpcontextId="org.eclipse.orion.server.configurator.httpcontext.useradmin">erprofilr.httpcontext.userprofile">
+ httpcontextId="org.eclipse.orion.server.configurator.httpcontext.useradmin">
</resource>
<resource
alias="/profile"
diff --git a/bundles/org.eclipse.orion.server.git/about.html b/bundles/org.eclipse.orion.server.git/about.html
index f47dbdd..5ba60ff 100644
--- a/bundles/org.eclipse.orion.server.git/about.html
+++ b/bundles/org.eclipse.orion.server.git/about.html
@@ -24,5 +24,28 @@ provided with the Content. If no such license exists, contact the Redistributor
indicated below, the terms and conditions of the EPL still apply to any source code in the Content
and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+<h3>Third Party Content</h3>
+
+<p>The Content includes items that have been sourced from third parties as set out below. If you
+did not receive this Content directly from the Eclipse Foundation, the following is provided
+for informational purposes only, and you should look to the Redistributor's license for
+terms and conditions of use.</p>
+
+<h4>JGit project</h4>
+<p>The plug-in includes software developed by the Eclipse JGit project.</p>
+
+<p>The JGit source code can be found in src.zip in the following file:</p>
+
+<ul>
+ <li>src\org.eclipse.orion.server.git.servlets\Diff.java</li>
+</ul>
+
+<p>Your use of the JGit code is subject to the terms and conditions of the Eclipse Distribution License
+Version 1.0 (&quot;EDL&quot;). A copy of the EDL is available at
+<a href="http://www.eclipse.org/org/documents/edl-v10.html">http://www.eclipse.org/org/documents/edl-v10.html</a>.
+</p>
+
+<small>Java and all Java-based trademarks and logos are trademarks or registered trademarks of Oracle Corporation in the United States and other countries.</small>
+
</body>
</html> \ No newline at end of file
diff --git a/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/GitConstants.java b/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/GitConstants.java
index 05eef34..da61ae1 100644
--- a/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/GitConstants.java
+++ b/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/GitConstants.java
@@ -101,10 +101,24 @@ public class GitConstants {
public static final String KEY_COMMIT_TIME = "Time"; //$NON-NLS-1$
+ public static final String KEY_COMMIT_DIFFS = "Diffs"; //$NON-NLS-1$
+
+ public static final String KEY_COMMIT_DIFF_NEWPATH = "NewPath"; //$NON-NLS-1$
+
+ public static final String KEY_COMMIT_DIFF_OLDPATH = "OldPath"; //$NON-NLS-1$
+
+ public static final String KEY_COMMIT_DIFF_CHANGETYPE = "ChangeType"; //$NON-NLS-1$
+
public static final String KEY_PATH = "Path"; //$NON-NLS-1$
public static final String KEY_AUTHOR_NAME = "AuthorName"; //$NON-NLS-1$
+ public static final String KEY_AUTHOR_EMAIL = "AuthorEmail"; //$NON-NLS-1$
+
+ public static final String KEY_COMMITTER_NAME = "CommitterName"; //$NON-NLS-1$
+
+ public static final String KEY_COMMITTER_EMAIL = "CommitterEmail"; //$NON-NLS-1$
+
public static final String KEY_FETCH = "Fetch"; //$NON-NLS-1$
public static final String KEY_MERGE = "Merge"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/Diff.java b/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/Diff.java
index 3e5cd92..456df8b 100644
--- a/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/Diff.java
+++ b/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/Diff.java
@@ -1,13 +1,48 @@
-/*******************************************************************************
- * Copyright (c) 2011 IBM Corporation 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:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
+/*
+ * Copyright (C) 2009, Christian Halstrick <christian.halstrick@sap.com>
+ * Copyright (C) 2009, Johannes E. Schindelin
+ * Copyright (C) 2009, Johannes Schindelin <johannes.schindelin@gmx.de>
+ * Copyright (C) 2011, IBM Corporation
+ * and other copyright owners as documented in the project's IP log.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Distribution License v1.0 which
+ * accompanies this distribution, is reproduced below, and is
+ * available at http://www.eclipse.org/org/documents/edl-v10.php
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * - Neither the name of the Eclipse Foundation, Inc. nor the
+ * names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
package org.eclipse.orion.server.git.servlets;
import static org.eclipse.jgit.lib.Constants.HEAD;
diff --git a/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/GitCloneHandlerV1.java b/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/GitCloneHandlerV1.java
index b7ff753..ccc8d39 100644
--- a/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/GitCloneHandlerV1.java
+++ b/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/GitCloneHandlerV1.java
@@ -81,7 +81,10 @@ public class GitCloneHandlerV1 extends ServletResourceHandler<String> {
clone.setId(path.removeFirstSegments(1).toString());
WebProject webProject = WebProject.fromId(path.segment(1));
clone.setContentLocation(webProject.getProjectStore().getFileStore(path.removeFirstSegments(2)).toURI());
- clone.setName(path.segmentCount() > 2 ? path.lastSegment() : webProject.getName());
+ String cloneName = path.segmentCount() > 2 ? path.lastSegment() : webProject.getName();
+ if (!validateCloneName(cloneName, request, response))
+ return true;
+ clone.setName(cloneName);
// prepare creds
String username = toAdd.optString(GitConstants.KEY_USERNAME, null);
diff --git a/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/GitCommitHandlerV1.java b/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/GitCommitHandlerV1.java
index f4cb144..aa587ce 100644
--- a/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/GitCommitHandlerV1.java
+++ b/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/GitCommitHandlerV1.java
@@ -23,6 +23,7 @@ import org.eclipse.core.runtime.*;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.MergeResult;
import org.eclipse.jgit.api.errors.*;
+import org.eclipse.jgit.diff.DiffEntry;
import org.eclipse.jgit.errors.AmbiguousObjectException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.lib.*;
@@ -244,9 +245,34 @@ public class GitCommitHandlerV1 extends ServletResourceHandler<String> {
commit.put(GitConstants.KEY_DIFF, createDiffLocation(baseLocation, revCommit.getName()));
commit.put(ProtocolConstants.KEY_NAME, revCommit.getName());
commit.put(GitConstants.KEY_AUTHOR_NAME, revCommit.getAuthorIdent().getName());
+ commit.put(GitConstants.KEY_AUTHOR_EMAIL, revCommit.getAuthorIdent().getEmailAddress());
+ commit.put(GitConstants.KEY_COMMITTER_NAME, revCommit.getCommitterIdent().getName());
+ commit.put(GitConstants.KEY_COMMITTER_EMAIL, revCommit.getCommitterIdent().getEmailAddress());
commit.put(GitConstants.KEY_COMMIT_TIME, ((long) revCommit.getCommitTime()) * 1000 /* time in milliseconds */);
commit.put(GitConstants.KEY_COMMIT_MESSAGE, revCommit.getFullMessage());
commit.put(ProtocolConstants.KEY_CHILDREN, toJSON(getTagsForCommit(db, revCommit)));
+
+ if (revCommit.getParentCount() > 0) {
+ JSONArray diffs = new JSONArray();
+
+ final TreeWalk tw = new TreeWalk(db);
+ tw.reset(revCommit.getParent(0).getTree(), revCommit.getTree());
+ tw.setRecursive(true);
+ tw.setFilter(TreeFilter.ANY_DIFF);
+
+ List<DiffEntry> l = DiffEntry.scan(tw);
+ for (DiffEntry entr : l) {
+ JSONObject diff = new JSONObject();
+ diff.put(GitConstants.KEY_COMMIT_DIFF_NEWPATH, entr.getNewPath());
+ diff.put(GitConstants.KEY_COMMIT_DIFF_OLDPATH, entr.getOldPath());
+ diff.put(GitConstants.KEY_COMMIT_DIFF_CHANGETYPE, entr.getChangeType().toString());
+ diffs.put(diff);
+ }
+ tw.release();
+
+ commit.put(GitConstants.KEY_COMMIT_DIFFS, diffs);
+ }
+
return commit;
}
diff --git a/bundles/org.eclipse.orion.server.hosting/src/org/eclipse/orion/internal/server/hosting/HostedSiteServlet.java b/bundles/org.eclipse.orion.server.hosting/src/org/eclipse/orion/internal/server/hosting/HostedSiteServlet.java
index 493f745..6ce8a6a 100644
--- a/bundles/org.eclipse.orion.server.hosting/src/org/eclipse/orion/internal/server/hosting/HostedSiteServlet.java
+++ b/bundles/org.eclipse.orion.server.hosting/src/org/eclipse/orion/internal/server/hosting/HostedSiteServlet.java
@@ -207,7 +207,7 @@ public class HostedSiteServlet extends OrionServlet {
}
private void addEditHeaders(HttpServletResponse resp, IHostedSite site, IPath path) {
- resp.addHeader("X-Edit-Server", site.getEditServerUrl() + "/coding.html#"); //$NON-NLS-1$ //$NON-NLS-2$
+ resp.addHeader("X-Edit-Server", site.getEditServerUrl() + "/edit/edit.html#"); //$NON-NLS-1$ //$NON-NLS-2$
resp.addHeader("X-Edit-Token", FILE_SERVLET_ALIAS + path.toString()); //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.orion.server.servlets/src/org/eclipse/orion/internal/server/servlets/file/EditSupportFilter.java b/bundles/org.eclipse.orion.server.servlets/src/org/eclipse/orion/internal/server/servlets/file/EditSupportFilter.java
index dafcd2b..76d372a 100644
--- a/bundles/org.eclipse.orion.server.servlets/src/org/eclipse/orion/internal/server/servlets/file/EditSupportFilter.java
+++ b/bundles/org.eclipse.orion.server.servlets/src/org/eclipse/orion/internal/server/servlets/file/EditSupportFilter.java
@@ -32,13 +32,13 @@ public class EditSupportFilter implements Filter {
if (requestURI.startsWith(FILE_SERVLET_ALIAS)) {
String host = getHost(httpRequest);
- httpResponse.addHeader("X-Edit-Server", host + "/coding.html#"); //$NON-NLS-1$ //$NON-NLS-2$
+ httpResponse.addHeader("X-Edit-Server", host + "/edit/edit.html#"); //$NON-NLS-1$ //$NON-NLS-2$
httpResponse.addHeader("X-Edit-Token", requestURI); //$NON-NLS-1$
} else {
String selfHostPath = System.getProperty("org.eclipse.orion.server.core.selfHostPath"); //$NON-NLS-1$
if (selfHostPath != null) {
String host = getHost(httpRequest);
- httpResponse.addHeader("X-Edit-Server", host + "/coding.html#"); //$NON-NLS-1$ //$NON-NLS-2$
+ httpResponse.addHeader("X-Edit-Server", host + "/edit/edit.html#"); //$NON-NLS-1$ //$NON-NLS-2$
httpResponse.addHeader("X-Edit-Token", FILE_SERVLET_ALIAS + selfHostPath + requestURI); //$NON-NLS-1$
}
}
diff --git a/releng/org.eclipse.orion.releng/builder/scripts/closure.xml b/releng/org.eclipse.orion.releng/builder/scripts/closure.xml
index 08a748c..c0ca6bc 100644
--- a/releng/org.eclipse.orion.releng/builder/scripts/closure.xml
+++ b/releng/org.eclipse.orion.releng/builder/scripts/closure.xml
@@ -44,7 +44,7 @@
<mkdir dir="${output}"/>
<closure dir="${orion.client.core}" compiled="navigate-table.js" >
<replace-in>
- <include name="navigate-table.html" />
+ <include name="navigate/table.html" />
</replace-in>
<closure-args>
<arg value="--js=${orion.client.core}/js/auth.js" />
@@ -77,7 +77,7 @@
<closure dir="${orion.client.core}" compiled="coding-editor.js" >
<replace-in>
- <include name="coding.html" />
+ <include name="edit/edit.html" />
</replace-in>
<closure-args>
<arg value="--js=${orion.client.editor}/samples/styler.js" />
@@ -119,7 +119,7 @@
<target name="oldClosure">
<closure dir="${orion.client.core}" compiled="navigate-tree.js" >
<replace-in>
- <include name="navigate-tree.html" />
+ <include name="navigate/tree.html" />
</replace-in>
<closure-args>
<arg value="--js=${orion.client.core}/js/globalCommands.js" />
@@ -132,7 +132,7 @@
<closure dir="${orion.client.core}" compiled="coding-editor.js" >
<replace-in>
- <include name="coding.html" />
+ <include name="edit/edit.html" />
</replace-in>
<closure-args>
<arg value="--js=${orion.client.editor}/samples/styler.js" />
@@ -145,7 +145,7 @@
<closure dir="${orion.client.core}" compiled="coding-editor-container.js" >
<replace-in>
- <include name="coding.html" />
+ <include name="edit/edit.html" />
</replace-in>
<closure-args>
<arg value="--js=${orion.client.core}/js/editorFeatures.js" />
@@ -158,9 +158,9 @@
<closure dir="${orion.client.core}" compiled="eas.js" >
<replace-in>
- <include name="coding.html" />
- <include name="navigate-table.html" />
- <include name="navigate-tree.html" />
+ <include name="edit/edit.html" />
+ <include name="navigate/table.html" />
+ <include name="navigate/tree.html" />
</replace-in>
<closure-args>
<arg value="--js=${orion.client.core}/js/util.js" />
diff --git a/releng/org.eclipse.orion.releng/sniff-test/demo-script-1.0-M4.txt b/releng/org.eclipse.orion.releng/sniff-test/demo-script-1.0-M4.txt
index 30874d1..b07d74b 100644
--- a/releng/org.eclipse.orion.releng/sniff-test/demo-script-1.0-M4.txt
+++ b/releng/org.eclipse.orion.releng/sniff-test/demo-script-1.0-M4.txt
@@ -11,7 +11,7 @@
- create username/password
- login using username/password
-2. You should have been directed to navigate-table.html unless you had already set up the
+2. You should have been directed to /navigate/table.html unless you had already set up the
tree view as your default navigation view.
3. Create a project
4. Create a folder
@@ -39,7 +39,7 @@
folder structure and ensure that breadcrumbs can be used to move back up. In tree-view, you can
navigate the tree deeply using a previously stored favorite or by typing a path in the URL for
the page, such as
- http://localhost:8080/navigate-tree.html#/file/UGEcINDiAB8bJO_Yskwmnw/static/js?depth=1
+ http://localhost:8080/navigate/tree.html#/file/UGEcINDiAB8bJO_Yskwmnw/static/js?depth=1
13. Use favorites:
- Select a folder and click "Make Favorite" in context menu
- Rename the favorite
diff --git a/tests/org.eclipse.orion.server.tests/launchConfigurations/All Server Tests.launch b/tests/org.eclipse.orion.server.tests/launchConfigurations/All Server Tests.launch
index 11416e9..bf79a9f 100644
--- a/tests/org.eclipse.orion.server.tests/launchConfigurations/All Server Tests.launch
+++ b/tests/org.eclipse.orion.server.tests/launchConfigurations/All Server Tests.launch
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<?xml version="1.0" encoding="UTF-8"?><launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
<setAttribute key="additional_plugins"/>
<booleanAttribute key="append.args" value="true"/>
<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
@@ -28,12 +27,12 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/sun6u22"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Java60"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.orion.server.tests.AllServerTests"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.orion.server.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx768m &#13;&#10;-Dorg.eclipse.equinox.http.jetty.http.port=8080 &#13;&#10;-Dlogback.configurationFile=${workspace_loc:org.eclipse.orion.server.logback.config}/logback.xml&#13;&#10;-Dorion.tests.authtype=Basic&#13;&#10;-Dorg.eclipse.orion.server.core.userArea=${workspace_loc}/../junit-workspace/.userarea"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx768m &#13;&#10;-Dorg.eclipse.equinox.http.jetty.http.port=8080 &#13;&#10;-Dlogback.configurationFile=${workspace_loc:org.eclipse.orion.server.logback.config}/logback.xml&#13;&#10;-Dorion.tests.authtype=Basic"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
@@ -43,7 +42,6 @@
<setEntry value="org.eclipse.orion.server.authentication.feature:default"/>
<setEntry value="org.eclipse.orion.server.feature:default"/>
<setEntry value="org.eclipse.orion.server.search.feature:default"/>
-<setEntry value="org.eclipse.orion.server.tests:default"/>
</setAttribute>
<stringAttribute key="selected_target_plugins" value="org.apache.commons.el@default:default,javax.servlet.jsp@default:default,org.eclipse.text@default:default,org.apache.jasper@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.ant.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.jobs@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.registry@default:default,org.junit@default:default,org.eclipse.core.commands@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.net@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.security@default:default,com.ibm.icu@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.app@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.resources@default:default,org.mortbay.jetty.server@default:default,org.eclipse.jdt.core@default:default,org.hamcrest.core@default:default,org.apache.ant@default:default,org.eclipse.core.contenttype@default:default,javax.servlet@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.team.core@default:default,org.eclipse.osgi.services@default:default,org.apache.commons.logging@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.equinox.preferences@default:default,org.mortbay.jetty.util@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.apache.jackrabbit.jackrabbit-jcr-tests@default:default,org.apache.commons.dbcp@default:default,org.apache.tika.core@default:default,org.apache.commons.chain@default:default,org.eclipse.orion.server.configurator@default:default,org.apache.commons.pool@default:default,org.apache.commons.collections@default:default,net.sf.cglib@default:default,ch.qos.logback.core@default:default,org.apache.jackrabbit.jackrabbit-core@default:default,ch.qos.logback.slf4j@default:false,org.slf4j.api@default:default,org.apache.jackrabbit.jackrabbit-jcr-commons@default:default,org.apache.log4j@default:default,ch.qos.logback.classic@default:default,org.apache.jackrabbit.jackrabbit-api@default:default,javax.jta@default:default,org.eclipse.orion.server.core@default:default,org.apache.jackrabbit.jackrabbit-spi@default:default,org.apache.commons.io@default:default,javax.servlet@default:default,edu.oswego.cs.dl.util.concurrent@default:default,org.json@default:default,org.dojotoolkit@default:default,jline@default:default,javax.jcr@default:default,org.apache.commons.digester@default:default,org.apache.geronimo.j2ee.connector@default:default,org.eclipse.orion.server.servlets@default:default,org.apache.jackrabbit.jackrabbit-spi-commons@default:default,org.apache.derby@default:default,org.apache.commons.fileupload@default:default"/>
@@ -54,4 +52,4 @@
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="false"/>
<booleanAttribute key="useProduct" value="false"/>
-</launchConfiguration>
+</launchConfiguration> \ No newline at end of file
diff --git a/tests/org.eclipse.orion.server.tests/launchConfigurations/One Server Test.launch b/tests/org.eclipse.orion.server.tests/launchConfigurations/One Server Test.launch
index 6a6871b..bfbc200 100644
--- a/tests/org.eclipse.orion.server.tests/launchConfigurations/One Server Test.launch
+++ b/tests/org.eclipse.orion.server.tests/launchConfigurations/One Server Test.launch
@@ -32,7 +32,7 @@
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.orion.server.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx768m &#13;&#10;-Dorg.eclipse.equinox.http.jetty.http.port=8080 &#13;&#10;-Dlogback.configurationFile=${workspace_loc:org.eclipse.orion.server.logback.config}/logback.xml&#13;&#10;-Dorion.tests.authtype=Basic&#13;&#10;-Dorg.eclipse.orion.server.core.userArea=${workspace_loc}/../junit-workspace/.userarea"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx768m &#13;&#10;-Dorg.eclipse.equinox.http.jetty.http.port=8080 &#13;&#10;-Dlogback.configurationFile=${workspace_loc:org.eclipse.orion.server.logback.config}/logback.xml&#13;&#10;-Dorion.tests.authtype=Basic"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>