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:07:17 UTC
svn commit: r1504910 [1/2] - in /sling/whiteboard/asanso/plugins/eclipse:
api/META-INF/ api/src/org/apache/sling/ide/transport/
api/src/org/apache/sling/slingclipse/api/ eclipse-core/
eclipse-core/META-INF/ eclipse-core/OSGI-INF/ eclipse-core/src/org/a...
Author: rombert
Date: Fri Jul 19 15:07:15 2013
New Revision: 1504910
URL: http://svn.apache.org/r1504910
Log:
SLING-2973 - [Tooling] Align Eclipse tooling to proposed structure
Restructure class and package names.
Added:
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Command.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/Command.java
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/FileInfo.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/FileInfo.java
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/ProtectedNodes.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/ProtectedNodes.java
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Repository.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/Repository.java
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryException.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/RepositoryException.java
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryInfo.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/RepositoryInfo.java
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryResponse.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/RepositoryResponse.java
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/ResponseType.java (with props)
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Result.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/Result.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SlingclipseHelper.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/slingclipse/helper/SlingclipseHelper.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/slingclipse/SlingclipsePlugin.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SetServerStringPropertyCommand.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SetServerStringPropertyCommand.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentFacetInstallDelegate.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetInstallDelegate.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentFacetUninstallDelegate.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetUninstallDelegate.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentModuleFactory.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadConfiguration.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadConfiguration.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadLaunchConfigurationDelegate.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationDelegate.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadLaunchableAdapterDelegate.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchableAdapterDelegate.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadRuntime.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadRuntime.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadServer.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Tracer.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/slingclipse/helper/Tracer.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java (with props)
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.java (contents, props changed)
- copied, changed from r1504909, 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/ui/internal/Constants.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/Constants.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportContentAction.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportContentAction.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportWizard.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportWizardPage.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SelectionUtils.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SelectionUtils.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingProjectPropertyPage.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingProjectPropertyPage.java
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/serialization/simplexml/SimpleXmlSerializationManager.java
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractRepository.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/slingclipse/http/impl/AbstractRepository.java
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractResult.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/slingclipse/http/impl/AbstractResult.java
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/slingclipse/http/impl/RepositoryImpl.java
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/util/Constants.java
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Tracer.java (contents, props changed)
- copied, changed from r1504909, sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/util/Tracer.java
Removed:
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/Command.java
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/FileInfo.java
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/ProtectedNodes.java
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/Repository.java
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/RepositoryException.java
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/RepositoryInfo.java
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/RepositoryResponse.java
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/ResponseType.java
sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/Result.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SetServerStringPropertyCommand.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/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
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/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
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/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
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/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
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadServer.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/slingclipse/SlingclipsePlugin.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/slingclipse/helper/SlingclipseHelper.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/slingclipse/helper/Tracer.java
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/Constants.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportContentAction.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportWizard.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportWizardPage.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SelectionUtils.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingProjectPropertyPage.java
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/util/Constants.java
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/util/Tracer.java
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/serialization/simplexml/SimpleXmlSerializationManager.java
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/slingclipse/http/impl/AbstractRepository.java
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/slingclipse/http/impl/AbstractResult.java
sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/slingclipse/http/impl/RepositoryImpl.java
Modified:
sling/whiteboard/asanso/plugins/eclipse/api/META-INF/MANIFEST.MF
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/META-INF/MANIFEST.MF
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/OSGI-INF/Tracer.xml
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/plugin.xml
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServerUtil.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerContextPathCommand.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPasswordCommand.java
sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerUsernameCommand.java
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/impl-resource/OSGI-INF/RepositoryImpl.xml
sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/SimpleXmlSerializationManager.xml
sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/Tracer.xml
Modified: sling/whiteboard/asanso/plugins/eclipse/api/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/api/META-INF/MANIFEST.MF?rev=1504910&r1=1504909&r2=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/api/META-INF/MANIFEST.MF (original)
+++ sling/whiteboard/asanso/plugins/eclipse/api/META-INF/MANIFEST.MF Fri Jul 19 15:07:15 2013
@@ -8,4 +8,4 @@ Require-Bundle: org.eclipse.ui,
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.apache.sling.ide.serialization,
- org.apache.sling.slingclipse.api
+ org.apache.sling.ide.transport
Copied: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Command.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/Command.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Command.java?p2=sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Command.java&p1=sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/Command.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/Command.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Command.java Fri Jul 19 15:07:15 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.slingclipse.api;
+package org.apache.sling.ide.transport;
public interface Command<T> {
Propchange: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Command.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Command.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/FileInfo.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/FileInfo.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/FileInfo.java?p2=sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/FileInfo.java&p1=sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/FileInfo.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/FileInfo.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/FileInfo.java Fri Jul 19 15:07:15 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.slingclipse.api;
+package org.apache.sling.ide.transport;
public class FileInfo {
Propchange: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/FileInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/FileInfo.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/ProtectedNodes.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/ProtectedNodes.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/ProtectedNodes.java?p2=sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/ProtectedNodes.java&p1=sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/ProtectedNodes.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/ProtectedNodes.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/ProtectedNodes.java Fri Jul 19 15:07:15 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.slingclipse.api;
+package org.apache.sling.ide.transport;
import java.util.EnumSet;
import java.util.HashMap;
Propchange: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/ProtectedNodes.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/ProtectedNodes.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Repository.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/Repository.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Repository.java?p2=sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Repository.java&p1=sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/Repository.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/Repository.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Repository.java Fri Jul 19 15:07:15 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.slingclipse.api;
+package org.apache.sling.ide.transport;
import java.util.Map;
Propchange: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Repository.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Repository.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryException.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/RepositoryException.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryException.java?p2=sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryException.java&p1=sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/RepositoryException.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/RepositoryException.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryException.java Fri Jul 19 15:07:15 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.slingclipse.api;
+package org.apache.sling.ide.transport;
/**
* Signals an error when communicating with a Sling repository
Propchange: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryInfo.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/RepositoryInfo.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryInfo.java?p2=sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryInfo.java&p1=sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/RepositoryInfo.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/RepositoryInfo.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryInfo.java Fri Jul 19 15:07:15 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.slingclipse.api;
+package org.apache.sling.ide.transport;
import java.net.URI;
Propchange: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryInfo.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryResponse.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/RepositoryResponse.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryResponse.java?p2=sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryResponse.java&p1=sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/RepositoryResponse.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/RepositoryResponse.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryResponse.java Fri Jul 19 15:07:15 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.slingclipse.api;
+package org.apache.sling.ide.transport;
public class RepositoryResponse {
Propchange: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryResponse.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/RepositoryResponse.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Added: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/ResponseType.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/ResponseType.java?rev=1504910&view=auto
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/ResponseType.java (added)
+++ sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/ResponseType.java Fri Jul 19 15:07:15 2013
@@ -0,0 +1,5 @@
+package org.apache.sling.ide.transport;
+
+public enum ResponseType {
+ JSON,XML
+}
Propchange: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/ResponseType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/ResponseType.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Result.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/Result.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Result.java?p2=sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Result.java&p1=sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/Result.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/slingclipse/api/Result.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Result.java Fri Jul 19 15:07:15 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.slingclipse.api;
+package org.apache.sling.ide.transport;
public interface Result<T> {
Propchange: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Result.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/api/src/org/apache/sling/ide/transport/Result.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
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=1504910&r1=1504909&r2=1504910&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:07:15 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.apache.sling.ide.eclipse-core;singleton:=true
Bundle-Version: 0.0.1.qualifier
-Bundle-Activator: org.apache.sling.slingclipse.SlingclipsePlugin
+Bundle-Activator: org.apache.sling.ide.eclipse.core.internal.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.equinox.ds;bundle-version="1.2.1",
org.eclipse.osgi.services;bundle-version="3.2.100"
@@ -10,7 +10,7 @@ Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .
Import-Package: org.apache.sling.ide.serialization,
- org.apache.sling.slingclipse.api,
+ org.apache.sling.ide.transport,
org.eclipse.core.commands,
org.eclipse.core.commands.operations,
org.eclipse.core.resources,
@@ -22,7 +22,5 @@ Import-Package: org.apache.sling.ide.ser
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.ide.eclipse.core,
- org.apache.sling.slingclipse,
- org.apache.sling.slingclipse.helper
+Export-Package: org.apache.sling.ide.eclipse.core
Service-Component: OSGI-INF/Tracer.xml
Modified: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/OSGI-INF/Tracer.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/OSGI-INF/Tracer.xml?rev=1504910&r1=1504909&r2=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/OSGI-INF/Tracer.xml (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/OSGI-INF/Tracer.xml Fri Jul 19 15:07:15 2013
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="false">
- <implementation class="org.apache.sling.slingclipse.helper.Tracer"/>
+ <implementation class="org.apache.sling.ide.eclipse.core.internal.Tracer"/>
<property name="listener.symbolic.name" type="String" value="org.apache.sling.ide.eclipse-core"/>
<service>
- <provide interface="org.apache.sling.slingclipse.helper.Tracer"/>
+ <provide interface="org.apache.sling.ide.eclipse.core.internal.Tracer"/>
</service>
</scr:component>
Modified: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/plugin.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/plugin.xml?rev=1504910&r1=1504909&r2=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/plugin.xml (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/plugin.xml Fri Jul 19 15:07:15 2013
@@ -13,7 +13,7 @@
<extension point="org.eclipse.wst.server.core.moduleFactories">
<moduleFactory
projects="true"
- class="org.apache.sling.ide.eclipse.wst.internal.SlingContentModuleFactory"
+ class="org.apache.sling.ide.eclipse.core.internal.SlingContentModuleFactory"
id="org.apache.sling.contentModuleFactory">
<moduleType
versions="1.0"
@@ -32,11 +32,11 @@
<!-- TODO add image -->
<action facet="sling.content" version="1.0" type="INSTALL">
- <delegate class="org.apache.sling.ide.eclipse.wst.internal.SlingContentFacetInstallDelegate"/>
+ <delegate class="org.apache.sling.ide.eclipse.core.internal.SlingContentFacetInstallDelegate"/>
</action>
<action facet="sling.content" version="1.0" type="UNINSTALL">
- <delegate class="org.apache.sling.ide.eclipse.wst.internal.SlingContentFacetUninstallDelegate"/>
+ <delegate class="org.apache.sling.ide.eclipse.core.internal.SlingContentFacetUninstallDelegate"/>
</action>
</extension>
@@ -48,7 +48,7 @@
description="Sling Launchpad (runtime description)"
vendor="Sling"
version="1.0"
- class="org.apache.sling.ide.eclipse.wst.internal.SlingLaunchpadRuntime">
+ class="org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadRuntime">
<moduleType types="sling.content" versions="1.0"/>
</runtimeType>
</extension>
@@ -67,14 +67,14 @@
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">
+ class="org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadServer"
+ behaviourClass="org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadBehaviour">
</serverType>
</extension>
<extension point="org.eclipse.wst.server.core.launchableAdapters">
<launchableAdapter
- class="org.apache.sling.ide.eclipse.wst.internal.SlingLaunchpadLaunchableAdapterDelegate"
+ class="org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadLaunchableAdapterDelegate"
id="org.sling.slingclipse.web"/>
</extension>
@@ -83,7 +83,7 @@
<launchConfigurationType
id="org.apache.sling.ide.eclipse.launchpad.launchConfigurationType"
name="Sling Launchpad"
- delegate="org.apache.sling.ide.eclipse.wst.internal.SlingLaunchpadLaunchConfigurationDelegate"
+ delegate="org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadLaunchConfigurationDelegate"
modes="run"
sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
</extension>
Modified: 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=1504910&r1=1504909&r2=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServerUtil.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/ServerUtil.java Fri Jul 19 15:07:15 2013
@@ -19,10 +19,10 @@ package org.apache.sling.ide.eclipse.cor
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.apache.sling.ide.eclipse.core.internal.Activator;
+import org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadServer;
+import org.apache.sling.ide.transport.Repository;
+import org.apache.sling.ide.transport.RepositoryInfo;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.wst.server.core.IServer;
@@ -35,7 +35,7 @@ public abstract class ServerUtil {
ISlingLaunchpadConfiguration configuration = launchpadServer.getConfiguration();
- Repository repository = SlingclipsePlugin.getDefault().getRepository();
+ Repository repository = Activator.getDefault().getRepository();
try {
// TODO configurable scheme?
URI uri = new URI("http", null, server.getHost(), configuration.getPort(), configuration.getContextPath(),
Modified: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerContextPathCommand.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerContextPathCommand.java?rev=1504910&r1=1504909&r2=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerContextPathCommand.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerContextPathCommand.java Fri Jul 19 15:07:15 2013
@@ -16,7 +16,7 @@
*/
package org.apache.sling.ide.eclipse.core;
-import org.apache.sling.ide.eclipse.wst.internal.SetServerStringPropertyCommand;
+import org.apache.sling.ide.eclipse.core.internal.SetServerStringPropertyCommand;
import org.eclipse.wst.server.core.IServerWorkingCopy;
public class SetServerContextPathCommand extends SetServerStringPropertyCommand {
Modified: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPasswordCommand.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPasswordCommand.java?rev=1504910&r1=1504909&r2=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPasswordCommand.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerPasswordCommand.java Fri Jul 19 15:07:15 2013
@@ -16,7 +16,7 @@
*/
package org.apache.sling.ide.eclipse.core;
-import org.apache.sling.ide.eclipse.wst.internal.SetServerStringPropertyCommand;
+import org.apache.sling.ide.eclipse.core.internal.SetServerStringPropertyCommand;
import org.eclipse.wst.server.core.IServerWorkingCopy;
public class SetServerPasswordCommand extends SetServerStringPropertyCommand {
Modified: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerUsernameCommand.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerUsernameCommand.java?rev=1504910&r1=1504909&r2=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerUsernameCommand.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SetServerUsernameCommand.java Fri Jul 19 15:07:15 2013
@@ -16,7 +16,7 @@
*/
package org.apache.sling.ide.eclipse.core;
-import org.apache.sling.ide.eclipse.wst.internal.SetServerStringPropertyCommand;
+import org.apache.sling.ide.eclipse.core.internal.SetServerStringPropertyCommand;
import org.eclipse.wst.server.core.IServerWorkingCopy;
public class SetServerUsernameCommand extends SetServerStringPropertyCommand {
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SlingclipseHelper.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/slingclipse/helper/SlingclipseHelper.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SlingclipseHelper.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SlingclipseHelper.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/slingclipse/helper/SlingclipseHelper.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/slingclipse/helper/SlingclipseHelper.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SlingclipseHelper.java Fri Jul 19 15:07:15 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.slingclipse.helper;
+package org.apache.sling.ide.eclipse.core;
@Deprecated
public class SlingclipseHelper {
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SlingclipseHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/SlingclipseHelper.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/slingclipse/SlingclipsePlugin.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/slingclipse/SlingclipsePlugin.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/slingclipse/SlingclipsePlugin.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java Fri Jul 19 15:07:15 2013
@@ -14,25 +14,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.slingclipse;
+package org.apache.sling.ide.eclipse.core.internal;
import org.apache.sling.ide.serialization.SerializationManager;
-import org.apache.sling.slingclipse.api.Repository;
-import org.apache.sling.slingclipse.helper.Tracer;
+import org.apache.sling.ide.transport.Repository;
import org.eclipse.core.runtime.Plugin;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
/**
* The activator class controls the plug-in life cycle
+ *
+ * <p>
+ * Since the WST framework is based on Eclipse extension points, rather than OSGi services, this class provides a static
+ * entry point to well-known services.
+ * </p>
*/
-public class SlingclipsePlugin extends Plugin {
+public class Activator extends Plugin {
// The plug-in ID
public static final String PLUGIN_ID = "org.apache.sling.ide.eclipse-core"; //$NON-NLS-1$
// The shared instance
- private static SlingclipsePlugin plugin;
+ private static Activator plugin;
private Repository repository;
private SerializationManager serializationManager;
@@ -78,7 +82,7 @@ public class SlingclipsePlugin extends P
*
* @return the shared instance
*/
- public static SlingclipsePlugin getDefault() {
+ public static Activator getDefault() {
return plugin;
}
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SetServerStringPropertyCommand.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SetServerStringPropertyCommand.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SetServerStringPropertyCommand.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SetServerStringPropertyCommand.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SetServerStringPropertyCommand.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SetServerStringPropertyCommand.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SetServerStringPropertyCommand.java Fri Jul 19 15:07:15 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.core.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/core/internal/SetServerStringPropertyCommand.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/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/core/internal/SlingContentFacetInstallDelegate.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/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/internal/SlingContentFacetInstallDelegate.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentFacetInstallDelegate.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetInstallDelegate.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/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/internal/SlingContentFacetInstallDelegate.java Fri Jul 19 15:07:15 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.core.internal;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentFacetInstallDelegate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/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/core/internal/SlingContentFacetUninstallDelegate.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/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/core/internal/SlingContentFacetUninstallDelegate.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentFacetUninstallDelegate.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetUninstallDelegate.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentFacetUninstallDelegate.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentFacetUninstallDelegate.java Fri Jul 19 15:07:15 2013
@@ -1,4 +1,4 @@
-package org.apache.sling.ide.eclipse.wst.internal;
+package org.apache.sling.ide.eclipse.core.internal;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentFacetUninstallDelegate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/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/core/internal/SlingContentModuleFactory.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/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/core/internal/SlingContentModuleFactory.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentModuleFactory.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingContentModuleFactory.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentModuleFactory.java Fri Jul 19 15:07:15 2013
@@ -1,9 +1,9 @@
-package org.apache.sling.ide.eclipse.wst.internal;
+package org.apache.sling.ide.eclipse.core.internal;
import java.util.ArrayList;
import java.util.List;
-import org.apache.sling.slingclipse.helper.SlingclipseHelper;
+import org.apache.sling.ide.eclipse.core.SlingclipseHelper;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentModuleFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/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/core/internal/SlingLaunchpadBehaviour.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/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/core/internal/SlingLaunchpadBehaviour.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadBehaviour.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java Fri Jul 19 15:07:15 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.core.internal;
import java.io.IOException;
import java.io.InputStream;
@@ -25,13 +25,12 @@ 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;
-import org.apache.sling.slingclipse.api.FileInfo;
-import org.apache.sling.slingclipse.api.Repository;
-import org.apache.sling.slingclipse.api.RepositoryInfo;
-import org.apache.sling.slingclipse.api.ResponseType;
-import org.apache.sling.slingclipse.api.Result;
+import org.apache.sling.ide.transport.Command;
+import org.apache.sling.ide.transport.FileInfo;
+import org.apache.sling.ide.transport.Repository;
+import org.apache.sling.ide.transport.RepositoryInfo;
+import org.apache.sling.ide.transport.ResponseType;
+import org.apache.sling.ide.transport.Result;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IResource;
@@ -52,7 +51,7 @@ public class SlingLaunchpadBehaviour ext
private SerializationManager serializationManager;
public SlingLaunchpadBehaviour() {
- serializationManager = SlingclipsePlugin.getDefault().getSerializationManager();
+ serializationManager = Activator.getDefault().getSerializationManager();
}
@Override
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/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/core/internal/SlingLaunchpadConfiguration.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/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/core/internal/SlingLaunchpadConfiguration.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadConfiguration.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadConfiguration.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadConfiguration.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadConfiguration.java Fri Jul 19 15:07:15 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.core.internal;
import org.apache.sling.ide.eclipse.core.ISlingLaunchpadConfiguration;
import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/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/core/internal/SlingLaunchpadLaunchConfigurationDelegate.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/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/core/internal/SlingLaunchpadLaunchConfigurationDelegate.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadLaunchConfigurationDelegate.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationDelegate.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchConfigurationDelegate.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadLaunchConfigurationDelegate.java Fri Jul 19 15:07:15 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.core.internal;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadLaunchConfigurationDelegate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/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/core/internal/SlingLaunchpadLaunchableAdapterDelegate.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/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/core/internal/SlingLaunchpadLaunchableAdapterDelegate.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadLaunchableAdapterDelegate.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchableAdapterDelegate.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadLaunchableAdapterDelegate.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadLaunchableAdapterDelegate.java Fri Jul 19 15:07:15 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.core.internal;
import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
import org.eclipse.core.runtime.CoreException;
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadLaunchableAdapterDelegate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/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/core/internal/SlingLaunchpadRuntime.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/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/internal/SlingLaunchpadRuntime.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadRuntime.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadRuntime.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/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/internal/SlingLaunchpadRuntime.java Fri Jul 19 15:07:15 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.core.internal;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadRuntime.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/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/core/internal/SlingLaunchpadServer.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/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/core/internal/SlingLaunchpadServer.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadServer.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/wst/internal/SlingLaunchpadServer.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java Fri Jul 19 15:07:15 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.core.internal;
import org.apache.sling.ide.eclipse.core.ISlingLaunchpadConfiguration;
import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadServer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Tracer.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/slingclipse/helper/Tracer.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Tracer.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Tracer.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/slingclipse/helper/Tracer.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/slingclipse/helper/Tracer.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Tracer.java Fri Jul 19 15:07:15 2013
@@ -14,9 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.slingclipse.helper;
+package org.apache.sling.ide.eclipse.core.internal;
-import org.apache.sling.slingclipse.SlingclipsePlugin;
import org.eclipse.osgi.service.debug.DebugOptions;
import org.eclipse.osgi.service.debug.DebugOptionsListener;
import org.eclipse.osgi.service.debug.DebugTrace;
@@ -30,8 +29,8 @@ public class Tracer implements DebugOpti
@Override
public void optionsChanged(DebugOptions options) {
- debugEnabled = options.getBooleanOption(SlingclipsePlugin.PLUGIN_ID + "/debug", false);
- trace = options.newDebugTrace(SlingclipsePlugin.PLUGIN_ID, getClass());
+ debugEnabled = options.getBooleanOption(Activator.PLUGIN_ID + "/debug", false);
+ trace = options.newDebugTrace(Activator.PLUGIN_ID, getClass());
}
public void trace(String message, Object... arguments) {
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Tracer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Tracer.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=1504910&r1=1504909&r2=1504910&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:07:15 2013
@@ -7,9 +7,7 @@ Bundle-RequiredExecutionEnvironment: Jav
Bundle-ClassPath: .
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,
+ org.apache.sling.ide.transport,
org.eclipse.core.commands,
org.eclipse.core.commands.operations,
org.eclipse.core.resources,
@@ -43,4 +41,5 @@ Import-Package: org.apache.sling.ide.ecl
org.eclipse.wst.server.core.util,
org.eclipse.wst.server.ui,
org.eclipse.wst.server.ui.editor,
- org.json
+ org.json,
+ org.osgi.framework
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=1504910&r1=1504909&r2=1504910&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:07:15 2013
@@ -7,7 +7,7 @@
<launchConfigurationTabGroup
id="org.apache.sling.ide.eclipse.launchpad.launchConfigurationTabGroup"
type="org.apache.sling.ide.eclipse.launchpad.launchConfigurationType"
- class="org.apache.sling.ide.eclipse.wst.ui.internal.SlingLaunchpadLaunchConfigurationTabGroup">
+ class="org.apache.sling.ide.eclipse.ui.internal.SlingLaunchpadLaunchConfigurationTabGroup">
</launchConfigurationTabGroup>
</extension>
@@ -29,7 +29,7 @@
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">
+ class="org.apache.sling.ide.eclipse.ui.internal.ConnectionEditorSection">
</section>
</extension>
@@ -58,7 +58,7 @@
objectClass="org.eclipse.core.resources.IProject">
<action
- class="org.apache.sling.ide.eclipse.wst.ui.internal.ImportContentAction"
+ class="org.apache.sling.ide.eclipse.ui.internal.ImportContentAction"
id="org.apache.sling.slingclipse.importContentAction"
label="Import Content..."
menubarPath="org.apache.sling.slingclipse.slingMenu/sling"
@@ -83,7 +83,7 @@
<page
id="org.apache.sling.ide.eclipse.projectPropertyPage"
name="Sling"
- class="org.apache.sling.ide.eclipse.wst.ui.internal.SlingProjectPropertyPage" >
+ class="org.apache.sling.ide.eclipse.ui.internal.SlingProjectPropertyPage">
<enabledWhen>
<and>
<instanceof
Added: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java?rev=1504910&view=auto
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java (added)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java Fri Jul 19 15:07:15 2013
@@ -0,0 +1,59 @@
+/*
+ * 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.ui.internal;
+
+import org.apache.sling.ide.serialization.SerializationManager;
+import org.eclipse.core.runtime.Plugin;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+public class Activator extends Plugin {
+
+ public static final String PLUGIN_ID = "org.apache.sling.ide.eclipse-core";
+ public static Activator INSTANCE;
+
+ private SerializationManager serializationManager;
+ private ServiceReference<SerializationManager> serializationManagerRef;
+
+ public static Activator getDefault() {
+
+ return INSTANCE;
+ }
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+
+ serializationManagerRef = context.getServiceReference(SerializationManager.class);
+ serializationManager = context.getService(serializationManagerRef);
+
+ INSTANCE = this;
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ INSTANCE = null;
+
+ context.ungetService(serializationManagerRef);
+
+ super.stop(context);
+ }
+
+ public SerializationManager getSerializationManager() {
+ return serializationManager;
+ }
+}
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.java (from r1504909, 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/ui/internal/ConnectionEditorSection.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ConnectionEditorSection.java&r1=1504909&r2=1504910&rev=1504910&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/ui/internal/ConnectionEditorSection.java Fri Jul 19 15:07:15 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.ui.internal;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Constants.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/Constants.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Constants.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Constants.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/Constants.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/Constants.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Constants.java Fri Jul 19 15:07:15 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.ui.internal;
public abstract class Constants {
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Constants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Constants.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportContentAction.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportContentAction.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportContentAction.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportContentAction.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportContentAction.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportContentAction.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportContentAction.java Fri Jul 19 15:07:15 2013
@@ -15,7 +15,7 @@
* is strictly forbidden unless prior written permission is obtained
* from Adobe Systems Incorporated.
**************************************************************************/
-package org.apache.sling.ide.eclipse.wst.ui.internal;
+package org.apache.sling.ide.eclipse.ui.internal;
import java.util.Iterator;
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportContentAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportContentAction.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL