SLING-5648 - Make Non-Eclipse Module regular Maven Packages
Fix content import operation
diff --git a/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationDataBuilder.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationDataBuilder.java
index fd33687..a5c1172 100644
--- a/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationDataBuilder.java
+++ b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationDataBuilder.java
@@ -67,8 +67,13 @@
private VaultFileSystem fs;
private Logger logger;
- public VltSerializationDataBuilder(Logger logger) {
+ public VltSerializationDataBuilder(Logger logger, VaultFsLocator fsLocator) {
+ if ( logger == null )
+ throw new RuntimeException("Logger is null");
+ if ( fsLocator == null )
+ throw new RuntimeException("fsLocator is null");
this.logger = logger;
+ this.fsLocator = fsLocator;
}
public void init(org.apache.sling.ide.transport.Repository repository, File contentSyncRoot)
@@ -341,10 +346,4 @@
return null;
}
-
- public void setLocator(VaultFsLocator locator) {
-
- this.fsLocator = locator;
- }
-
}
diff --git a/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
index a68475f..639203e 100644
--- a/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
+++ b/shared/modules/impl-vlt/src/main/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
@@ -58,11 +58,12 @@
static final String EXTENSION_XML = ".xml";
- private VltSerializationDataBuilder builder;
-
@Reference
private Logger logger;
+ @Reference
+ private VaultFsLocator fsLocator;
+
public static void main(String[] args) throws RepositoryException, URISyntaxException, IOException {
RepositoryAddress address = new RepositoryAddress("http://localhost:8080/server/root");
Repository repo = new RepositoryProvider().getRepository(address);
@@ -208,29 +209,12 @@
public String getOsPath(String repositoryPath) {
return PlatformNameFormat.getPlatformPath(repositoryPath);
}
-
- protected void bindVaultFsLocator(VaultFsLocator fsLocator) {
-
- getBuilder().setLocator(fsLocator);
- }
-
- protected void unbindVaultFsLocator(VaultFsLocator fsLocator) {
-
- getBuilder().setLocator(null);
- }
-
- private VltSerializationDataBuilder getBuilder() {
- if (builder==null) {
- builder = new VltSerializationDataBuilder(logger);
- }
- return builder;
- }
@Override
public SerializationDataBuilder newBuilder(
org.apache.sling.ide.transport.Repository repository,
File contentSyncRoot) throws SerializationException {
- VltSerializationDataBuilder b = getBuilder();
+ VltSerializationDataBuilder b = new VltSerializationDataBuilder(logger, fsLocator);
b.init(repository, contentSyncRoot);
return b;
}
