From 180e64a5924f51c2396221d2d13f53c183aca7d7 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 5 Mar 2014 13:39:11 +0000
Subject: [PATCH] Move RpmIndexer to repo

git-svn-id: https://svn.argeo.org/slc/trunk@6873 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org.argeo.slc.server.repo/META-INF/spring/services.xml   | 2 +-
 runtime/org.argeo.slc.repo/pom.xml                           | 5 +++++
 .../src/main/java/org/argeo/slc/repo}/RpmIndexer.java        | 3 +--
 runtime/org.argeo.slc.rpmfactory/pom.xml                     | 5 -----
 .../java/org/argeo/slc/rpmfactory/core/RpmFactoryImpl.java   | 1 +
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename runtime/{org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core => org.argeo.slc.repo/src/main/java/org/argeo/slc/repo}/RpmIndexer.java (97%)

diff --git a/modules/org.argeo.slc.server.repo/META-INF/spring/services.xml b/modules/org.argeo.slc.server.repo/META-INF/spring/services.xml
index 308000254..490bf9059 100644
--- a/modules/org.argeo.slc.server.repo/META-INF/spring/services.xml
+++ b/modules/org.argeo.slc.server.repo/META-INF/spring/services.xml
@@ -49,7 +49,7 @@
 		<property name="workspace" value="${slc.repo.jcr.proxyWorkspace}" />
 		<property name="nodeIndexers">
 			<list>
-				<bean class="org.argeo.slc.rpmfactory.core.RpmIndexer" />
+				<bean class="org.argeo.slc.repo.RpmIndexer" />
 			</list>
 		</property>
 	</bean>
diff --git a/runtime/org.argeo.slc.repo/pom.xml b/runtime/org.argeo.slc.repo/pom.xml
index 4613768d9..6dd5a7ccb 100644
--- a/runtime/org.argeo.slc.repo/pom.xml
+++ b/runtime/org.argeo.slc.repo/pom.xml
@@ -78,5 +78,10 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<!-- RPM -->
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.redline_rpm</artifactId>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmIndexer.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RpmIndexer.java
similarity index 97%
rename from runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmIndexer.java
rename to runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RpmIndexer.java
index ef8b9914b..a91081d17 100644
--- a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmIndexer.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RpmIndexer.java
@@ -1,4 +1,4 @@
-package org.argeo.slc.rpmfactory.core;
+package org.argeo.slc.repo;
 
 import static org.freecompany.redline.header.Header.HeaderTag.HEADERIMMUTABLE;
 import static org.freecompany.redline.header.Signature.SignatureTag.SIGNATURES;
@@ -14,7 +14,6 @@ import org.apache.commons.io.FilenameUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
-import org.argeo.slc.repo.NodeIndexer;
 import org.freecompany.redline.ChannelWrapper.Key;
 import org.freecompany.redline.ReadableChannelWrapper;
 import org.freecompany.redline.header.AbstractHeader;
diff --git a/runtime/org.argeo.slc.rpmfactory/pom.xml b/runtime/org.argeo.slc.rpmfactory/pom.xml
index dce9866d5..c6013609d 100644
--- a/runtime/org.argeo.slc.rpmfactory/pom.xml
+++ b/runtime/org.argeo.slc.rpmfactory/pom.xml
@@ -52,10 +52,5 @@
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>slf4j.org.apache.commons.logging</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>org.redline_rpm</artifactId>
-		</dependency>
-
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmFactoryImpl.java b/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmFactoryImpl.java
index a5012fa4a..3ab7e7df2 100644
--- a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmFactoryImpl.java
+++ b/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmFactoryImpl.java
@@ -39,6 +39,7 @@ import org.argeo.slc.SlcConstants;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.core.execution.tasks.SystemCall;
 import org.argeo.slc.repo.NodeIndexerVisitor;
+import org.argeo.slc.repo.RpmIndexer;
 import org.argeo.slc.rpmfactory.RpmFactory;
 import org.argeo.slc.rpmfactory.RpmRepository;
 
-- 
2.39.2