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 2013/07/19 17:06:24 UTC
svn commit: r1504909 - in /sling/whiteboard/asanso/plugins/eclipse:
eclipse-core/ eclipse-core/META-INF/ eclipse-core/src/org/apache/sling/ide/
eclipse-core/src/org/apache/sling/ide/eclipse/
eclipse-core/src/org/apache/sling/ide/eclipse/core/ eclipse-c...
Author: rombert
Date: Fri Jul 19 15:06:23 2013
New Revision: 1504909
URL: http://svn.apache.org/r1504909
Log:
SLING-2973 - [Tooling] Align Eclipse tooling to proposed structure
Split classes and extension point configuration between eclipse-core and
eclipse-ui bundles.
Added:
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/plugin.xml
- copied, changed from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/plugin.xml
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ISlingLaunchpadConfiguration.java
- copied, changed from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadRuntime.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ISlingLaunchpadServer.java
- copied, changed from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetInstallDelegate.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServerUtil.java (with props)
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerContextPathCommand.java (contents, props changed)
- copied, changed from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SetServerContextPathCommand.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPasswordCommand.java (contents, props changed)
- copied, changed from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SetServerPasswordCommand.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPortCommand.java (contents, props changed)
- copied, changed from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerPortCommand.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerUsernameCommand.java (contents, props changed)
- copied, changed from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SetServerUsernameCommand.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SetServerStringPropertyCommand.java (contents, props changed)
- copied, changed from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerStringPropertyCommand.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetInstallDelegate.java (contents, props changed)
- copied, changed from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetInstallDelegate.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetUninstallDelegate.java (contents, props changed)
- copied, changed from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetUninstallDelegate.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java (contents, props changed)
- copied, changed from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java (contents, props changed)
- copied, changed from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadConfiguration.java (contents, props changed)
- copied, changed from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadConfiguration.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationDelegate.java (contents, props changed)
- copied, changed from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationDelegate.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchableAdapterDelegate.java (contents, props changed)
- copied, changed from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchableAdapterDelegate.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadRuntime.java (contents, props changed)
- copied, changed from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadRuntime.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadServer.java (contents, props changed)
- copied, changed from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadServer.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.java (contents, props changed)
- copied, changed from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationTabGroup.java
Removed:
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SetServerContextPathCommand.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SetServerPasswordCommand.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SetServerUsernameCommand.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetInstallDelegate.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetUninstallDelegate.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadConfiguration.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationDelegate.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationTabGroup.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchableAdapterDelegate.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadRuntime.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadServer.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerPortCommand.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerStringPropertyCommand.java
Modified:
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/META-INF/MANIFEST.MF
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/build.properties
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/plugin.xml
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ConnectionEditorSection.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportWizard.java
Modified: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/META-INF/MANIFEST.MF?rev=1504909&r1=1504908&r2=1504909&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/META-INF/MANIFEST.MF (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/META-INF/MANIFEST.MF Fri Jul 19 15:06:23 2013
@@ -11,8 +11,18 @@ Bundle-RequiredExecutionEnvironment: Jav
Bundle-ClassPath: .
Import-Package: org.apache.sling.ide.serialization,
org.apache.sling.slingclipse.api,
+ org.eclipse.core.commands,
+ org.eclipse.core.commands.operations,
+ org.eclipse.core.resources,
+ org.eclipse.debug.core,
+ org.eclipse.jdt.launching,
org.eclipse.osgi.service.debug;version="1.2.0",
+ org.eclipse.wst.common.project.facet.core,
+ org.eclipse.wst.server.core,
+ org.eclipse.wst.server.core.model,
+ org.eclipse.wst.server.core.util,
org.osgi.service.component;version="1.1.0"
-Export-Package: org.apache.sling.slingclipse,
+Export-Package: org.apache.sling.ide.eclipse.core,
+ org.apache.sling.slingclipse,
org.apache.sling.slingclipse.helper
Service-Component: OSGI-INF/Tracer.xml
Modified: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/build.properties
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/build.properties?rev=1504909&r1=1504908&r2=1504909&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/build.properties (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/build.properties Fri Jul 19 15:06:23 2013
@@ -2,7 +2,8 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
OSGI-INF/,\
- .options
+ .options,\
+ plugin.xml
jars.compile.order = .,\
commons-httpclient.jar
source.. = src/
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/plugin.xml (from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/plugin.xml)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/plugin.xml?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/plugin.xml&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/plugin.xml&r1=1504908&r2=1504909&rev=1504909&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/plugin.xml (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/plugin.xml Fri Jul 19 15:06:23 2013
@@ -124,118 +124,4 @@
runtime-component="org.apache.sling.launchpad"
version="1.0"/>
</extension>
-
- <!-- Define the launch configuration's tab group -->
- <extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
- <launchConfigurationTabGroup
- id="org.apache.sling.ide.eclipse.launchpad.launchConfigurationTabGroup"
- type="org.apache.sling.ide.eclipse.launchpad.launchConfigurationType"
- class="org.apache.sling.ide.eclipse.wst.internal.SlingLaunchpadLaunchConfigurationTabGroup">
- </launchConfigurationTabGroup>
- </extension>
-
-
- <!-- Define images -->
- <!-- TODO move to ui bundle -->
- <extension point="org.eclipse.wst.server.ui.serverImages">
- <image
- icon="icons/obj16/sling.gif"
- typeIds="org.apache.sling.launchpad.server"/>
- <image
- icon="icons/obj16/sling.gif"
- typeIds="sling.content"/>
- </extension>
-
- <!-- Define the editor section(s) we contribute to the WST UI -->
- <extension point="org.eclipse.wst.server.ui.editorPageSections">
- <section
- id="org.apache.sling.ide.eclipse.configuration.editor.port"
- order="10"
- insertionId="org.eclipse.wst.server.editor.overview.right"
- typeIds="org.apache.sling.launchpad.server"
- class="org.apache.sling.ide.eclipse.wst.ui.internal.ConnectionEditorSection">
- </section>
- </extension>
-
- <!-- Runtime images -->
- <extension point="org.eclipse.wst.common.project.facet.ui.images">
- <image runtime-component-type="org.apache.sling.launchpad"
- path="icons/obj16/sling.gif"/>
- </extension>
-
- <!-- Menu contributions -->
- <extension
- point="org.eclipse.ui.popupMenus">
- <!-- All Sling contributions -->
- <objectContribution
- id="org.apache.sling.slingclipse.slingMenu"
- objectClass="org.eclipse.core.resources.IProject">
- <menu id="org.apache.sling.slingclipse.slingMenu"
- path="additions"
- label="Sling">
- <groupMarker name="sling"/>
- </menu>
- </objectContribution>
- <!-- Import.
- I prefer to do this outside the import wizard section since I can restrict the destination -->
- <objectContribution id="org.apache.sling.slingclipse.slingImport"
- objectClass="org.eclipse.core.resources.IProject">
-
- <action
- class="org.apache.sling.ide.eclipse.wst.ui.internal.ImportContentAction"
- id="org.apache.sling.slingclipse.importContentAction"
- label="Import Content..."
- menubarPath="org.apache.sling.slingclipse.slingMenu/sling"
- style="push">
- </action>
- <visibility>
- <objectState
- name="open"
- value="true">
- </objectState>
- </visibility>
- <enablement>
- <test
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="sling.content"/>
- </enablement>
- </objectContribution>
- </extension>
-
- <!-- Property page for project to select directory to sync -->
- <extension point="org.eclipse.ui.propertyPages">
- <page
- id="org.apache.sling.ide.eclipse.projectPropertyPage"
- name="Sling"
- class="org.apache.sling.ide.eclipse.wst.ui.internal.SlingProjectPropertyPage" >
- <enabledWhen>
- <and>
- <instanceof
- value="org.eclipse.core.resources.IProject">
- </instanceof>
- <test
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="sling.content"/>
- </and>
- </enabledWhen>
- </page>
- </extension>
-
-<!--
- <extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
- <launchConfigurationTypeImage
- id="org.eclipse.wst.server.preview.launchConfigurationTypeImage"
- configTypeID="org.eclipse.wst.server.preview.launchConfigurationType"
- icon="icons/obj16/preview.gif">
- </launchConfigurationTypeImage>
- </extension>
-
- <extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
- <launchConfigurationTabGroup
- id="org.eclipse.wst.server.preview.launchConfigurationTabGroup"
- type="org.eclipse.wst.server.preview.launchConfigurationType"
- class="org.eclipse.wst.server.preview.adapter.internal.ui.PreviewLaunchConfigurationTabGroup">
- </launchConfigurationTabGroup>
- </extension>
- -->
</plugin>
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ISlingLaunchpadConfiguration.java (from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadRuntime.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ISlingLaunchpadConfiguration.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ISlingLaunchpadConfiguration.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadRuntime.java&r1=1504908&r2=1504909&rev=1504909&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadRuntime.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ISlingLaunchpadConfiguration.java Fri Jul 19 15:06:23 2013
@@ -14,17 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.eclipse.wst.internal;
+package org.apache.sling.ide.eclipse.core;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.server.core.model.RuntimeDelegate;
-
-public class SlingLaunchpadRuntime extends RuntimeDelegate {
-
- @Override
- public IStatus validate() {
- // TODO stub
- return Status.OK_STATUS;
- }
-}
+public interface ISlingLaunchpadConfiguration {
+
+ int getPort();
+
+ String getContextPath();
+
+ String getUsername();
+
+ String getPassword();
+
+}
\ No newline at end of file
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ISlingLaunchpadServer.java (from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetInstallDelegate.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ISlingLaunchpadServer.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ISlingLaunchpadServer.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetInstallDelegate.java&r1=1504908&r2=1504909&rev=1504909&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetInstallDelegate.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ISlingLaunchpadServer.java Fri Jul 19 15:06:23 2013
@@ -14,21 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.eclipse.wst.internal;
+package org.apache.sling.ide.eclipse.core;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class SlingContentFacetInstallDelegate implements IDelegate {
-
- @Override
- public void execute(IProject project, IProjectFacetVersion facetVersion, Object config, IProgressMonitor monitor)
- throws CoreException {
+public interface ISlingLaunchpadServer {
- // nothing for now
- }
+ public static final int PUBLISH_STATE_NEVER = 1;
+ public static final int PUBLISH_STATE_RESOURCE_CHANGE = 2;
+ public static final int PUBLISH_STATE_BUILD_EVENT = 3;
+ public static final String PROP_PASSWORD = "launchpad.password";
+ public static final String PROP_USERNAME = "launchpad.username";
+ public static final String PROP_CONTEXT_PATH = "launchpad.contextPath";
+ public static final String PROP_PORT = "launchpad.port";
+
+ void setPublishState(int publishState);
+
+ int getPublishState();
+
+ ISlingLaunchpadConfiguration getConfiguration();
}
Added: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServerUtil.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServerUtil.java?rev=1504909&view=auto
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServerUtil.java (added)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServerUtil.java Fri Jul 19 15:06:23 2013
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+package org.apache.sling.ide.eclipse.core;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.apache.sling.ide.eclipse.wst.internal.SlingLaunchpadServer;
+import org.apache.sling.slingclipse.SlingclipsePlugin;
+import org.apache.sling.slingclipse.api.Repository;
+import org.apache.sling.slingclipse.api.RepositoryInfo;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.wst.server.core.IServer;
+
+public abstract class ServerUtil {
+
+ public static Repository getRepository(IServer server, IProgressMonitor monitor) {
+
+ ISlingLaunchpadServer launchpadServer = (ISlingLaunchpadServer) server.loadAdapter(SlingLaunchpadServer.class,
+ monitor);
+
+ ISlingLaunchpadConfiguration configuration = launchpadServer.getConfiguration();
+
+ Repository repository = SlingclipsePlugin.getDefault().getRepository();
+ try {
+ // TODO configurable scheme?
+ URI uri = new URI("http", null, server.getHost(), configuration.getPort(), configuration.getContextPath(),
+ null, null);
+ RepositoryInfo repositoryInfo = new RepositoryInfo(configuration.getUsername(),
+ configuration.getPassword(), uri.toString());
+ repository.setRepositoryInfo(repositoryInfo);
+ } catch (URISyntaxException e) {
+ // TODO handle error
+ }
+ return repository;
+ }
+
+ private ServerUtil() {
+
+ }
+}
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServerUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServerUtil.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerContextPathCommand.java (from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SetServerContextPathCommand.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerContextPathCommand.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerContextPathCommand.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SetServerContextPathCommand.java&r1=1504908&r2=1504909&rev=1504909&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SetServerContextPathCommand.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerContextPathCommand.java Fri Jul 19 15:06:23 2013
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.eclipse.wst.internal;
+package org.apache.sling.ide.eclipse.core;
-import org.apache.sling.ide.eclipse.wst.ui.internal.SetServerStringPropertyCommand;
+import org.apache.sling.ide.eclipse.wst.internal.SetServerStringPropertyCommand;
import org.eclipse.wst.server.core.IServerWorkingCopy;
public class SetServerContextPathCommand extends SetServerStringPropertyCommand {
public SetServerContextPathCommand(IServerWorkingCopy server, String newValue) {
- super(server, SlingLaunchpadServer.PROP_CONTEXT_PATH, newValue, "/");
+ super(server, ISlingLaunchpadServer.PROP_CONTEXT_PATH, newValue, "/");
}
}
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerContextPathCommand.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerContextPathCommand.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPasswordCommand.java (from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SetServerPasswordCommand.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPasswordCommand.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPasswordCommand.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SetServerPasswordCommand.java&r1=1504908&r2=1504909&rev=1504909&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SetServerPasswordCommand.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPasswordCommand.java Fri Jul 19 15:06:23 2013
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.eclipse.wst.internal;
+package org.apache.sling.ide.eclipse.core;
-import org.apache.sling.ide.eclipse.wst.ui.internal.SetServerStringPropertyCommand;
+import org.apache.sling.ide.eclipse.wst.internal.SetServerStringPropertyCommand;
import org.eclipse.wst.server.core.IServerWorkingCopy;
public class SetServerPasswordCommand extends SetServerStringPropertyCommand {
public SetServerPasswordCommand(IServerWorkingCopy server, String newValue) {
- super(server, SlingLaunchpadServer.PROP_PASSWORD, newValue, "admin");
+ super(server, ISlingLaunchpadServer.PROP_PASSWORD, newValue, "admin");
}
}
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPasswordCommand.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPasswordCommand.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPortCommand.java (from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerPortCommand.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPortCommand.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPortCommand.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerPortCommand.java&r1=1504908&r2=1504909&rev=1504909&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerPortCommand.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPortCommand.java Fri Jul 19 15:06:23 2013
@@ -14,9 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.eclipse.wst.ui.internal;
+package org.apache.sling.ide.eclipse.core;
-import org.apache.sling.ide.eclipse.wst.internal.SlingLaunchpadServer;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.operations.AbstractOperation;
import org.eclipse.core.runtime.IAdaptable;
@@ -39,9 +38,9 @@ public class SetServerPortCommand extend
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- oldValue = server.getAttribute(SlingLaunchpadServer.PROP_PORT, 8080);
+ oldValue = server.getAttribute(ISlingLaunchpadServer.PROP_PORT, 8080);
- server.setAttribute(SlingLaunchpadServer.PROP_PORT, port);
+ server.setAttribute(ISlingLaunchpadServer.PROP_PORT, port);
return Status.OK_STATUS;
}
@@ -65,7 +64,7 @@ public class SetServerPortCommand extend
*/
@Override
public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- server.setAttribute(SlingLaunchpadServer.PROP_PORT, oldValue);
+ server.setAttribute(ISlingLaunchpadServer.PROP_PORT, oldValue);
return Status.OK_STATUS;
}
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPortCommand.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPortCommand.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerUsernameCommand.java (from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SetServerUsernameCommand.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerUsernameCommand.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerUsernameCommand.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SetServerUsernameCommand.java&r1=1504908&r2=1504909&rev=1504909&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SetServerUsernameCommand.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerUsernameCommand.java Fri Jul 19 15:06:23 2013
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.eclipse.wst.internal;
+package org.apache.sling.ide.eclipse.core;
-import org.apache.sling.ide.eclipse.wst.ui.internal.SetServerStringPropertyCommand;
+import org.apache.sling.ide.eclipse.wst.internal.SetServerStringPropertyCommand;
import org.eclipse.wst.server.core.IServerWorkingCopy;
public class SetServerUsernameCommand extends SetServerStringPropertyCommand {
public SetServerUsernameCommand(IServerWorkingCopy server, String newValue) {
- super(server, SlingLaunchpadServer.PROP_USERNAME, newValue, "admin");
+ super(server, ISlingLaunchpadServer.PROP_USERNAME, newValue, "admin");
}
}
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerUsernameCommand.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerUsernameCommand.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SetServerStringPropertyCommand.java (from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerStringPropertyCommand.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SetServerStringPropertyCommand.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SetServerStringPropertyCommand.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerStringPropertyCommand.java&r1=1504908&r2=1504909&rev=1504909&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SetServerStringPropertyCommand.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SetServerStringPropertyCommand.java Fri Jul 19 15:06:23 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.eclipse.wst.ui.internal;
+package org.apache.sling.ide.eclipse.wst.internal;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.operations.AbstractOperation;
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SetServerStringPropertyCommand.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SetServerStringPropertyCommand.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetInstallDelegate.java (from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetInstallDelegate.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetInstallDelegate.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetInstallDelegate.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetInstallDelegate.java&r1=1504908&r2=1504909&rev=1504909&view=diff
==============================================================================
(empty)
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetInstallDelegate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetInstallDelegate.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetUninstallDelegate.java (from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetUninstallDelegate.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetUninstallDelegate.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetUninstallDelegate.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetUninstallDelegate.java&r1=1504908&r2=1504909&rev=1504909&view=diff
==============================================================================
(empty)
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetUninstallDelegate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetUninstallDelegate.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java (from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java&r1=1504908&r2=1504909&rev=1504909&view=diff
==============================================================================
(empty)
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java (from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java&r1=1504908&r2=1504909&rev=1504909&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java Fri Jul 19 15:06:23 2013
@@ -23,6 +23,7 @@ import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.Map;
+import org.apache.sling.ide.eclipse.core.ServerUtil;
import org.apache.sling.ide.serialization.SerializationManager;
import org.apache.sling.slingclipse.SlingclipsePlugin;
import org.apache.sling.slingclipse.api.Command;
@@ -65,7 +66,7 @@ public class SlingLaunchpadBehaviour ext
boolean success = false;
Result<String> result = null;
- Command<String> command = getRepository(monitor).newListChildrenNodeCommand("/", ResponseType.XML);
+ Command<String> command = ServerUtil.getRepository(getServer(), monitor).newListChildrenNodeCommand("/", ResponseType.XML);
result = command.execute();
success = result.isSuccess();
@@ -137,7 +138,7 @@ public class SlingLaunchpadBehaviour ext
System.out.println(trace.toString());
- Repository repository = getRepository(monitor);
+ Repository repository = ServerUtil.getRepository(getServer(), monitor);
IModuleResource[] moduleResources = getResources(module);
@@ -201,32 +202,6 @@ public class SlingLaunchpadBehaviour ext
super.publishModule(kind, deltaKind, module, monitor);
}
- public static Repository getRepository(IServer server, IProgressMonitor monitor) {
-
- SlingLaunchpadServer launchpadServer = (SlingLaunchpadServer) server.loadAdapter(
- SlingLaunchpadServer.class, monitor);
-
- SlingLaunchpadConfiguration configuration = launchpadServer.getConfiguration();
-
- Repository repository = SlingclipsePlugin.getDefault().getRepository();
- try {
- // TODO configurable scheme?
- URI uri = new URI("http", null, server.getHost(), configuration.getPort(),
- configuration.getContextPath(), null, null);
- RepositoryInfo repositoryInfo = new RepositoryInfo(configuration.getUsername(),
- configuration.getPassword(), uri.toString());
- repository.setRepositoryInfo(repositoryInfo);
- } catch (URISyntaxException e) {
- // TODO handle error
- }
- return repository;
- }
-
- private Repository getRepository(IProgressMonitor monitor) {
-
- return getRepository(getServer(), monitor);
- }
-
private void execute(Command<?> command) throws CoreException {
if (command == null) {
return;
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadConfiguration.java (from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadConfiguration.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadConfiguration.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadConfiguration.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadConfiguration.java&r1=1504908&r2=1504909&rev=1504909&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadConfiguration.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadConfiguration.java Fri Jul 19 15:06:23 2013
@@ -16,10 +16,12 @@
*/
package org.apache.sling.ide.eclipse.wst.internal;
+import org.apache.sling.ide.eclipse.core.ISlingLaunchpadConfiguration;
+import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
import org.eclipse.wst.server.core.IServerWorkingCopy;
-public class SlingLaunchpadConfiguration {
+public class SlingLaunchpadConfiguration implements ISlingLaunchpadConfiguration {
private SlingLaunchpadServer server;
@@ -27,9 +29,10 @@ public class SlingLaunchpadConfiguration
this.server = server;
}
+ @Override
public int getPort() {
// TODO central place for setting defaults
- return workingCopy().getAttribute(SlingLaunchpadServer.PROP_PORT, 8080);
+ return workingCopy().getAttribute(ISlingLaunchpadServer.PROP_PORT, 8080);
}
private IServerWorkingCopy workingCopy() {
@@ -41,31 +44,34 @@ public class SlingLaunchpadConfiguration
}
public void setPort(int port) {
- workingCopy().setAttribute(SlingLaunchpadServer.PROP_PORT, port);
+ workingCopy().setAttribute(ISlingLaunchpadServer.PROP_PORT, port);
}
+ @Override
public String getContextPath() {
- return workingCopy().getAttribute(SlingLaunchpadServer.PROP_CONTEXT_PATH, "/");
+ return workingCopy().getAttribute(ISlingLaunchpadServer.PROP_CONTEXT_PATH, "/");
}
public void setContextPath(String contextPath) {
- workingCopy().setAttribute(SlingLaunchpadServer.PROP_CONTEXT_PATH, contextPath);
+ workingCopy().setAttribute(ISlingLaunchpadServer.PROP_CONTEXT_PATH, contextPath);
}
+ @Override
public String getUsername() {
- return workingCopy().getAttribute(SlingLaunchpadServer.PROP_USERNAME, "admin");
+ return workingCopy().getAttribute(ISlingLaunchpadServer.PROP_USERNAME, "admin");
}
public void setUsername(String username) {
- workingCopy().setAttribute(SlingLaunchpadServer.PROP_USERNAME, username);
+ workingCopy().setAttribute(ISlingLaunchpadServer.PROP_USERNAME, username);
}
+ @Override
public String getPassword() {
- return workingCopy().getAttribute(SlingLaunchpadServer.PROP_PASSWORD, "admin");
+ return workingCopy().getAttribute(ISlingLaunchpadServer.PROP_PASSWORD, "admin");
}
public void setPassword(String password) {
- workingCopy().setAttribute(SlingLaunchpadServer.PROP_PASSWORD, password);
+ workingCopy().setAttribute(ISlingLaunchpadServer.PROP_PASSWORD, password);
}
}
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadConfiguration.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationDelegate.java (from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationDelegate.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationDelegate.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationDelegate.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationDelegate.java&r1=1504908&r2=1504909&rev=1504909&view=diff
==============================================================================
(empty)
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationDelegate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationDelegate.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchableAdapterDelegate.java (from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchableAdapterDelegate.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchableAdapterDelegate.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchableAdapterDelegate.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchableAdapterDelegate.java&r1=1504908&r2=1504909&rev=1504909&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchableAdapterDelegate.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchableAdapterDelegate.java Fri Jul 19 15:06:23 2013
@@ -16,6 +16,7 @@
*/
package org.apache.sling.ide.eclipse.wst.internal;
+import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.wst.server.core.IModuleArtifact;
import org.eclipse.wst.server.core.IServer;
@@ -32,7 +33,7 @@ public class SlingLaunchpadLaunchableAda
return null;
}
- SlingLaunchpadServer launchpad = (SlingLaunchpadServer) server.loadAdapter(SlingLaunchpadServer.class, null);
+ ISlingLaunchpadServer launchpad = (ISlingLaunchpadServer) server.loadAdapter(SlingLaunchpadServer.class, null);
if (launchpad == null) {
return null;
}
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchableAdapterDelegate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchableAdapterDelegate.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadRuntime.java (from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadRuntime.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadRuntime.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadRuntime.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadRuntime.java&r1=1504908&r2=1504909&rev=1504909&view=diff
==============================================================================
(empty)
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadRuntime.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadRuntime.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadServer.java (from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadServer.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadServer.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadServer.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadServer.java&r1=1504908&r2=1504909&rev=1504909&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadServer.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadServer.java Fri Jul 19 15:06:23 2013
@@ -16,6 +16,8 @@
*/
package org.apache.sling.ide.eclipse.wst.internal;
+import org.apache.sling.ide.eclipse.core.ISlingLaunchpadConfiguration;
+import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -23,31 +25,22 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.model.ServerDelegate;
-public class SlingLaunchpadServer extends ServerDelegate {
-
- public static final int PUBLISH_STATE_NEVER = 1;
- public static final int PUBLISH_STATE_RESOURCE_CHANGE = 2;
- public static final int PUBLISH_STATE_BUILD_EVENT = 3;
-
- public static final String PROP_PASSWORD = "launchpad.password";
- public static final String PROP_USERNAME = "launchpad.username";
- public static final String PROP_CONTEXT_PATH = "launchpad.contextPath";
- public static final String PROP_PORT = "launchpad.port";
+public class SlingLaunchpadServer extends ServerDelegate implements ISlingLaunchpadServer {
private static final String PROP_AUTO_PUBLISH_SETTING = "auto-publish-setting";
private static final String MODULE_TYPE_SLING_CONTENT = "sling.content";
- private SlingLaunchpadConfiguration config;
+ private ISlingLaunchpadConfiguration config;
- public SlingLaunchpadConfiguration getConfiguration() {
+ @Override
+ public ISlingLaunchpadConfiguration getConfiguration() {
if (config != null) {
return config;
}
return config = new SlingLaunchpadConfiguration(this);
-
}
/*
@@ -137,10 +130,12 @@ public class SlingLaunchpadServer extend
}
+ @Override
public int getPublishState() {
return getAttribute(PROP_AUTO_PUBLISH_SETTING, PUBLISH_STATE_NEVER);
}
+ @Override
public void setPublishState(int publishState) {
System.out.println("[" + Thread.currentThread().getName() + "] Set " + PROP_AUTO_PUBLISH_SETTING + " to "
+ publishState);
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadServer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadServer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF?rev=1504909&r1=1504908&r2=1504909&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/META-INF/MANIFEST.MF Fri Jul 19 15:06:23 2013
@@ -5,7 +5,8 @@ Bundle-SymbolicName: org.apache.sling.id
Bundle-Version: 0.0.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .
-Import-Package: org.apache.sling.ide.serialization,
+Import-Package: org.apache.sling.ide.eclipse.core,
+ org.apache.sling.ide.serialization,
org.apache.sling.slingclipse,
org.apache.sling.slingclipse.api,
org.apache.sling.slingclipse.helper,
Modified: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/plugin.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/plugin.xml?rev=1504909&r1=1504908&r2=1504909&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/plugin.xml (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/plugin.xml Fri Jul 19 15:06:23 2013
@@ -2,141 +2,17 @@
<?eclipse version="3.0"?>
<plugin>
- <!-- Define the sling module type. TODO needed ? -->
- <extension point="org.eclipse.wst.server.core.moduleTypes">
- <moduleType
- id="sling.content"
- name="Sling module type"/>
- </extension>
-
- <!-- Define a sling module factory -->
- <extension point="org.eclipse.wst.server.core.moduleFactories">
- <moduleFactory
- projects="true"
- class="org.apache.sling.ide.eclipse.wst.internal.SlingContentModuleFactory"
- id="org.apache.sling.contentModuleFactory">
- <moduleType
- versions="1.0"
- types="sling.content"/>
- </moduleFactory>
- </extension>
-
- <!-- Define the sling facet we support -->
- <extension point="org.eclipse.wst.common.project.facet.core.facets">
- <project-facet id="sling.content">
- <label>Sling content module</label>
- <description>Sling content modules contain content which is installed into the repository as-is. Good examples are static files ( HTML, CSS, JS ), scripts ( JSP, ESP ) and any other form of content.</description>
- </project-facet>
-
- <project-facet-version facet="sling.content" version="1.0"/>
- <!-- TODO add image -->
-
- <action facet="sling.content" version="1.0" type="INSTALL">
- <delegate class="org.apache.sling.ide.eclipse.wst.internal.SlingContentFacetInstallDelegate"/>
- </action>
-
- <action facet="sling.content" version="1.0" type="UNINSTALL">
- <delegate class="org.apache.sling.ide.eclipse.wst.internal.SlingContentFacetUninstallDelegate"/>
- </action>
- </extension>
-
- <!-- Define the Sling launchpad runtime type -->
- <extension point="org.eclipse.wst.server.core.runtimeTypes">
- <runtimeType
- id="org.apache.sling.launchpad.runtime"
- name="Sling Launchpad (runtime name)"
- description="Sling Launchpad (runtime description)"
- vendor="Sling"
- version="1.0"
- class="org.apache.sling.ide.eclipse.wst.internal.SlingLaunchpadRuntime">
- <moduleType types="sling.content" versions="1.0"/>
- </runtimeType>
- </extension>
-
- <!-- Define the Sling launchpad server type -->
- <extension point="org.eclipse.wst.server.core.serverTypes">
- <serverType
- id="org.apache.sling.launchpad.server"
- name="Sling Launchpad (server name)"
- description="Sling Launchpad (server description)"
- supportsRemoteHosts="true"
- runtime="true"
- startTimeout="30000"
- stopTimeout="15000"
- initialState="stopped"
- hasConfiguration="true"
- launchConfigId="org.apache.sling.ide.eclipse.launchpad.launchConfigurationType"
- runtimeTypeId="org.apache.sling.launchpad.runtime"
- class="org.apache.sling.ide.eclipse.wst.internal.SlingLaunchpadServer"
- behaviourClass="org.apache.sling.ide.eclipse.wst.internal.SlingLaunchpadBehaviour">
- </serverType>
- </extension>
-
- <extension point="org.eclipse.wst.server.core.launchableAdapters">
- <launchableAdapter
- class="org.apache.sling.ide.eclipse.wst.internal.SlingLaunchpadLaunchableAdapterDelegate"
- id="org.sling.slingclipse.web"/>
- </extension>
-
- <!-- Define the launch configuration type for the launchpad TODO do we need a sourcePathComputer ? -->
- <extension point="org.eclipse.debug.core.launchConfigurationTypes">
- <launchConfigurationType
- id="org.apache.sling.ide.eclipse.launchpad.launchConfigurationType"
- name="Sling Launchpad"
- delegate="org.apache.sling.ide.eclipse.wst.internal.SlingLaunchpadLaunchConfigurationDelegate"
- modes="run"
- sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
- </extension>
-
- <!-- Declare that the launchpad runtime type, supporting content modules -->
- <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
- <runtime-component-type id="org.apache.sling.launchpad"/>
- <runtime-component-version type="org.apache.sling.launchpad" version="1.0"/>
-
- <adapter>
- <runtime-component
- id="org.apache.sling.launchpad"/>
- <factory
- class="org.eclipse.jst.server.core.internal.RuntimeClasspathProvider$Factory"/>
- <type
- class="org.eclipse.jst.common.project.facet.core.IClasspathProvider"/>
- </adapter>
-
- <supported>
- <runtime-component id="org.apache.sling.launchpad" version="1.0"/>
- <facet id="sling.content" version="1.0"/>
- </supported>
- </extension>
-
-
- <!-- Define default facets ( needed ? ) -->
- <extension point="org.eclipse.wst.common.project.facet.core.defaultFacets">
- <default-facets>
- <runtime-component id="org.apache.sling.launchpad"/>
- <facet id="sling.content" version="1.0"/>
- </default-facets>
- </extension>
-
- <!-- Map from the launchpad runtime type to our runtime components -->
- <extension point="org.eclipse.jst.server.core.runtimeFacetMappings">
- <runtimeFacetMapping
- runtimeTypeId="org.apache.sling.launchpad.runtime"
- runtime-component="org.apache.sling.launchpad"
- version="1.0"/>
- </extension>
-
<!-- Define the launch configuration's tab group -->
<extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
<launchConfigurationTabGroup
id="org.apache.sling.ide.eclipse.launchpad.launchConfigurationTabGroup"
type="org.apache.sling.ide.eclipse.launchpad.launchConfigurationType"
- class="org.apache.sling.ide.eclipse.wst.internal.SlingLaunchpadLaunchConfigurationTabGroup">
+ class="org.apache.sling.ide.eclipse.wst.ui.internal.SlingLaunchpadLaunchConfigurationTabGroup">
</launchConfigurationTabGroup>
</extension>
<!-- Define images -->
- <!-- TODO move to ui bundle -->
<extension point="org.eclipse.wst.server.ui.serverImages">
<image
icon="icons/obj16/sling.gif"
@@ -220,22 +96,4 @@
</enabledWhen>
</page>
</extension>
-
-<!--
- <extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
- <launchConfigurationTypeImage
- id="org.eclipse.wst.server.preview.launchConfigurationTypeImage"
- configTypeID="org.eclipse.wst.server.preview.launchConfigurationType"
- icon="icons/obj16/preview.gif">
- </launchConfigurationTypeImage>
- </extension>
-
- <extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
- <launchConfigurationTabGroup
- id="org.eclipse.wst.server.preview.launchConfigurationTabGroup"
- type="org.eclipse.wst.server.preview.launchConfigurationType"
- class="org.eclipse.wst.server.preview.adapter.internal.ui.PreviewLaunchConfigurationTabGroup">
- </launchConfigurationTabGroup>
- </extension>
- -->
</plugin>
Modified: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ConnectionEditorSection.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ConnectionEditorSection.java?rev=1504909&r1=1504908&r2=1504909&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ConnectionEditorSection.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ConnectionEditorSection.java Fri Jul 19 15:06:23 2013
@@ -19,11 +19,12 @@ package org.apache.sling.ide.eclipse.wst
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import org.apache.sling.ide.eclipse.wst.internal.SetServerContextPathCommand;
-import org.apache.sling.ide.eclipse.wst.internal.SetServerPasswordCommand;
-import org.apache.sling.ide.eclipse.wst.internal.SetServerUsernameCommand;
-import org.apache.sling.ide.eclipse.wst.internal.SlingLaunchpadConfiguration;
-import org.apache.sling.ide.eclipse.wst.internal.SlingLaunchpadServer;
+import org.apache.sling.ide.eclipse.core.ISlingLaunchpadConfiguration;
+import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
+import org.apache.sling.ide.eclipse.core.SetServerContextPathCommand;
+import org.apache.sling.ide.eclipse.core.SetServerPasswordCommand;
+import org.apache.sling.ide.eclipse.core.SetServerPortCommand;
+import org.apache.sling.ide.eclipse.core.SetServerUsernameCommand;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
@@ -49,7 +50,7 @@ public class ConnectionEditorSection ext
private Text contextPathText;
private Text usernameText;
private Text passwordText;
- private SlingLaunchpadServer launchpadServer;
+ private ISlingLaunchpadServer launchpadServer;
private PropertyChangeListener serverListener;
@Override
@@ -123,13 +124,13 @@ public class ConnectionEditorSection ext
@Override
public void propertyChange(PropertyChangeEvent evt) {
- if (SlingLaunchpadServer.PROP_PORT.equals(evt.getPropertyName())) {
+ if (ISlingLaunchpadServer.PROP_PORT.equals(evt.getPropertyName())) {
portText.setText(((Integer) evt.getNewValue()).toString());
- } else if (SlingLaunchpadServer.PROP_CONTEXT_PATH.equals(evt.getPropertyName())) {
+ } else if (ISlingLaunchpadServer.PROP_CONTEXT_PATH.equals(evt.getPropertyName())) {
contextPathText.setText((String) evt.getNewValue());
- } else if (SlingLaunchpadServer.PROP_USERNAME.equals(evt.getPropertyName())) {
+ } else if (ISlingLaunchpadServer.PROP_USERNAME.equals(evt.getPropertyName())) {
usernameText.setText((String) evt.getNewValue());
- } else if (SlingLaunchpadServer.PROP_PASSWORD.equals(evt.getPropertyName())) {
+ } else if (ISlingLaunchpadServer.PROP_PASSWORD.equals(evt.getPropertyName())) {
passwordText.setText((String) evt.getNewValue());
}
}
@@ -137,17 +138,17 @@ public class ConnectionEditorSection ext
server.addPropertyChangeListener(serverListener);
- launchpadServer = (SlingLaunchpadServer) server.getAdapter(SlingLaunchpadServer.class);
+ launchpadServer = (ISlingLaunchpadServer) server.getAdapter(ISlingLaunchpadServer.class);
if (launchpadServer == null) {
// TODO progress monitor
- launchpadServer = (SlingLaunchpadServer) server.loadAdapter(SlingLaunchpadServer.class,
+ launchpadServer = (ISlingLaunchpadServer) server.loadAdapter(ISlingLaunchpadServer.class,
new NullProgressMonitor());
}
}
private void initialize() {
- final SlingLaunchpadConfiguration config = launchpadServer.getConfiguration();
+ final ISlingLaunchpadConfiguration config = launchpadServer.getConfiguration();
portText.setText(String.valueOf(config.getPort()));
contextPathText.setText(config.getContextPath());
Modified: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportWizard.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportWizard.java?rev=1504909&r1=1504908&r2=1504909&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportWizard.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportWizard.java Fri Jul 19 15:06:23 2013
@@ -20,8 +20,8 @@ import java.io.ByteArrayInputStream;
import java.nio.charset.Charset;
import java.util.Iterator;
-import org.apache.sling.ide.eclipse.wst.internal.SlingLaunchpadBehaviour;
-import org.apache.sling.ide.eclipse.wst.internal.SlingLaunchpadServer;
+import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
+import org.apache.sling.ide.eclipse.core.ServerUtil;
import org.apache.sling.ide.serialization.SerializationManager;
import org.apache.sling.slingclipse.SlingclipsePlugin;
import org.apache.sling.slingclipse.api.Command;
@@ -86,21 +86,21 @@ public class ImportWizard extends Wizard
protected IStatus run(IProgressMonitor monitor) {
- Repository repository = SlingLaunchpadBehaviour.getRepository(server, monitor);
+ Repository repository = ServerUtil.getRepository(server, monitor);
Tracer tracer = SlingclipsePlugin.getDefault().getTracer();
monitor.setTaskName("Loading configuration...");
monitor.worked(5);
- SlingLaunchpadServer launchpad = (SlingLaunchpadServer) server.loadAdapter(
- SlingLaunchpadServer.class, monitor);
+ ISlingLaunchpadServer launchpad = (ISlingLaunchpadServer) server.loadAdapter(
+ ISlingLaunchpadServer.class, monitor);
int oldPublishState = launchpad.getPublishState();
// TODO disabling publish does not work; since the publish is done async
// Not sure if there is a simple workaround. Anyway, the only side effect is that we
// make too many calls after the import, functionality is not affected
- if (server.canPublish().isOK() && oldPublishState != SlingLaunchpadServer.PUBLISH_STATE_NEVER) {
- launchpad.setPublishState(SlingLaunchpadServer.PUBLISH_STATE_NEVER);
+ if (server.canPublish().isOK() && oldPublishState != ISlingLaunchpadServer.PUBLISH_STATE_NEVER) {
+ launchpad.setPublishState(ISlingLaunchpadServer.PUBLISH_STATE_NEVER);
}
try {
@@ -121,7 +121,7 @@ public class ImportWizard extends Wizard
SlingclipsePlugin.getDefault().getLog().log(status);
return status;
}finally{
- if (oldPublishState != SlingLaunchpadServer.PUBLISH_STATE_NEVER) {
+ if (oldPublishState != ISlingLaunchpadServer.PUBLISH_STATE_NEVER) {
launchpad.setPublishState(oldPublishState);
}
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.java (from r1504908, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationTabGroup.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationTabGroup.java&r1=1504908&r2=1504909&rev=1504909&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationTabGroup.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.java Fri Jul 19 15:06:23 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.eclipse.wst.internal;
+package org.apache.sling.ide.eclipse.wst.ui.internal;
import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
import org.eclipse.debug.ui.CommonTab;
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL