From 3b90a33b36baac839b376a71a4efcd90cacd3eac Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 13 Feb 2015 15:46:23 +0000
Subject: [PATCH] SLC Factory

git-svn-id: https://svn.argeo.org/slc/trunk@7846 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 dep/org.argeo.slc.dep.backend/pom.xml         | 20 +++++++++----------
 org.argeo.slc.factory/bnd.bnd                 |  4 ++++
 org.argeo.slc.factory/pom.xml                 | 11 +++++++++-
 .../org/argeo/slc/rpmfactory/RpmFactory.java  |  0
 .../argeo/slc/rpmfactory/RpmProxyService.java |  0
 .../argeo/slc/rpmfactory/RpmRepository.java   |  0
 .../core/AbstractRpmRepository.java           |  0
 .../slc/rpmfactory/core/BuildInMock.java      |  0
 .../core/CreateRpmDistribution.java           |  0
 .../slc/rpmfactory/core/ReleaseStaging.java   |  0
 .../slc/rpmfactory/core/RpmDistribution.java  |  0
 .../slc/rpmfactory/core/RpmFactoryImpl.java   |  0
 .../slc/rpmfactory/core/RpmPackageSet.java    |  0
 .../rpmfactory/core/RpmProxyServiceImpl.java  |  0
 .../slc/rpmfactory/core/RpmSpecFile.java      |  0
 .../rpmfactory/core/StagingRpmRepository.java |  0
 .../core/ThirdPartyRpmRepository.java         |  0
 .../slc/rpmfactory/core/YumListParser.java    |  0
 pom.xml                                       |  1 +
 19 files changed, 25 insertions(+), 11 deletions(-)
 rename {runtime/org.argeo.slc.rpmfactory/src/main/java => org.argeo.slc.factory/src}/org/argeo/slc/rpmfactory/RpmFactory.java (100%)
 rename {runtime/org.argeo.slc.rpmfactory/src/main/java => org.argeo.slc.factory/src}/org/argeo/slc/rpmfactory/RpmProxyService.java (100%)
 rename {runtime/org.argeo.slc.rpmfactory/src/main/java => org.argeo.slc.factory/src}/org/argeo/slc/rpmfactory/RpmRepository.java (100%)
 rename {runtime/org.argeo.slc.rpmfactory/src/main/java => org.argeo.slc.factory/src}/org/argeo/slc/rpmfactory/core/AbstractRpmRepository.java (100%)
 rename {runtime/org.argeo.slc.rpmfactory/src/main/java => org.argeo.slc.factory/src}/org/argeo/slc/rpmfactory/core/BuildInMock.java (100%)
 rename {runtime/org.argeo.slc.rpmfactory/src/main/java => org.argeo.slc.factory/src}/org/argeo/slc/rpmfactory/core/CreateRpmDistribution.java (100%)
 rename {runtime/org.argeo.slc.rpmfactory/src/main/java => org.argeo.slc.factory/src}/org/argeo/slc/rpmfactory/core/ReleaseStaging.java (100%)
 rename {runtime/org.argeo.slc.rpmfactory/src/main/java => org.argeo.slc.factory/src}/org/argeo/slc/rpmfactory/core/RpmDistribution.java (100%)
 rename {runtime/org.argeo.slc.rpmfactory/src/main/java => org.argeo.slc.factory/src}/org/argeo/slc/rpmfactory/core/RpmFactoryImpl.java (100%)
 rename {runtime/org.argeo.slc.rpmfactory/src/main/java => org.argeo.slc.factory/src}/org/argeo/slc/rpmfactory/core/RpmPackageSet.java (100%)
 rename {runtime/org.argeo.slc.rpmfactory/src/main/java => org.argeo.slc.factory/src}/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java (100%)
 rename {runtime/org.argeo.slc.rpmfactory/src/main/java => org.argeo.slc.factory/src}/org/argeo/slc/rpmfactory/core/RpmSpecFile.java (100%)
 rename {runtime/org.argeo.slc.rpmfactory/src/main/java => org.argeo.slc.factory/src}/org/argeo/slc/rpmfactory/core/StagingRpmRepository.java (100%)
 rename {runtime/org.argeo.slc.rpmfactory/src/main/java => org.argeo.slc.factory/src}/org/argeo/slc/rpmfactory/core/ThirdPartyRpmRepository.java (100%)
 rename {runtime/org.argeo.slc.rpmfactory/src/main/java => org.argeo.slc.factory/src}/org/argeo/slc/rpmfactory/core/YumListParser.java (100%)

diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index 3224adba0..dc950424f 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -64,16 +64,16 @@
 		</dependency>
 
 		<!-- SLC Repo -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.slc</groupId> -->
-<!-- 			<artifactId>org.argeo.slc.repo</artifactId> -->
-<!-- 			<version>2.1.1-SNAPSHOT</version> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.slc</groupId> -->
-<!-- 			<artifactId>org.argeo.slc.factory</artifactId> -->
-<!-- 			<version>2.1.1-SNAPSHOT</version> -->
-<!-- 		</dependency> -->
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.repo</artifactId>
+			<version>2.1.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.factory</artifactId>
+			<version>2.1.1-SNAPSHOT</version>
+		</dependency>
 <!-- 		<dependency> -->
 <!-- 			<groupId>org.argeo.slc</groupId> -->
 <!-- 			<artifactId>org.argeo.slc.server.repo</artifactId> -->
diff --git a/org.argeo.slc.factory/bnd.bnd b/org.argeo.slc.factory/bnd.bnd
index e69de29bb..e2184b61d 100644
--- a/org.argeo.slc.factory/bnd.bnd
+++ b/org.argeo.slc.factory/bnd.bnd
@@ -0,0 +1,4 @@
+Import-Package: javax.jcr.nodetype,\
+org.argeo.slc.repo,\
+*
+							
\ No newline at end of file
diff --git a/org.argeo.slc.factory/pom.xml b/org.argeo.slc.factory/pom.xml
index 9c1bb050c..1fa08d25d 100644
--- a/org.argeo.slc.factory/pom.xml
+++ b/org.argeo.slc.factory/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
@@ -8,4 +9,12 @@
 	</parent>
 	<artifactId>org.argeo.slc.factory</artifactId>
 	<name>SLC Factory</name>
+	<dependencies>
+		<!-- SLC -->
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.repo</artifactId>
+			<version>2.1.1-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
 </project>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/RpmFactory.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/RpmFactory.java
similarity index 100%
rename from runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/RpmFactory.java
rename to org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/RpmFactory.java
diff --git a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/RpmProxyService.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/RpmProxyService.java
similarity index 100%
rename from runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/RpmProxyService.java
rename to org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/RpmProxyService.java
diff --git a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/RpmRepository.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/RpmRepository.java
similarity index 100%
rename from runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/RpmRepository.java
rename to org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/RpmRepository.java
diff --git a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/AbstractRpmRepository.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/AbstractRpmRepository.java
similarity index 100%
rename from runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/AbstractRpmRepository.java
rename to org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/AbstractRpmRepository.java
diff --git a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/BuildInMock.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/BuildInMock.java
similarity index 100%
rename from runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/BuildInMock.java
rename to org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/BuildInMock.java
diff --git a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/CreateRpmDistribution.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/CreateRpmDistribution.java
similarity index 100%
rename from runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/CreateRpmDistribution.java
rename to org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/CreateRpmDistribution.java
diff --git a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/ReleaseStaging.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/ReleaseStaging.java
similarity index 100%
rename from runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/ReleaseStaging.java
rename to org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/ReleaseStaging.java
diff --git a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmDistribution.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmDistribution.java
similarity index 100%
rename from runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmDistribution.java
rename to org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmDistribution.java
diff --git a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmFactoryImpl.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmFactoryImpl.java
similarity index 100%
rename from runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmFactoryImpl.java
rename to org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmFactoryImpl.java
diff --git a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmPackageSet.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmPackageSet.java
similarity index 100%
rename from runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmPackageSet.java
rename to org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmPackageSet.java
diff --git a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java
similarity index 100%
rename from runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java
rename to org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java
diff --git a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmSpecFile.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmSpecFile.java
similarity index 100%
rename from runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/RpmSpecFile.java
rename to org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmSpecFile.java
diff --git a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/StagingRpmRepository.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/StagingRpmRepository.java
similarity index 100%
rename from runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/StagingRpmRepository.java
rename to org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/StagingRpmRepository.java
diff --git a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/ThirdPartyRpmRepository.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/ThirdPartyRpmRepository.java
similarity index 100%
rename from runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/ThirdPartyRpmRepository.java
rename to org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/ThirdPartyRpmRepository.java
diff --git a/runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/YumListParser.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/YumListParser.java
similarity index 100%
rename from runtime/org.argeo.slc.rpmfactory/src/main/java/org/argeo/slc/rpmfactory/core/YumListParser.java
rename to org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/YumListParser.java
diff --git a/pom.xml b/pom.xml
index 8d6fdae77..4d5748d55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,7 @@
 		<module>org.argeo.slc.unit</module>
 		<module>org.argeo.slc.support</module>
 		<module>org.argeo.slc.repo</module>
+		<module>org.argeo.slc.factory</module>
 
 		<!-- <module>runtime</module> -->
 		<!-- <module>modules</module> -->
-- 
2.39.2