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/07/17 23:37:36 UTC
svn commit: r1611483 - in /sling/trunk/tooling/ide: api/META-INF/
api/src/org/apache/sling/ide/log/ eclipse-core/META-INF/
eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/
eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/ eclipse-...
Author: rombert
Date: Thu Jul 17 21:37:35 2014
New Revision: 1611483
URL: http://svn.apache.org/r1611483
Log:
SLING-3765 - Sorting node children can trigger a StackOverFlowError
Move the PluginLogger to the API bundle and rename it to Logger. This is
a first step towards allowing the impl-vlt bundle's commands to run
outside Eclipse, and therefore be much easily tested.
Added:
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/log/
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/log/Logger.java (contents, props changed)
- copied, changed from r1611371, sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/PluginLogger.java
Removed:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/PluginLogger.java
Modified:
sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/PluginLoggerRegistrar.java
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/Tracer.java
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ResourceChangeCommandFactory.java
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleFacetInstallDelegate.java
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleModuleFactory.java
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/internal/validation/BundleProjectValidator.java
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/internal/validation/ServiceComponentHeaderValidator.java
sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/Activator.java
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/BundleProjectConfigurator.java
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ChooseArchetypeWizardPage.java
sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF
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/nav/model/JcrNode.java
sling/trunk/tooling/ide/impl-vlt/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/Activator.java
Modified: sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF?rev=1611483&r1=1611482&r2=1611483&view=diff
==============================================================================
--- sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF Thu Jul 17 21:37:35 2014
@@ -5,9 +5,12 @@ Bundle-SymbolicName: org.apache.sling.id
Bundle-Version: 1.0.1.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.apache.sling.ide.filter,org.apache.sling.ide.osgi,
- org.apache.sling.ide.serialization,org.apache.sling.ide.transport,org
- .apache.sling.ide.util
+Export-Package: org.apache.sling.ide.filter,
+ org.apache.sling.ide.log,
+ org.apache.sling.ide.osgi,
+ org.apache.sling.ide.serialization,
+ org.apache.sling.ide.transport,
+ org.apache.sling.ide.util
Import-Package: javax.jcr.nodetype,
org.apache.commons.httpclient;version="3.1.0",
org.apache.commons.httpclient.auth;version="3.1.0",
Copied: sling/trunk/tooling/ide/api/src/org/apache/sling/ide/log/Logger.java (from r1611371, sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/PluginLogger.java)
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/src/org/apache/sling/ide/log/Logger.java?p2=sling/trunk/tooling/ide/api/src/org/apache/sling/ide/log/Logger.java&p1=sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/PluginLogger.java&r1=1611371&r2=1611483&rev=1611483&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/PluginLogger.java (original)
+++ sling/trunk/tooling/ide/api/src/org/apache/sling/ide/log/Logger.java Thu Jul 17 21:37:35 2014
@@ -14,25 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.eclipse.core.debug;
-
-import org.eclipse.osgi.util.NLS;
+package org.apache.sling.ide.log;
/**
- * The <tt>PluginLogger</tt> is a simple helper class which assists with logging from Eclipse plugins
+ * The <tt>Logger</tt> is a simple helper class which assists with logging
*
*/
-public interface PluginLogger {
+public interface Logger {
/**
- * Logs an error message using the platform log facility
+ * Logs an error message
*
* @param message message to log
*/
void error(String message);
/**
- * Logs an error message using the platform log facility
+ * Logs an error message
*
* @param message message to log
* @param cause the cause
@@ -40,14 +38,14 @@ public interface PluginLogger {
void error(String message, Throwable cause);
/**
- * Logs a warning message using the platform log facility
+ * Logs a warning message
*
* @param message message to log
*/
void warn(String message);
/**
- * Logs an warning message using the platform log facility
+ * Logs an warning message
*
* @param message message to log
* @param cause the cause
@@ -55,11 +53,7 @@ public interface PluginLogger {
void warn(String message, Throwable cause);
/**
- * Sends a trace message using the platform debug facility
- *
- * <p>
- * By default these trace messages are ignored, and are only logged if debugging is enabled for a specific plug-in.
- * </p>
+ * Sends a trace message
*
* <p>
* Usage guide:
@@ -70,20 +64,14 @@ public interface PluginLogger {
* a.join(b);
* </pre>
*
- * @param message A message, using the syntax from {@link NLS#bind(String, Object[])}
+ * @param message A message, using positional argument syntax
* @param arguments an optional array of arguments
*
- * @see <a href="https://wiki.eclipse.org/FAQ_How_do_I_use_the_platform_debug_tracing_facility%3F">How do I use the
- * platform debug tracing facility?</a>
*/
void trace(String message, Object... arguments);
/**
- * Sends a trace message using the platform debug facility
- *
- * <p>
- * By default these trace messages are ignored, and are only logged if debugging is enabled for a specific plug-in.
- * </p>
+ * Sends a trace message
*
* <p>
* Usage guide:
@@ -99,9 +87,6 @@ public interface PluginLogger {
*
* @param message A string message
* @param error the error that occured
- *
- * @see <a href="https://wiki.eclipse.org/FAQ_How_do_I_use_the_platform_debug_tracing_facility%3F">How do I use the
- * platform debug tracing facility?</a>
*/
void trace(String message, Throwable error);
}
Propchange: sling/trunk/tooling/ide/api/src/org/apache/sling/ide/log/Logger.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/tooling/ide/api/src/org/apache/sling/ide/log/Logger.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified: sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF?rev=1611483&r1=1611482&r2=1611483&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF Thu Jul 17 21:37:35 2014
@@ -19,6 +19,7 @@ Import-Package: org.apache.commons.httpc
org.apache.commons.io;version="2.0.1",
org.apache.sling.ide.artifacts,
org.apache.sling.ide.filter,
+ org.apache.sling.ide.log,
org.apache.sling.ide.osgi,
org.apache.sling.ide.serialization,
org.apache.sling.ide.transport,
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/PluginLoggerRegistrar.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/PluginLoggerRegistrar.java?rev=1611483&r1=1611482&r2=1611483&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/PluginLoggerRegistrar.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/PluginLoggerRegistrar.java Thu Jul 17 21:37:35 2014
@@ -20,6 +20,7 @@ import java.util.Dictionary;
import java.util.Hashtable;
import org.apache.sling.ide.eclipse.core.debug.impl.Tracer;
+import org.apache.sling.ide.log.Logger;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.osgi.service.debug.DebugOptions;
import org.eclipse.osgi.service.debug.DebugOptionsListener;
@@ -27,7 +28,7 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
/**
- * The <tt>PluginLoggerRegistrar</tt> registers {@link PluginLogger} implementations for use for specific plugins
+ * The <tt>PluginLoggerRegistrar</tt> registers {@link Logger} implementations for use for specific plugins
*
*/
public class PluginLoggerRegistrar {
@@ -43,7 +44,7 @@ public class PluginLoggerRegistrar {
Dictionary<String, Object> props = new Hashtable<String, Object>();
props.put(DebugOptions.LISTENER_SYMBOLICNAME, plugin.getBundle().getSymbolicName());
BundleContext ctx = plugin.getBundle().getBundleContext();
- return ctx.registerService(new String[] { DebugOptionsListener.class.getName(), PluginLogger.class.getName() },
+ return ctx.registerService(new String[] { DebugOptionsListener.class.getName(), Logger.class.getName() },
new Tracer(plugin), props);
}
}
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/Tracer.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/Tracer.java?rev=1611483&r1=1611482&r2=1611483&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/Tracer.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/Tracer.java Thu Jul 17 21:37:35 2014
@@ -16,7 +16,7 @@
*/
package org.apache.sling.ide.eclipse.core.debug.impl;
-import org.apache.sling.ide.eclipse.core.debug.PluginLogger;
+import org.apache.sling.ide.log.Logger;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Status;
@@ -26,9 +26,9 @@ import org.eclipse.osgi.service.debug.De
import org.eclipse.osgi.util.NLS;
/**
- * The <tt>Tracer</tt> is the default implementation of the <tt>PluginLogger</tt>
+ * The <tt>Tracer</tt> is the default implementation of the <tt>Logger</tt>
*/
-public class Tracer implements DebugOptionsListener, PluginLogger {
+public class Tracer implements DebugOptionsListener, Logger {
private final Plugin plugin;
private boolean debugEnabled;
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java?rev=1611483&r1=1611482&r2=1611483&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/Activator.java Thu Jul 17 21:37:35 2014
@@ -20,9 +20,9 @@ import java.util.HashMap;
import java.util.Map;
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.log.Logger;
import org.apache.sling.ide.osgi.OsgiClientFactory;
import org.apache.sling.ide.serialization.SerializationManager;
import org.apache.sling.ide.transport.CommandExecutionProperties;
@@ -135,8 +135,8 @@ public class Activator extends Plugin {
return ServiceUtil.getNotNull(osgiClientFactory);
}
- public PluginLogger getPluginLogger() {
- return (PluginLogger) ServiceUtil.getNotNull(tracer);
+ public Logger getPluginLogger() {
+ return (Logger) ServiceUtil.getNotNull(tracer);
}
public void issueConsoleLog(String actionType, String path, String message) {
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ResourceChangeCommandFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ResourceChangeCommandFactory.java?rev=1611483&r1=1611482&r2=1611483&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ResourceChangeCommandFactory.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ResourceChangeCommandFactory.java Thu Jul 17 21:37:35 2014
@@ -26,9 +26,9 @@ import java.util.Set;
import org.apache.commons.io.IOUtils;
import org.apache.sling.ide.eclipse.core.ProjectUtil;
import org.apache.sling.ide.eclipse.core.ResourceUtil;
-import org.apache.sling.ide.eclipse.core.debug.PluginLogger;
import org.apache.sling.ide.filter.Filter;
import org.apache.sling.ide.filter.FilterResult;
+import org.apache.sling.ide.log.Logger;
import org.apache.sling.ide.serialization.SerializationException;
import org.apache.sling.ide.serialization.SerializationKind;
import org.apache.sling.ide.serialization.SerializationManager;
@@ -274,7 +274,7 @@ public class ResourceChangeCommandFactor
// TODO - this too should be abstracted in the service layer, rather than in the Eclipse-specific code
- PluginLogger logger = Activator.getDefault().getPluginLogger();
+ Logger logger = Activator.getDefault().getPluginLogger();
logger.trace("Found plain nt:folder candidate at {0}, trying to find a covering resource for it",
changedResource.getProjectRelativePath());
// don't use isRoot() to prevent infinite loop when the final path is '//'
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleFacetInstallDelegate.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleFacetInstallDelegate.java?rev=1611483&r1=1611482&r2=1611483&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleFacetInstallDelegate.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleFacetInstallDelegate.java Thu Jul 17 21:37:35 2014
@@ -16,7 +16,7 @@
*/
package org.apache.sling.ide.eclipse.core.internal;
-import org.apache.sling.ide.eclipse.core.debug.PluginLogger;
+import org.apache.sling.ide.log.Logger;
import org.eclipse.core.resources.ICommand;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
@@ -33,7 +33,7 @@ public class SlingBundleFacetInstallDele
public void execute(IProject project, IProjectFacetVersion facetVersion, Object config, IProgressMonitor monitor)
throws CoreException {
- PluginLogger pluginLogger = Activator.getDefault().getPluginLogger();
+ Logger pluginLogger = Activator.getDefault().getPluginLogger();
pluginLogger.trace("Installing facet {0} on project {1}", facetVersion, project);
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleModuleFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleModuleFactory.java?rev=1611483&r1=1611482&r2=1611483&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleModuleFactory.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleModuleFactory.java Thu Jul 17 21:37:35 2014
@@ -22,7 +22,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.sling.ide.eclipse.core.debug.PluginLogger;
+import org.apache.sling.ide.log.Logger;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
@@ -174,7 +174,7 @@ public class SlingBundleModuleFactory ex
}
});
- PluginLogger logger = Activator.getDefault().getPluginLogger();
+ Logger logger = Activator.getDefault().getPluginLogger();
for (Iterator<IModuleResource> it = resources.iterator(); it.hasNext();) {
IModuleResource iModuleResource = it.next();
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java?rev=1611483&r1=1611482&r2=1611483&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java Thu Jul 17 21:37:35 2014
@@ -26,7 +26,7 @@ import java.util.List;
import org.apache.sling.ide.artifacts.EmbeddedArtifactLocator;
import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
import org.apache.sling.ide.eclipse.core.ServerUtil;
-import org.apache.sling.ide.eclipse.core.debug.PluginLogger;
+import org.apache.sling.ide.log.Logger;
import org.apache.sling.ide.osgi.OsgiClient;
import org.apache.sling.ide.osgi.OsgiClientException;
import org.apache.sling.ide.serialization.SerializationException;
@@ -142,7 +142,7 @@ public class SlingLaunchpadBehaviour ext
protected void publishModule(int kind, int deltaKind, IModule[] module, IProgressMonitor monitor)
throws CoreException {
- PluginLogger logger = Activator.getDefault().getPluginLogger();
+ Logger logger = Activator.getDefault().getPluginLogger();
if (commandFactory == null) {
commandFactory = new ResourceChangeCommandFactory(Activator.getDefault().getSerializationManager());
@@ -332,7 +332,7 @@ public class SlingLaunchpadBehaviour ext
private void publishContentModule(int kind, int deltaKind, IModule[] module, IProgressMonitor monitor)
throws CoreException, SerializationException, IOException {
- PluginLogger logger = Activator.getDefault().getPluginLogger();
+ Logger logger = Activator.getDefault().getPluginLogger();
Repository repository = ServerUtil.getConnectedRepository(getServer(), monitor);
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/internal/validation/BundleProjectValidator.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/internal/validation/BundleProjectValidator.java?rev=1611483&r1=1611482&r2=1611483&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/internal/validation/BundleProjectValidator.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/internal/validation/BundleProjectValidator.java Thu Jul 17 21:37:35 2014
@@ -16,8 +16,8 @@
*/
package org.apache.sling.ide.eclipse.internal.validation;
-import org.apache.sling.ide.eclipse.core.debug.PluginLogger;
import org.apache.sling.ide.eclipse.core.internal.Activator;
+import org.apache.sling.ide.log.Logger;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource;
@@ -46,7 +46,7 @@ public class BundleProjectValidator exte
IFile m = (IFile) resource;
- PluginLogger pluginLogger = Activator.getDefault() .getPluginLogger();
+ Logger pluginLogger = Activator.getDefault() .getPluginLogger();
try {
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/internal/validation/ServiceComponentHeaderValidator.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/internal/validation/ServiceComponentHeaderValidator.java?rev=1611483&r1=1611482&r2=1611483&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/internal/validation/ServiceComponentHeaderValidator.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/internal/validation/ServiceComponentHeaderValidator.java Thu Jul 17 21:37:35 2014
@@ -24,9 +24,9 @@ import java.util.List;
import java.util.jar.Manifest;
import org.apache.commons.io.IOUtils;
-import org.apache.sling.ide.eclipse.core.debug.PluginLogger;
import org.apache.sling.ide.eclipse.core.internal.Activator;
import org.apache.sling.ide.eclipse.core.internal.ProjectHelper;
+import org.apache.sling.ide.log.Logger;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
@@ -52,7 +52,7 @@ public class ServiceComponentHeaderValid
IProject project = manifest.getProject();
- PluginLogger pluginLogger = Activator.getDefault().getPluginLogger();
+ Logger pluginLogger = Activator.getDefault().getPluginLogger();
IJavaProject javaProject = ProjectHelper.asJavaProject(project);
Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF?rev=1611483&r1=1611482&r2=1611483&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF Thu Jul 17 21:37:35 2014
@@ -31,6 +31,7 @@ Import-Package: org.apache.commons.httpc
org.apache.sling.ide.eclipse.core.progress,
org.apache.sling.ide.eclipse.ui,
org.apache.sling.ide.eclipse.ui.wizards,
+ org.apache.sling.ide.log,
org.apache.sling.ide.osgi,
org.apache.sling.ide.transport,
org.codehaus.plexus,
Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/Activator.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/Activator.java?rev=1611483&r1=1611482&r2=1611483&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/Activator.java (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/Activator.java Thu Jul 17 21:37:35 2014
@@ -18,8 +18,8 @@ package org.apache.sling.ide.eclipse.m2e
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.log.Logger;
import org.apache.sling.ide.osgi.OsgiClientFactory;
import org.eclipse.core.runtime.Plugin;
import org.osgi.framework.BundleContext;
@@ -82,7 +82,7 @@ public class Activator extends Plugin {
return ServiceUtil.getNotNull(osgiClientFactory);
}
- public PluginLogger getPluginLogger() {
- return (PluginLogger) ServiceUtil.getNotNull(tracer);
+ public Logger getPluginLogger() {
+ return (Logger) ServiceUtil.getNotNull(tracer);
}
}
Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/BundleProjectConfigurator.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/BundleProjectConfigurator.java?rev=1611483&r1=1611482&r2=1611483&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/BundleProjectConfigurator.java (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/BundleProjectConfigurator.java Thu Jul 17 21:37:35 2014
@@ -18,7 +18,7 @@ package org.apache.sling.ide.eclipse.m2e
import org.apache.maven.model.Plugin;
import org.apache.sling.ide.eclipse.core.ConfigurationHelper;
-import org.apache.sling.ide.eclipse.core.debug.PluginLogger;
+import org.apache.sling.ide.log.Logger;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -34,7 +34,7 @@ public class BundleProjectConfigurator e
public void configure(ProjectConfigurationRequest configRequest, IProgressMonitor monitor) throws CoreException {
// at this point the JDT project is already created by the tycho plugin
// we just need to setup the appropriate facets
- PluginLogger logger = Activator.getDefault().getPluginLogger();
+ Logger logger = Activator.getDefault().getPluginLogger();
IProject project = configRequest.getProject();
logger.trace("BundleProjectActivator called for POM {0} and project {1}", configRequest.getPom().getFullPath(),
project.getName());
Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ChooseArchetypeWizardPage.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ChooseArchetypeWizardPage.java?rev=1611483&r1=1611482&r2=1611483&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ChooseArchetypeWizardPage.java (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ChooseArchetypeWizardPage.java Thu Jul 17 21:37:35 2014
@@ -25,8 +25,8 @@ import java.util.Set;
import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
-import org.apache.sling.ide.eclipse.core.debug.PluginLogger;
import org.apache.sling.ide.eclipse.m2e.internal.Activator;
+import org.apache.sling.ide.log.Logger;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
@@ -293,7 +293,7 @@ public class ChooseArchetypeWizardPage e
@Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- PluginLogger logger = Activator.getDefault().getPluginLogger();
+ Logger logger = Activator.getDefault().getPluginLogger();
monitor.beginTask("Discovering archetypes...", 5);
ArchetypeManager manager = MavenPluginActivator.getDefault().getArchetypeManager();
Modified: sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF?rev=1611483&r1=1611482&r2=1611483&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF Thu Jul 17 21:37:35 2014
@@ -19,6 +19,7 @@ Import-Package: javax.jcr,
org.apache.sling.ide.artifacts,
org.apache.sling.ide.eclipse.core,
org.apache.sling.ide.filter,
+ org.apache.sling.ide.log,
org.apache.sling.ide.osgi,
org.apache.sling.ide.serialization,
org.apache.sling.ide.transport,
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=1611483&r1=1611482&r2=1611483&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 Thu Jul 17 21:37:35 2014
@@ -18,9 +18,9 @@ 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.log.Logger;
import org.apache.sling.ide.osgi.OsgiClientFactory;
import org.apache.sling.ide.serialization.SerializationManager;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -114,7 +114,7 @@ public class Activator extends AbstractU
return ServiceUtil.getNotNull(osgiClientFactory);
}
- public PluginLogger getPluginLogger() {
- return (PluginLogger) ServiceUtil.getNotNull(tracer);
+ public Logger getPluginLogger() {
+ return (Logger) 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=1611483&r1=1611482&r2=1611483&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 Thu Jul 17 21:37:35 2014
@@ -31,11 +31,11 @@ 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.eclipse.core.progress.ProgressUtils;
import org.apache.sling.ide.filter.Filter;
import org.apache.sling.ide.filter.FilterResult;
import org.apache.sling.ide.filter.IgnoredResources;
+import org.apache.sling.ide.log.Logger;
import org.apache.sling.ide.serialization.SerializationData;
import org.apache.sling.ide.serialization.SerializationDataBuilder;
import org.apache.sling.ide.serialization.SerializationException;
@@ -64,7 +64,7 @@ public class ImportRepositoryContentActi
private final IServer server;
private final IPath projectRelativePath;
private final IProject project;
- private final PluginLogger logger;
+ private final Logger logger;
private SerializationManager serializationManager;
private SerializationDataBuilder builder;
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=1611483&r1=1611482&r2=1611483&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 Thu Jul 17 21:37:35 2014
@@ -41,12 +41,12 @@ 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.core.ServerUtil;
-import org.apache.sling.ide.eclipse.core.debug.PluginLogger;
import org.apache.sling.ide.eclipse.core.internal.Activator;
import org.apache.sling.ide.eclipse.ui.WhitelabelSupport;
import org.apache.sling.ide.eclipse.ui.views.PropertyTypeSupport;
import org.apache.sling.ide.filter.Filter;
import org.apache.sling.ide.filter.FilterResult;
+import org.apache.sling.ide.log.Logger;
import org.apache.sling.ide.serialization.SerializationKind;
import org.apache.sling.ide.serialization.SerializationKindManager;
import org.apache.sling.ide.transport.NodeTypeRegistry;
@@ -1145,7 +1145,7 @@ public class JcrNode implements IAdaptab
return result==FilterResult.ALLOW;
}
} catch (CoreException e) {
- PluginLogger logger = Activator.getDefault().getPluginLogger();
+ Logger logger = Activator.getDefault().getPluginLogger();
logger.error("Could not verify child node allowance: "+this, e);
return false;
}
@@ -1240,7 +1240,7 @@ public class JcrNode implements IAdaptab
try {
contentXml.delete(true, new NullProgressMonitor());
} catch (CoreException e) {
- PluginLogger logger = Activator.getDefault().getPluginLogger();
+ Logger logger = Activator.getDefault().getPluginLogger();
logger.error("Could not delete "+contentXml.getFullPath()+", e="+e, e);
MessageDialog.openError(null, "Could not delete file",
"Could not delete "+contentXml.getFullPath()+", "+e);
@@ -1299,7 +1299,7 @@ public class JcrNode implements IAdaptab
return;
} catch (CoreException e) {
MessageDialog.openWarning(null, "Unable to change primaryType", "Exception occurred: "+e);
- PluginLogger logger = Activator.getDefault().getPluginLogger();
+ Logger logger = Activator.getDefault().getPluginLogger();
logger.error("Exception occurred", e);
return;
}
@@ -1389,7 +1389,7 @@ public class JcrNode implements IAdaptab
return false;
}
} catch (RepositoryException e) {
- PluginLogger logger = Activator.getDefault().getPluginLogger();
+ Logger logger = Activator.getDefault().getPluginLogger();
logger.error("Could not determine allowed primary child node types", e);
}
}
Modified: sling/trunk/tooling/ide/impl-vlt/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt/META-INF/MANIFEST.MF?rev=1611483&r1=1611482&r2=1611483&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-vlt/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/impl-vlt/META-INF/MANIFEST.MF Thu Jul 17 21:37:35 2014
@@ -21,6 +21,7 @@ Import-Package: javax.jcr,
org.apache.sling.ide.eclipse.core,
org.apache.sling.ide.eclipse.core.debug,
org.apache.sling.ide.filter,
+ org.apache.sling.ide.log,
org.apache.sling.ide.serialization,
org.apache.sling.ide.transport,
org.apache.sling.ide.util,
Modified: sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/Activator.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/Activator.java?rev=1611483&r1=1611482&r2=1611483&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/Activator.java (original)
+++ sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/Activator.java Thu Jul 17 21:37:35 2014
@@ -17,8 +17,8 @@
package org.apache.sling.ide.impl.vlt;
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.log.Logger;
import org.eclipse.core.runtime.Plugin;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -80,7 +80,7 @@ public class Activator extends Plugin {
return plugin;
}
- public PluginLogger getPluginLogger() {
- return (PluginLogger) ServiceUtil.getNotNull(tracer);
+ public Logger getPluginLogger() {
+ return (Logger) ServiceUtil.getNotNull(tracer);
}
}