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 2016/11/01 13:00:22 UTC
svn commit: r1767491 - in /sling/trunk/tooling/ide: ./ api/ api/META-INF/
api/OSGI-INF/ api/src/org/apache/sling/ide/osgi/impl/
api/src/org/apache/sling/ide/transport/impl/ artifacts/ artifacts/OSGI-INF/
artifacts/src/org/apache/sling/ide/artifacts/imp...
Author: rombert
Date: Tue Nov 1 13:00:21 2016
New Revision: 1767491
URL: http://svn.apache.org/viewvc?rev=1767491&view=rev
Log:
SLING-3014 - [build] Generate SCR descriptors using Maven
Use the bnd-maven-plugin to generate SCR descriptors.
Removed:
sling/trunk/tooling/ide/api/OSGI-INF/
sling/trunk/tooling/ide/artifacts/OSGI-INF/
sling/trunk/tooling/ide/eclipse-core/OSGI-INF/
sling/trunk/tooling/ide/eclipse-m2e-core/OSGI-INF/
sling/trunk/tooling/ide/eclipse-ui/OSGI-INF/
sling/trunk/tooling/ide/impl-resource/OSGI-INF/
sling/trunk/tooling/ide/impl-vlt/OSGI-INF/
Modified:
sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/api/build.properties
sling/trunk/tooling/ide/api/pom.xml
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClientFactory.java
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/impl/DefaultBatcherFactory.java
sling/trunk/tooling/ide/artifacts/build.properties
sling/trunk/tooling/ide/artifacts/pom.xml
sling/trunk/tooling/ide/artifacts/src/org/apache/sling/ide/artifacts/impl/ArtifactsLocatorImpl.java
sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-core/build.properties
sling/trunk/tooling/ide/eclipse-core/pom.xml
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/TraceCommandExecutionEventsHandler.java
sling/trunk/tooling/ide/eclipse-m2e-core/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-m2e-core/build.properties
sling/trunk/tooling/ide/eclipse-m2e-core/pom.xml
sling/trunk/tooling/ide/eclipse-m2e-core/src/org/apache/sling/ide/eclipse/m2e/core/internal/launch/MavenSourceReferenceResolver.java
sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-ui/build.properties
sling/trunk/tooling/ide/eclipse-ui/pom.xml
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/console/SlingConsoleEventListener.java
sling/trunk/tooling/ide/impl-resource/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/impl-resource/build.properties
sling/trunk/tooling/ide/impl-resource/pom.xml
sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/filer/SimpleFilterLocator.java
sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java
sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryFactoryImpl.java
sling/trunk/tooling/ide/impl-vlt/build.properties
sling/trunk/tooling/ide/impl-vlt/pom.xml
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltRepositoryFactory.java
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/filter/VltFilterLocator.java
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
sling/trunk/tooling/ide/pom.xml
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=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF Tue Nov 1 13:00:21 2016
@@ -20,5 +20,6 @@ Import-Package: javax.jcr.nodetype,
org.apache.commons.io;version="2.0.1",
org.json,
org.osgi.framework;version="1.6.0",
+ org.osgi.service.component.annotations;version="1.2.0",
org.osgi.service.event
Service-Component: OSGI-INF/*.xml
Modified: sling/trunk/tooling/ide/api/build.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/build.properties?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/api/build.properties (original)
+++ sling/trunk/tooling/ide/api/build.properties Tue Nov 1 13:00:21 2016
@@ -1,5 +1,4 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .,\
- OSGI-INF/
+ .
Modified: sling/trunk/tooling/ide/api/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/pom.xml?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/api/pom.xml (original)
+++ sling/trunk/tooling/ide/api/pom.xml Tue Nov 1 13:00:21 2016
@@ -54,7 +54,19 @@
<manifestFile>META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
- </plugin>
+ </plugin>
+ <plugin>
+ <!-- used for generating SCR descriptors -->
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: sling/trunk/tooling/ide/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClientFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClientFactory.java?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClientFactory.java (original)
+++ sling/trunk/tooling/ide/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClientFactory.java Tue Nov 1 13:00:21 2016
@@ -19,8 +19,11 @@ package org.apache.sling.ide.osgi.impl;
import org.apache.sling.ide.osgi.OsgiClient;
import org.apache.sling.ide.osgi.OsgiClientFactory;
import org.apache.sling.ide.transport.RepositoryInfo;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
import org.osgi.service.event.EventAdmin;
+@Component(service=OsgiClientFactory.class)
public class HttpOsgiClientFactory implements OsgiClientFactory {
private EventAdmin eventAdmin;
@@ -32,6 +35,7 @@ public class HttpOsgiClientFactory imple
return new HttpOsgiClient(repositoryInfo);
}
+ @Reference
protected void bindEventAdmin(EventAdmin eventAdmin) {
this.eventAdmin = eventAdmin;
}
Modified: sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/impl/DefaultBatcherFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/impl/DefaultBatcherFactory.java?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/impl/DefaultBatcherFactory.java (original)
+++ sling/trunk/tooling/ide/api/src/org/apache/sling/ide/transport/impl/DefaultBatcherFactory.java Tue Nov 1 13:00:21 2016
@@ -18,7 +18,9 @@ package org.apache.sling.ide.transport.i
import org.apache.sling.ide.transport.Batcher;
import org.apache.sling.ide.transport.BatcherFactory;
+import org.osgi.service.component.annotations.Component;
+@Component(service=BatcherFactory.class)
public class DefaultBatcherFactory implements BatcherFactory {
@Override
Modified: sling/trunk/tooling/ide/artifacts/build.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/artifacts/build.properties?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/artifacts/build.properties (original)
+++ sling/trunk/tooling/ide/artifacts/build.properties Tue Nov 1 13:00:21 2016
@@ -2,5 +2,4 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- OSGI-INF/,\
target/artifacts/
Modified: sling/trunk/tooling/ide/artifacts/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/artifacts/pom.xml?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/artifacts/pom.xml (original)
+++ sling/trunk/tooling/ide/artifacts/pom.xml Tue Nov 1 13:00:21 2016
@@ -89,6 +89,18 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <!-- used for generating SCR descriptors -->
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: sling/trunk/tooling/ide/artifacts/src/org/apache/sling/ide/artifacts/impl/ArtifactsLocatorImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/artifacts/src/org/apache/sling/ide/artifacts/impl/ArtifactsLocatorImpl.java?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/artifacts/src/org/apache/sling/ide/artifacts/impl/ArtifactsLocatorImpl.java (original)
+++ sling/trunk/tooling/ide/artifacts/src/org/apache/sling/ide/artifacts/impl/ArtifactsLocatorImpl.java Tue Nov 1 13:00:21 2016
@@ -22,7 +22,9 @@ import org.apache.sling.ide.artifacts.Em
import org.apache.sling.ide.artifacts.EmbeddedArtifactLocator;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Component;
+@Component(service = EmbeddedArtifactLocator.class)
public class ArtifactsLocatorImpl implements EmbeddedArtifactLocator {
private static final String ARTIFACTS_LOCATION = "target/artifacts";
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=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF Tue Nov 1 13:00:21 2016
@@ -51,4 +51,4 @@ Export-Package: org.apache.sling.ide.ecl
org.apache.sling.ide.eclipse.core.launch,
org.apache.sling.ide.eclipse.core.progress,
org.apache.sling.ide.eclipse.internal.validation;x-friends:="org.apache.sling.ide.eclipse-test"
-Service-Component: OSGI-INF/TraceCommandExecutionEventsHandler.xml
+Service-Component: OSGI-INF/*.xml
Modified: sling/trunk/tooling/ide/eclipse-core/build.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/build.properties?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/build.properties (original)
+++ sling/trunk/tooling/ide/eclipse-core/build.properties Tue Nov 1 13:00:21 2016
@@ -2,8 +2,7 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
.options,\
- plugin.xml,\
- OSGI-INF/
+ plugin.xml
jars.compile.order = .,\
commons-httpclient.jar
source.. = src/
Modified: sling/trunk/tooling/ide/eclipse-core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/pom.xml?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/pom.xml (original)
+++ sling/trunk/tooling/ide/eclipse-core/pom.xml Tue Nov 1 13:00:21 2016
@@ -55,7 +55,19 @@
<manifestFile>META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
- </plugin>
+ </plugin>
+ <plugin>
+ <!-- used for generating SCR descriptors -->
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/TraceCommandExecutionEventsHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/TraceCommandExecutionEventsHandler.java?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/TraceCommandExecutionEventsHandler.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/TraceCommandExecutionEventsHandler.java Tue Nov 1 13:00:21 2016
@@ -21,6 +21,8 @@ import java.util.Date;
import org.apache.sling.ide.log.Logger;
import org.apache.sling.ide.transport.CommandExecutionProperties;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventHandler;
@@ -29,6 +31,7 @@ import org.osgi.service.event.EventHandl
* the PluginLogger
*
*/
+@Component(property="event.topics=org/apache/sling/ide/transport")
public class TraceCommandExecutionEventsHandler implements EventHandler {
private Logger logger;
@@ -57,6 +60,7 @@ public class TraceCommandExecutionEvents
logger.trace(message.toString(), t);
}
+ @Reference(target="(listener.symbolic.name=org.apache.sling.ide.eclipse-core)")
protected void bindLogger(Logger logger) {
this.logger = logger;
}
Modified: sling/trunk/tooling/ide/eclipse-m2e-core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-core/META-INF/MANIFEST.MF?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-core/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-core/META-INF/MANIFEST.MF Tue Nov 1 13:00:21 2016
@@ -9,7 +9,8 @@ Import-Package: org.apache.sling.ide.ecl
org.apache.sling.ide.osgi,
org.eclipse.core.resources,
org.eclipse.core.runtime;version="3.4.0",
- org.eclipse.jdt.launching
-Service-Component: OSGI-INF/MavenSourceReferenceResolver.xml
+ org.eclipse.jdt.launching,
+ org.osgi.service.component.annotations;version="1.2.0"
+Service-Component: OSGI-INF/*.xml
Require-Bundle: org.eclipse.m2e.core;bundle-version="1.4.0",
org.eclipse.m2e.maven.runtime;bundle-version="1.4.0"
Modified: sling/trunk/tooling/ide/eclipse-m2e-core/build.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-core/build.properties?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-core/build.properties (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-core/build.properties Tue Nov 1 13:00:21 2016
@@ -1,5 +1,4 @@
output.. = bin/
bin.includes = META-INF/,\
- .,\
- OSGI-INF/
+ .
source.. = src/
Modified: sling/trunk/tooling/ide/eclipse-m2e-core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-core/pom.xml?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-core/pom.xml (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-core/pom.xml Tue Nov 1 13:00:21 2016
@@ -55,7 +55,19 @@
<manifestFile>META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
- </plugin>
+ </plugin>
+ <plugin>
+ <!-- used for generating SCR descriptors -->
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: sling/trunk/tooling/ide/eclipse-m2e-core/src/org/apache/sling/ide/eclipse/m2e/core/internal/launch/MavenSourceReferenceResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-core/src/org/apache/sling/ide/eclipse/m2e/core/internal/launch/MavenSourceReferenceResolver.java?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-core/src/org/apache/sling/ide/eclipse/m2e/core/internal/launch/MavenSourceReferenceResolver.java (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-core/src/org/apache/sling/ide/eclipse/m2e/core/internal/launch/MavenSourceReferenceResolver.java Tue Nov 1 13:00:21 2016
@@ -16,6 +16,7 @@
*/
package org.apache.sling.ide.eclipse.m2e.core.internal.launch;
+
import java.util.List;
import org.apache.maven.artifact.Artifact;
@@ -30,8 +31,11 @@ import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.m2e.core.MavenPlugin;
+import org.osgi.service.component.annotations.Component;
+@Component(service = SourceReferenceResolver.class)
public class MavenSourceReferenceResolver implements SourceReferenceResolver {
+
@Override
public IRuntimeClasspathEntry resolve(SourceReference reference) throws CoreException {
if ( reference == null || reference.getType() != SourceReference.Type.MAVEN) {
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=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF Tue Nov 1 13:00:21 2016
@@ -72,6 +72,7 @@ Import-Package: javax.jcr,
org.eclipse.wst.server.ui.wizard,
org.osgi.framework,
org.osgi.service.component,
+ org.osgi.service.component.annotations;version="1.2.0",
org.osgi.service.event;version="1.3.0",
org.osgi.util.tracker;version="1.5.0"
Bundle-ActivationPolicy: lazy
Modified: sling/trunk/tooling/ide/eclipse-ui/build.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/build.properties?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/build.properties (original)
+++ sling/trunk/tooling/ide/eclipse-ui/build.properties Tue Nov 1 13:00:21 2016
@@ -2,7 +2,6 @@ bin.includes = plugin.xml,\
META-INF/,\
.,\
icons/,\
- OSGI-INF/,\
lib/decentxml-1.4.jar,\
.options,\
templates/
Modified: sling/trunk/tooling/ide/eclipse-ui/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/pom.xml?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/pom.xml (original)
+++ sling/trunk/tooling/ide/eclipse-ui/pom.xml Tue Nov 1 13:00:21 2016
@@ -78,6 +78,18 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <!-- used for generating SCR descriptors -->
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/console/SlingConsoleEventListener.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/console/SlingConsoleEventListener.java?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/console/SlingConsoleEventListener.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/console/SlingConsoleEventListener.java Tue Nov 1 13:00:21 2016
@@ -34,9 +34,11 @@ import org.eclipse.ui.console.IConsoleLi
import org.eclipse.ui.console.IConsoleManager;
import org.eclipse.ui.console.MessageConsole;
import org.eclipse.ui.console.MessageConsoleStream;
+import org.osgi.service.component.annotations.Component;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventHandler;
+@Component(service = EventHandler.class, property = "event.topics=org/apache/sling/ide/transport")
public class SlingConsoleEventListener implements EventHandler {
private final Object sync = new Object();
Modified: sling/trunk/tooling/ide/impl-resource/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-resource/META-INF/MANIFEST.MF?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-resource/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/impl-resource/META-INF/MANIFEST.MF Tue Nov 1 13:00:21 2016
@@ -10,7 +10,5 @@ Require-Bundle: org.eclipse.core.runtime
org.eclipse.osgi.services;bundle-version="3.2.100"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Service-Component: OSGI-INF/RepositoryFactoryImpl.xml,
- OSGI-INF/SimpleXmlSerializationManager.xml,
- OSGI-INF/SimpleFilterLocator.xml
+Service-Component: OSGI-INF/*.xml
Import-Package: org.json
Modified: sling/trunk/tooling/ide/impl-resource/build.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-resource/build.properties?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-resource/build.properties (original)
+++ sling/trunk/tooling/ide/impl-resource/build.properties Tue Nov 1 13:00:21 2016
@@ -1,5 +1,4 @@
output.. = bin/
bin.includes = META-INF/,\
- .,\
- OSGI-INF/,
+ .
source.. = src/
Modified: sling/trunk/tooling/ide/impl-resource/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-resource/pom.xml?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-resource/pom.xml (original)
+++ sling/trunk/tooling/ide/impl-resource/pom.xml Tue Nov 1 13:00:21 2016
@@ -54,7 +54,19 @@
<manifestFile>META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
- </plugin>
+ </plugin>
+ <plugin>
+ <!-- used for generating SCR descriptors -->
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/filer/SimpleFilterLocator.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/filer/SimpleFilterLocator.java?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/filer/SimpleFilterLocator.java (original)
+++ sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/filer/SimpleFilterLocator.java Tue Nov 1 13:00:21 2016
@@ -26,6 +26,7 @@ import java.util.List;
import org.apache.sling.ide.filter.Filter;
import org.apache.sling.ide.filter.FilterLocator;
+import org.osgi.service.component.annotations.Component;
/**
* The <tt>SimpleFilterLocator</tt> looks for a file named {@value #FILTERS_FILE_NAME} in the parent folder of the
@@ -38,6 +39,7 @@ import org.apache.sling.ide.filter.Filte
* @see SimpleFilter
*
*/
+@Component(service = FilterLocator.class)
public class SimpleFilterLocator implements FilterLocator {
private static final String FILTERS_FILE_NAME = "filters.txt";
Modified: sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java (original)
+++ sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/serialization/SimpleXmlSerializationManager.java Tue Nov 1 13:00:21 2016
@@ -44,12 +44,14 @@ import org.apache.sling.ide.serializatio
import org.apache.sling.ide.serialization.SerializationManager;
import org.apache.sling.ide.transport.Repository;
import org.apache.sling.ide.transport.ResourceProxy;
+import org.osgi.service.component.annotations.Component;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.helpers.DefaultHandler;
+@Component
public class SimpleXmlSerializationManager implements SerializationManager, SerializationDataBuilder {
private static final String TAG_PROPERTY = "property";
Modified: sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryFactoryImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryFactoryImpl.java?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryFactoryImpl.java (original)
+++ sling/trunk/tooling/ide/impl-resource/src/org/apache/sling/ide/impl/resource/transport/RepositoryFactoryImpl.java Tue Nov 1 13:00:21 2016
@@ -20,12 +20,15 @@ import org.apache.sling.ide.transport.Re
import org.apache.sling.ide.transport.RepositoryException;
import org.apache.sling.ide.transport.RepositoryFactory;
import org.apache.sling.ide.transport.RepositoryInfo;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
import org.osgi.service.event.EventAdmin;
/**
* The <tt>RepositoryFactoryImpl</tt> creates <tt>RepositoryImpl</tt> instances
*
*/
+@Component(service = RepositoryFactory.class)
public class RepositoryFactoryImpl implements RepositoryFactory {
private EventAdmin eventAdmin;
@@ -48,6 +51,7 @@ public class RepositoryFactoryImpl imple
//TODO: not yet implemented
}
+ @Reference
protected void bindEventAdmin(EventAdmin eventAdmin) {
this.eventAdmin = eventAdmin;
}
Modified: sling/trunk/tooling/ide/impl-vlt/build.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt/build.properties?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-vlt/build.properties (original)
+++ sling/trunk/tooling/ide/impl-vlt/build.properties Tue Nov 1 13:00:21 2016
@@ -1,7 +1,6 @@
output.. = bin/
bin.includes = .,\
META-INF/,\
- OSGI-INF/,\
plugin.xml,\
.options
source.. = src/
Modified: sling/trunk/tooling/ide/impl-vlt/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt/pom.xml?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-vlt/pom.xml (original)
+++ sling/trunk/tooling/ide/impl-vlt/pom.xml Tue Nov 1 13:00:21 2016
@@ -55,7 +55,19 @@
<manifestFile>META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
- </plugin>
+ </plugin>
+ <plugin>
+ <!-- used for generating SCR descriptors -->
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java (original)
+++ sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java Tue Nov 1 13:00:21 2016
@@ -30,7 +30,9 @@ import org.apache.jackrabbit.vault.fs.co
import org.apache.jackrabbit.vault.fs.config.ConfigurationException;
import org.apache.jackrabbit.vault.fs.config.DefaultWorkspaceFilter;
import org.apache.jackrabbit.vault.util.Constants;
+import org.osgi.service.component.annotations.Component;
+@Component(service = VaultFsLocator.class)
public class VaultFsLocatorImpl implements VaultFsLocator {
@Override
Modified: sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltRepositoryFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltRepositoryFactory.java?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltRepositoryFactory.java (original)
+++ sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VltRepositoryFactory.java Tue Nov 1 13:00:21 2016
@@ -23,12 +23,15 @@ import org.apache.sling.ide.transport.Re
import org.apache.sling.ide.transport.RepositoryException;
import org.apache.sling.ide.transport.RepositoryFactory;
import org.apache.sling.ide.transport.RepositoryInfo;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
import org.osgi.service.event.EventAdmin;
/**
* The <tt>VltRepositoryFactory</tt> instatiantes <tt>VltRepository</tt> instances
*
*/
+@Component(service = RepositoryFactory.class, property = "service.ranking:Integer=100")
public class VltRepositoryFactory implements RepositoryFactory {
private EventAdmin eventAdmin;
@@ -91,6 +94,7 @@ public class VltRepositoryFactory implem
return repositoryInfo.getUsername()+":"+repositoryInfo.getPassword()+"@"+repositoryInfo.getUrl();
}
+ @Reference
protected void bindEventAdmin(EventAdmin eventAdmin) {
this.eventAdmin = eventAdmin;
}
Modified: sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/filter/VltFilterLocator.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/filter/VltFilterLocator.java?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/filter/VltFilterLocator.java (original)
+++ sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/filter/VltFilterLocator.java Tue Nov 1 13:00:21 2016
@@ -24,11 +24,15 @@ import org.apache.jackrabbit.vault.fs.co
import org.apache.sling.ide.filter.Filter;
import org.apache.sling.ide.filter.FilterLocator;
import org.apache.sling.ide.impl.vlt.VaultFsLocator;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+@Component(service = FilterLocator.class, property = "service.ranking:Integer=100")
public class VltFilterLocator implements FilterLocator {
private VaultFsLocator fsLocator;
+ @Reference
protected void bindVaultFsLocator(VaultFsLocator fsLocator) {
this.fsLocator = fsLocator;
}
Modified: sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java (original)
+++ sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java Tue Nov 1 13:00:21 2016
@@ -47,9 +47,12 @@ import org.apache.sling.ide.serializatio
import org.apache.sling.ide.serialization.SerializationKind;
import org.apache.sling.ide.serialization.SerializationManager;
import org.apache.sling.ide.transport.ResourceProxy;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+@Component(service = SerializationManager.class, property = "service.ranking:Integer=100")
public class VltSerializationManager implements SerializationManager {
static final String EXTENSION_XML = ".xml";
@@ -202,6 +205,7 @@ public class VltSerializationManager imp
return PlatformNameFormat.getPlatformPath(repositoryPath);
}
+ @Reference
protected void bindVaultFsLocator(VaultFsLocator fsLocator) {
getBuilder().setLocator(fsLocator);
Modified: sling/trunk/tooling/ide/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/pom.xml?rev=1767491&r1=1767490&r2=1767491&view=diff
==============================================================================
--- sling/trunk/tooling/ide/pom.xml (original)
+++ sling/trunk/tooling/ide/pom.xml Tue Nov 1 13:00:21 2016
@@ -151,6 +151,11 @@
<target>1.7</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>3.3.0</version>
+ </plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<!--
We embed some bundles that are not available on p2 update sites. To make the build seamless, we copy them early in the process.