You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2016/03/03 16:43:35 UTC
svn commit: r1733485 - in /sling/trunk/tooling/ide:
eclipse-core/src/org/apache/sling/ide/eclipse/core/
eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/
eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/
Author: rombert
Date: Thu Mar 3 15:43:34 2016
New Revision: 1733485
URL: http://svn.apache.org/viewvc?rev=1733485&view=rev
Log:
SLING-5583 - Add defaults to server creation page in the project
creation wizard
Reuse the values from DefaultSlingLaunchpadConfiguration in various
places where they were hardcoded.
Modified:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerDebugPortCommand.java
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPasswordCommand.java
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPortCommand.java
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerUsernameCommand.java
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadConfiguration.java
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/OpenHtmlInBrowserHandler.java
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerDebugPortCommand.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerDebugPortCommand.java?rev=1733485&r1=1733484&r2=1733485&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerDebugPortCommand.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerDebugPortCommand.java Thu Mar 3 15:43:34 2016
@@ -38,7 +38,8 @@ public class SetServerDebugPortCommand e
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- oldValue = server.getAttribute(ISlingLaunchpadServer.PROP_DEBUG_PORT, 30303);
+ oldValue = server.getAttribute(ISlingLaunchpadServer.PROP_DEBUG_PORT,
+ DefaultSlingLaunchpadConfiguration.INSTANCE.getDebugPort());
server.setAttribute(ISlingLaunchpadServer.PROP_DEBUG_PORT, debugPort);
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPasswordCommand.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPasswordCommand.java?rev=1733485&r1=1733484&r2=1733485&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPasswordCommand.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPasswordCommand.java Thu Mar 3 15:43:34 2016
@@ -22,7 +22,7 @@ import org.eclipse.wst.server.core.IServ
public class SetServerPasswordCommand extends SetServerStringPropertyCommand {
public SetServerPasswordCommand(IServerWorkingCopy server, String newValue) {
- super(server, ISlingLaunchpadServer.PROP_PASSWORD, newValue, "admin");
+ super(server, ISlingLaunchpadServer.PROP_PASSWORD, newValue, DefaultSlingLaunchpadConfiguration.INSTANCE.getPassword());
}
}
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPortCommand.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPortCommand.java?rev=1733485&r1=1733484&r2=1733485&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPortCommand.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPortCommand.java Thu Mar 3 15:43:34 2016
@@ -38,7 +38,8 @@ public class SetServerPortCommand extend
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- oldValue = server.getAttribute(ISlingLaunchpadServer.PROP_PORT, 8080);
+ oldValue = server.getAttribute(ISlingLaunchpadServer.PROP_PORT,
+ DefaultSlingLaunchpadConfiguration.INSTANCE.getPort());
server.setAttribute(ISlingLaunchpadServer.PROP_PORT, port);
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerUsernameCommand.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerUsernameCommand.java?rev=1733485&r1=1733484&r2=1733485&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerUsernameCommand.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerUsernameCommand.java Thu Mar 3 15:43:34 2016
@@ -22,7 +22,7 @@ import org.eclipse.wst.server.core.IServ
public class SetServerUsernameCommand extends SetServerStringPropertyCommand {
public SetServerUsernameCommand(IServerWorkingCopy server, String newValue) {
- super(server, ISlingLaunchpadServer.PROP_USERNAME, newValue, "admin");
+ super(server, ISlingLaunchpadServer.PROP_USERNAME, newValue, DefaultSlingLaunchpadConfiguration.INSTANCE.getPassword());
}
}
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadConfiguration.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadConfiguration.java?rev=1733485&r1=1733484&r2=1733485&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadConfiguration.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadConfiguration.java Thu Mar 3 15:43:34 2016
@@ -16,6 +16,7 @@
*/
package org.apache.sling.ide.eclipse.core.internal;
+import org.apache.sling.ide.eclipse.core.DefaultSlingLaunchpadConfiguration;
import org.apache.sling.ide.eclipse.core.ISlingLaunchpadConfiguration;
import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
import org.eclipse.wst.server.core.IServerWorkingCopy;
@@ -36,13 +37,14 @@ public class SlingLaunchpadConfiguration
@Override
public int getPort() {
- // TODO central place for setting defaults
- return workingCopy().getAttribute(ISlingLaunchpadServer.PROP_PORT, 8080);
+ return workingCopy().getAttribute(ISlingLaunchpadServer.PROP_PORT,
+ DefaultSlingLaunchpadConfiguration.INSTANCE.getPort());
}
@Override
public int getDebugPort() {
- return workingCopy().getAttribute(ISlingLaunchpadServer.PROP_DEBUG_PORT, 30303);
+ return workingCopy().getAttribute(ISlingLaunchpadServer.PROP_DEBUG_PORT,
+ DefaultSlingLaunchpadConfiguration.INSTANCE.getDebugPort());
}
private IServerWorkingCopy workingCopy() {
@@ -72,7 +74,8 @@ public class SlingLaunchpadConfiguration
@Override
public String getUsername() {
- return workingCopy().getAttribute(ISlingLaunchpadServer.PROP_USERNAME, "admin");
+ return workingCopy().getAttribute(ISlingLaunchpadServer.PROP_USERNAME,
+ DefaultSlingLaunchpadConfiguration.INSTANCE.getUsername());
}
public void setUsername(String username) {
@@ -81,7 +84,8 @@ public class SlingLaunchpadConfiguration
@Override
public String getPassword() {
- return workingCopy().getAttribute(ISlingLaunchpadServer.PROP_PASSWORD, "admin");
+ return workingCopy().getAttribute(ISlingLaunchpadServer.PROP_PASSWORD,
+ DefaultSlingLaunchpadConfiguration.INSTANCE.getPassword());
}
public void setPassword(String password) {
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java?rev=1733485&r1=1733484&r2=1733485&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java Thu Mar 3 15:43:34 2016
@@ -16,6 +16,7 @@
*/
package org.apache.sling.ide.eclipse.core.internal;
+import org.apache.sling.ide.eclipse.core.DefaultSlingLaunchpadConfiguration;
import org.apache.sling.ide.eclipse.core.ISlingLaunchpadConfiguration;
import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
import org.eclipse.core.runtime.CoreException;
@@ -117,11 +118,11 @@ public class SlingLaunchpadServer extend
@Override
public void setDefaults(IProgressMonitor monitor) {
- setAttribute(PROP_PORT, 8080);
- setAttribute(PROP_DEBUG_PORT, 30303);
+ setAttribute(PROP_PORT, DefaultSlingLaunchpadConfiguration.INSTANCE.getPort());
+ setAttribute(PROP_DEBUG_PORT, DefaultSlingLaunchpadConfiguration.INSTANCE.getDebugPort());
setAttribute(PROP_CONTEXT_PATH, "/");
- setAttribute(PROP_USERNAME, "admin");
- setAttribute(PROP_PASSWORD, "admin");
+ setAttribute(PROP_USERNAME, DefaultSlingLaunchpadConfiguration.INSTANCE.getUsername());
+ setAttribute(PROP_PASSWORD, DefaultSlingLaunchpadConfiguration.INSTANCE.getPassword());
}
@Override
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/OpenHtmlInBrowserHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/OpenHtmlInBrowserHandler.java?rev=1733485&r1=1733484&r2=1733485&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/OpenHtmlInBrowserHandler.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/OpenHtmlInBrowserHandler.java Thu Mar 3 15:43:34 2016
@@ -19,6 +19,7 @@ package org.apache.sling.ide.eclipse.ui.
import java.net.MalformedURLException;
import java.net.URL;
+import org.apache.sling.ide.eclipse.core.DefaultSlingLaunchpadConfiguration;
import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
import org.apache.sling.ide.eclipse.ui.browser.AbstractOpenInBrowserHandler;
import org.apache.sling.ide.eclipse.ui.nav.model.JcrNode;
@@ -28,8 +29,8 @@ public class OpenHtmlInBrowserHandler ex
protected URL getUrlToOpen(JcrNode node, IServer server) throws MalformedURLException {
- return new URL("http", server.getHost(), server.getAttribute(ISlingLaunchpadServer.PROP_PORT, 8080),
- node.getJcrPath() + ".html");
+ return new URL("http", server.getHost(), server.getAttribute(ISlingLaunchpadServer.PROP_PORT,
+ DefaultSlingLaunchpadConfiguration.INSTANCE.getPort()), node.getJcrPath() + ".html");
}
}