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 [2/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...
Copied: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java (from r1504909, 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/ui/internal/ImportWizard.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportWizard.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/ImportWizard.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.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.io.ByteArrayInputStream;
import java.nio.charset.Charset;
@@ -23,13 +23,11 @@ import java.util.Iterator;
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;
-import org.apache.sling.slingclipse.api.Repository;
-import org.apache.sling.slingclipse.api.RepositoryException;
-import org.apache.sling.slingclipse.api.ResponseType;
-import org.apache.sling.slingclipse.api.Result;
-import org.apache.sling.slingclipse.helper.Tracer;
+import org.apache.sling.ide.transport.Command;
+import org.apache.sling.ide.transport.Repository;
+import org.apache.sling.ide.transport.RepositoryException;
+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.IProject;
@@ -62,7 +60,7 @@ public class ImportWizard extends Wizard
*/
public ImportWizard() {
super();
- serializationManager = SlingclipsePlugin.getDefault().getSerializationManager();
+ serializationManager = Activator.getDefault().getSerializationManager();
}
/*
@@ -88,8 +86,6 @@ public class ImportWizard extends Wizard
Repository repository = ServerUtil.getRepository(server, monitor);
- Tracer tracer = SlingclipsePlugin.getDefault().getTracer();
-
monitor.setTaskName("Loading configuration...");
monitor.worked(5);
ISlingLaunchpadServer launchpad = (ISlingLaunchpadServer) server.loadAdapter(
@@ -112,13 +108,13 @@ public class ImportWizard extends Wizard
// we create the root node and assume this is a folder
createRoot(project, projectRelativePath, repositoryPath);
- crawlChildrenAndImport(repository, repositoryPath, project, projectRelativePath, tracer);
+ crawlChildrenAndImport(repository, repositoryPath, project, projectRelativePath);
monitor.setTaskName("Import Complete");
monitor.worked(100);
} catch ( Exception e) {
- Status status = new Status(Status.ERROR, SlingclipsePlugin.PLUGIN_ID, "Failed importing repository ", e);
- SlingclipsePlugin.getDefault().getLog().log(status);
+ Status status = new Status(Status.ERROR, Activator.PLUGIN_ID, "Failed importing repository ", e);
+ Activator.getDefault().getLog().log(status);
return status;
}finally{
if (oldPublishState != ISlingLaunchpadServer.PUBLISH_STATE_NEVER) {
@@ -183,24 +179,25 @@ public class ImportWizard extends Wizard
* @throws CoreException
*/
// TODO: This probably should be pushed into the service layer
- private void crawlChildrenAndImport(Repository repository,String path,IProject project, IPath projectRelativePath, Tracer tracer) throws JSONException, RepositoryException, CoreException{
+ private void crawlChildrenAndImport(Repository repository, String path, IProject project, IPath projectRelativePath)
+ throws JSONException, RepositoryException, CoreException {
System.out.println("crawlChildrenAndImport(" + repository + ", " + path + ", " + project + ", "
+ projectRelativePath + ")");
- String children = executeCommand(repository.newListChildrenNodeCommand(path, ResponseType.JSON), tracer);
+ String children = executeCommand(repository.newListChildrenNodeCommand(path, ResponseType.JSON));
JSONObject json = new JSONObject(children);
String primaryType= json.optString(Repository.JCR_PRIMARY_TYPE);
if (Repository.NT_FILE.equals(primaryType)){
- importFile(repository, path, project, projectRelativePath, tracer);
+ importFile(repository, path, project, projectRelativePath);
}else if (Repository.NT_FOLDER.equals(primaryType)){
createFolder(project, projectRelativePath.append(path));
}else if(Repository.NT_RESOURCE.equals(primaryType)){
//DO NOTHING
}else{
createFolder(project, projectRelativePath.append(path));
- String content = executeCommand(repository.newGetNodeContentCommand(path, ResponseType.JSON), tracer);
+ String content = executeCommand(repository.newGetNodeContentCommand(path, ResponseType.JSON));
JSONObject jsonContent = new JSONObject(content);
String contentXml = JSONML.toString(jsonContent);
createFile(project, projectRelativePath.append(serializationManager.getSerializationFilePath(path)),
@@ -211,25 +208,23 @@ public class ImportWizard extends Wizard
String key = (String) keys.next();
JSONObject innerjson=json.optJSONObject(key);
if (innerjson!=null){
- crawlChildrenAndImport(repository, path+"/"+key, project, projectRelativePath, tracer);
+ crawlChildrenAndImport(repository, path + "/" + key, project, projectRelativePath);
}
}
}
- private <T> T executeCommand(Command<T> command, Tracer tracer) throws RepositoryException {
+ private <T> T executeCommand(Command<T> command) throws RepositoryException {
Result<T> result = command.execute();
-
- SlingclipsePlugin.getDefault().getTracer().trace("{0} : {1}.", command, result);
-
return result.get();
}
- private void importFile(Repository repository,String path,IProject project, IPath destinationPath, Tracer tracer) throws JSONException, RepositoryException, CoreException{
+ private void importFile(Repository repository, String path, IProject project, IPath destinationPath)
+ throws JSONException, RepositoryException, CoreException {
System.out.println("importFile: " + path + " -> " + destinationPath);
- byte[] node = executeCommand(repository.newGetNodeCommand(path), tracer);
+ byte[] node = executeCommand(repository.newGetNodeCommand(path));
createFile(project, destinationPath.append(path), node );
}
@@ -239,8 +234,6 @@ public class ImportWizard extends Wizard
if ( destinationFolder.exists() )
return;
- SlingclipsePlugin.getDefault().getTracer().trace("Creating folder {0}", destinationFolder.getFullPath());
-
destinationFolder.create(true, true, null /* TODO progress monitor */);
}
@@ -249,8 +242,6 @@ public class ImportWizard extends Wizard
IFile destinationFile = project.getFile(path);
if ( destinationFile.exists() )
return;
-
- SlingclipsePlugin.getDefault().getTracer().trace("Creating file {0}", destinationFile.getFullPath());
destinationFile.create(new ByteArrayInputStream(node), true, null /* TODO progress monitor */);
}
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.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/ImportWizardPage.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportWizardPage.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/ImportWizardPage.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/ImportWizardPage.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java Fri Jul 19 15:07:15 2013
@@ -14,12 +14,12 @@
* 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.util.List;
-import org.apache.sling.slingclipse.helper.SlingclipseHelper;
+import org.apache.sling.ide.eclipse.core.SlingclipseHelper;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.NullProgressMonitor;
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.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/SelectionUtils.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SelectionUtils.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SelectionUtils.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SelectionUtils.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SelectionUtils.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/SelectionUtils.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SelectionUtils.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.util.ArrayList;
import java.util.Collections;
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SelectionUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SelectionUtils.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/SlingLaunchpadLaunchConfigurationTabGroup.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.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/SlingLaunchpadLaunchConfigurationTabGroup.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.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 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/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingLaunchpadLaunchConfigurationTabGroup.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/SlingProjectPropertyPage.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingProjectPropertyPage.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingProjectPropertyPage.java?p2=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingProjectPropertyPage.java&p1=sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/wst/ui/internal/SlingProjectPropertyPage.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/SlingProjectPropertyPage.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingProjectPropertyPage.java Fri Jul 19 15:07:15 2013
@@ -1,4 +1,4 @@
-package org.apache.sling.ide.eclipse.wst.ui.internal;
+package org.apache.sling.ide.eclipse.ui.internal;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingProjectPropertyPage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingProjectPropertyPage.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified: sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/RepositoryImpl.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/RepositoryImpl.xml?rev=1504910&r1=1504909&r2=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/RepositoryImpl.xml (original)
+++ sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/RepositoryImpl.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.http.impl.RepositoryImpl"/>
+ <implementation class="org.apache.sling.ide.impl.resource.transport.RepositoryImpl"/>
<service>
- <provide interface="org.apache.sling.slingclipse.api.Repository"/>
+ <provide interface="org.apache.sling.ide.transport.Repository"/>
</service>
- <reference bind="bindTracer" cardinality="1..1" interface="org.apache.sling.ide.impl.util.Tracer" name="Tracer" policy="static"/>
+ <reference bind="bindTracer" cardinality="1..1" interface="org.apache.sling.ide.impl.resource.util.Tracer" name="Tracer" policy="static"/>
</scr:component>
Modified: sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/SimpleXmlSerializationManager.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/SimpleXmlSerializationManager.xml?rev=1504910&r1=1504909&r2=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/SimpleXmlSerializationManager.xml (original)
+++ sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/SimpleXmlSerializationManager.xml Fri Jul 19 15:07:15 2013
@@ -1,6 +1,6 @@
<?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.ide.serialization.simplexml.SimpleXmlSerializationManager"/>
+ <implementation class="org.apache.sling.ide.impl.resource.serialization.SimpleXmlSerializationManager"/>
<service>
<provide interface="org.apache.sling.ide.serialization.SerializationManager"/>
</service>
Modified: sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/Tracer.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/Tracer.xml?rev=1504910&r1=1504909&r2=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/impl-resource/OSGI-INF/Tracer.xml (original)
+++ sling/whiteboard/asanso/plugins/eclipse/impl-resource/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.ide.impl.util.Tracer"/>
+ <implementation class="org.apache.sling.ide.impl.resource.util.Tracer"/>
<property name="listener.symbolic.name" type="String" value="org.apache.sling.ide.impl-resource"/>
<service>
- <provide interface="org.apache.sling.ide.impl.util.Tracer"/>
+ <provide interface="org.apache.sling.ide.impl.resource.util.Tracer"/>
</service>
</scr:component>
Copied: sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/serialization/simplexml/SimpleXmlSerializationManager.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java?p2=sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java&p1=sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/serialization/simplexml/SimpleXmlSerializationManager.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/serialization/simplexml/SimpleXmlSerializationManager.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.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.serialization.simplexml;
+package org.apache.sling.ide.impl.resource.serialization;
import java.io.BufferedReader;
import java.io.File;
@@ -27,7 +27,7 @@ import java.util.Iterator;
import java.util.Map;
import org.apache.sling.ide.serialization.SerializationManager;
-import org.apache.sling.slingclipse.api.ProtectedNodes;
+import org.apache.sling.ide.transport.ProtectedNodes;
import org.json.JSONException;
import org.json.JSONML;
import org.json.JSONObject;
Propchange: sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractRepository.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/slingclipse/http/impl/AbstractRepository.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractRepository.java?p2=sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractRepository.java&p1=sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/slingclipse/http/impl/AbstractRepository.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/slingclipse/http/impl/AbstractRepository.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractRepository.java Fri Jul 19 15:07:15 2013
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.slingclipse.http.impl;
+package org.apache.sling.ide.impl.resource.transport;
-import org.apache.sling.slingclipse.api.Repository;
-import org.apache.sling.slingclipse.api.RepositoryInfo;
+import org.apache.sling.ide.transport.Repository;
+import org.apache.sling.ide.transport.RepositoryInfo;
//TODO move to api?
public abstract class AbstractRepository implements Repository{
Propchange: sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractRepository.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractRepository.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractResult.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/slingclipse/http/impl/AbstractResult.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractResult.java?p2=sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractResult.java&p1=sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/slingclipse/http/impl/AbstractResult.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/slingclipse/http/impl/AbstractResult.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractResult.java Fri Jul 19 15:07:15 2013
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.slingclipse.http.impl;
+package org.apache.sling.ide.impl.resource.transport;
-import org.apache.sling.slingclipse.api.RepositoryException;
-import org.apache.sling.slingclipse.api.Result;
+import org.apache.sling.ide.transport.RepositoryException;
+import org.apache.sling.ide.transport.Result;
public class AbstractResult<T> implements Result<T> {
Propchange: sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractResult.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/AbstractResult.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/slingclipse/http/impl/RepositoryImpl.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java?p2=sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java&p1=sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/slingclipse/http/impl/RepositoryImpl.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/slingclipse/http/impl/RepositoryImpl.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.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.http.impl;
+package org.apache.sling.ide.impl.resource.transport;
import java.io.File;
import java.util.Map;
@@ -29,12 +29,12 @@ import org.apache.commons.httpclient.met
import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;
import org.apache.commons.httpclient.methods.multipart.Part;
import org.apache.commons.httpclient.methods.multipart.StringPart;
-import org.apache.sling.ide.impl.util.Tracer;
-import org.apache.sling.slingclipse.api.Command;
-import org.apache.sling.slingclipse.api.FileInfo;
-import org.apache.sling.slingclipse.api.RepositoryException;
-import org.apache.sling.slingclipse.api.ResponseType;
-import org.apache.sling.slingclipse.api.Result;
+import org.apache.sling.ide.impl.resource.util.Tracer;
+import org.apache.sling.ide.transport.Command;
+import org.apache.sling.ide.transport.FileInfo;
+import org.apache.sling.ide.transport.RepositoryException;
+import org.apache.sling.ide.transport.ResponseType;
+import org.apache.sling.ide.transport.Result;
public class RepositoryImpl extends AbstractRepository{
Propchange: sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryImpl.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/util/Constants.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java?p2=sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java&p1=sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/util/Constants.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/util/Constants.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/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.impl.util;
+package org.apache.sling.ide.impl.resource.util;
public class Constants {
Propchange: sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Constants.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Tracer.java (from r1504909, sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/util/Tracer.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Tracer.java?p2=sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Tracer.java&p1=sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/util/Tracer.java&r1=1504909&r2=1504910&rev=1504910&view=diff
==============================================================================
--- sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/util/Tracer.java (original)
+++ sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Tracer.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.impl.util;
+package org.apache.sling.ide.impl.resource.util;
import org.eclipse.osgi.service.debug.DebugOptions;
import org.eclipse.osgi.service.debug.DebugOptionsListener;
Propchange: sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Tracer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/whiteboard/asanso/plugins/eclipse/impl-resource/src/org/apache/sling/ide/impl/resource/util/Tracer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL