Fix regressions

git-svn-id: https://svn.argeo.org/slc/trunk@5558 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/dep/org.argeo.slc.dep.detached/pom.xml b/dep/org.argeo.slc.dep.detached/pom.xml
index af25c3a6f677219de9fabbb88c12a0dab756b344..d1a8e08b920d451f36e3a57e819894e555da7ad2 100644 (file)
--- a/dep/org.argeo.slc.dep.detached/pom.xml
+++ b/dep/org.argeo.slc.dep.detached/pom.xml
@@ -20,6 +20,11 @@
                        <artifactId>org.argeo.slc.support.jemmy</artifactId>
                        <version>1.1.3-SNAPSHOT</version>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.ext.castor</artifactId>
+                       <version>1.1.3-SNAPSHOT</version>
+               </dependency>
                <!-- For JDK 1.4 -->
                <dependency>
                        <groupId>org.argeo.tp</groupId>

diff --git a/modules/org.argeo.slc.ext.castor/pom.xml b/modules/org.argeo.slc.ext.castor/pom.xml
new file mode 100644 (file)
index 0000000..e97109c
--- /dev/null
+++ b/modules/org.argeo.slc.ext.castor/pom.xml
@@ -0,0 +1,27 @@
+<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>
+               <artifactId>modules</artifactId>
+               <version>1.1.3-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.ext.castor</artifactId>
+       <name>SLC Castor Extension</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Fragment-Host>org.castor</Fragment-Host>
+                                               <Import-Package>
+                                                       org.argeo.slc.detached;resolution:=optional
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file

diff --git a/modules/pom.xml b/modules/pom.xml
index 2fe89f2d85a9f2dfca790a432d7597b1d9acace7..13a8ba1b1ae863e6d8cbedbe63b8d1357228697c 100644 (file)
--- a/modules/pom.xml
+++ b/modules/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>
@@ -10,6 +11,7 @@
        <name>SLC Modules</name>
        <packaging>pom</packaging>
        <modules>
+               <module>org.argeo.slc.ext.castor</module>
                <module>org.argeo.slc.agent</module>
                <module>org.argeo.slc.agent.jcr</module>
                <module>org.argeo.slc.node.jackrabbit</module>