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 2014/05/09 14:46:34 UTC
svn commit: r1593533 - in /sling/trunk/tooling/ide/eclipse-ui: ./
src/org/apache/sling/ide/eclipse/ui/internal/
src/org/apache/sling/ide/eclipse/ui/nav/model/
Author: rombert
Date: Fri May 9 12:46:33 2014
New Revision: 1593533
URL: http://svn.apache.org/r1593533
Log:
SLING-2635 - [Tooling] Logging framework for Slingclipse
Added tracing to eclipse-ui
Added:
sling/trunk/tooling/ide/eclipse-ui/.options
Modified:
sling/trunk/tooling/ide/eclipse-ui/build.properties
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
Added: sling/trunk/tooling/ide/eclipse-ui/.options
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/.options?rev=1593533&view=auto
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/.options (added)
+++ sling/trunk/tooling/ide/eclipse-ui/.options Fri May 9 12:46:33 2014
@@ -0,0 +1 @@
+org.apache.sling.ide.eclipse-ui/debug=false
\ No newline at end of file
Modified: sling/trunk/tooling/ide/eclipse-ui/build.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/build.properties?rev=1593533&r1=1593532&r2=1593533&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/build.properties (original)
+++ sling/trunk/tooling/ide/eclipse-ui/build.properties Fri May 9 12:46:33 2014
@@ -3,5 +3,6 @@ bin.includes = plugin.xml,\
.,\
icons/,\
OSGI-INF/,\
- lib/decentxml-1.4.jar
+ lib/decentxml-1.4.jar,\
+ .options
source.. = src/
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java?rev=1593533&r1=1593532&r2=1593533&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/Activator.java Fri May 9 12:46:33 2014
@@ -18,11 +18,15 @@ package org.apache.sling.ide.eclipse.ui.
import org.apache.sling.ide.artifacts.EmbeddedArtifactLocator;
import org.apache.sling.ide.eclipse.core.ServiceUtil;
+import org.apache.sling.ide.eclipse.core.debug.PluginLogger;
+import org.apache.sling.ide.eclipse.core.debug.PluginLoggerRegistrar;
import org.apache.sling.ide.filter.FilterLocator;
import org.apache.sling.ide.osgi.OsgiClientFactory;
import org.apache.sling.ide.serialization.SerializationManager;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
import org.osgi.service.event.EventAdmin;
import org.osgi.util.tracker.ServiceTracker;
@@ -36,6 +40,9 @@ public class Activator extends AbstractU
private ServiceTracker<EventAdmin, EventAdmin> eventAdmin;
private ServiceTracker<EmbeddedArtifactLocator, EmbeddedArtifactLocator> artifactLocator;
private ServiceTracker<OsgiClientFactory, OsgiClientFactory> osgiClientFactory;
+ private ServiceTracker<Object, Object> tracer;
+
+ private ServiceRegistration<?> tracerRegistration;
public static Activator getDefault() {
@@ -46,6 +53,8 @@ public class Activator extends AbstractU
public void start(BundleContext context) throws Exception {
super.start(context);
+ tracerRegistration = PluginLoggerRegistrar.register(this);
+
serializationManager = new ServiceTracker<SerializationManager, SerializationManager>(context,
SerializationManager.class, null);
serializationManager.open();
@@ -64,6 +73,11 @@ public class Activator extends AbstractU
null);
osgiClientFactory.open();
+ // ugh
+ ServiceReference<Object> reference = (ServiceReference<Object>) tracerRegistration.getReference();
+ tracer = new ServiceTracker<Object, Object>(context, reference, null);
+ tracer.open();
+
INSTANCE = this;
}
@@ -99,4 +113,8 @@ public class Activator extends AbstractU
public OsgiClientFactory getOsgiClientFactory() {
return ServiceUtil.getNotNull(osgiClientFactory);
}
+
+ public PluginLogger getPluginLogger() {
+ return (PluginLogger) ServiceUtil.getNotNull(tracer);
+ }
}
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java?rev=1593533&r1=1593532&r2=1593533&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java Fri May 9 12:46:33 2014
@@ -29,6 +29,7 @@ import org.apache.sling.ide.eclipse.core
import org.apache.sling.ide.eclipse.core.ProjectUtil;
import org.apache.sling.ide.eclipse.core.ResourceUtil;
import org.apache.sling.ide.eclipse.core.ServerUtil;
+import org.apache.sling.ide.eclipse.core.debug.PluginLogger;
import org.apache.sling.ide.filter.Filter;
import org.apache.sling.ide.filter.FilterLocator;
import org.apache.sling.ide.filter.FilterResult;
@@ -60,6 +61,8 @@ public class ImportRepositoryContentActi
private final IFile filterFile;
private final IPath projectRelativePath;
private final IProject project;
+ private final PluginLogger logger;
+
private SerializationManager serializationManager;
private SerializationDataBuilder builder;
@@ -72,6 +75,7 @@ public class ImportRepositoryContentActi
*/
public ImportRepositoryContentAction(IServer server, IFile filterFile, IPath projectRelativePath,
IProject project, SerializationManager serializationManager) throws SerializationException {
+ this.logger = Activator.getDefault().getPluginLogger();
this.server = server;
this.filterFile = filterFile;
this.projectRelativePath = projectRelativePath;
@@ -185,15 +189,13 @@ public class ImportRepositoryContentActi
File contentSyncRoot = ProjectUtil.getSyncDirectoryFullPath(project).toFile();
- System.out.println("crawlChildrenAndImport(" + repository + ", " + path + ", " + project + ", "
- + projectRelativePath + ")");
+ logger.trace("crawlChildrenAndImport({0}, {1}, {2}, {3}", repository, path, project, projectRelativePath);
ResourceProxy resource = executeCommand(repository.newListChildrenNodeCommand(path));
// TODO we should know all node types for which to create files and folders
SerializationData serializationData = builder.buildSerializationData(contentSyncRoot, resource);
- System.out.println("For resource at path " + resource.getPath() + " got serialization data "
- + serializationData);
+ logger.trace("For resource at path {0} got serialization data {1}", resource.getPath(), serializationData);
final List<ResourceProxy> resourceChildren = new LinkedList<ResourceProxy>(resource.getChildren());
if (serializationData != null) {
@@ -242,7 +244,7 @@ public class ImportRepositoryContentActi
}
}
- System.out.println("Children: " + resourceChildren);
+ logger.trace("Resource at {0} has children: {1}", resource.getPath(), resourceChildren);
if (serializationData.getSerializationKind() == SerializationKind.METADATA_FULL) {
return;
@@ -290,7 +292,7 @@ public class ImportRepositoryContentActi
IFile destinationFile = project.getFile(path);
- System.out.println("Writing content file at " + path);
+ logger.trace("Writing content file at {0}", path);
if (destinationFile.exists()) {
/* TODO progress monitor */
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java?rev=1593533&r1=1593532&r2=1593533&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java Fri May 9 12:46:33 2014
@@ -90,8 +90,7 @@ public class ImportWizard extends Wizard
Throwable cause = e.getCause();
mainPage.setErrorMessage("Import error : " + cause.getMessage()
+ " . Please see the error log for details.");
- Activator.getDefault().getLog()
- .log(new Status(Status.ERROR, Constants.PLUGIN_ID, "Repository import failed", cause));
+ Activator.getDefault().getPluginLogger().error("Repository import failed", cause);
return false;
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java?rev=1593533&r1=1593532&r2=1593533&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java Fri May 9 12:46:33 2014
@@ -34,6 +34,7 @@ import org.apache.jackrabbit.util.ISO907
import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
import org.apache.sling.ide.eclipse.core.ProjectUtil;
import org.apache.sling.ide.eclipse.ui.WhitelabelSupport;
+import org.apache.sling.ide.eclipse.ui.internal.Activator;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
@@ -513,9 +514,9 @@ public class JcrNode implements IAdaptab
@Override
public Object getAdapter(Class adapter) {
final Object result = doGetAdapter(adapter);
- //if (result==null) {
- //System.out.println("adapter looked for: "+adapter+", result: "+result);
- //}
+ if (result == null) {
+ Activator.getDefault().getPluginLogger().trace("Adapter looked for {0}, result: {1}", adapter, result);
+ }
return result;
}