Introduce check-osgi profile

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

diff --git a/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml b/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml
index 66bb5b13cd0e0610c0e2a8ed58a514701d889521..fd7a98f6dbdd90abbc0541b9dd3b23dcc1d4fd16 100644 (file)
--- a/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml
+++ b/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.commons.eclipse</groupId>
@@ -93,21 +94,12 @@
                        <artifactId>org.eclipse.rap.ui.workbench</artifactId>
                </dependency>
 
-               <!-- Jetty (TO BE REMOVED and replaced by Tomcat
-               <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.http.jetty</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.mortbay.jetty</groupId>
-                       <artifactId>org.mortbay.jetty.server</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.mortbay.jetty</groupId>
-                       <artifactId>org.mortbay.jetty.util</artifactId>
-               </dependency>
-                -->
-                
+               <!-- Jetty (TO BE REMOVED and replaced by Tomcat <dependency> <groupId>org.eclipse.equinox</groupId> 
+                       <artifactId>org.eclipse.equinox.http.jetty</artifactId> </dependency> <dependency> 
+                       <groupId>org.mortbay.jetty</groupId> <artifactId>org.mortbay.jetty.server</artifactId> 
+                       </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>org.mortbay.jetty.util</artifactId> 
+                       </dependency> -->
+
                <!-- Eclipse -->
                <dependency>
                        <groupId>org.eclipse.core</groupId>
@@ -119,28 +111,33 @@
                </dependency>
        </dependencies>
        <profiles>
+               <profile>
+                       <id>check-osgi</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.argeo.maven.plugins</groupId>
+                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>check-osgi</id>
+                                                               <phase>test</phase>
+                                                               <goals>
+                                                                       <goal>equinox</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <onlyCheck>true</onlyCheck>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
                <profile>
                        <id>rpmbuild-tp</id>
                        <build>
                                <plugins>
-<!--                                   <plugin> -->
-<!--                                           <groupId>org.apache.maven.plugins</groupId> -->
-<!--                                           <artifactId>maven-dependency-plugin</artifactId> -->
-<!--                                           <executions> -->
-<!--                                                   <execution> -->
-<!--                                                           <id>copy-rap</id> -->
-<!--                                                           <phase>package</phase> -->
-<!--                                                           <goals> -->
-<!--                                                                   <goal>copy-dependencies</goal> -->
-<!--                                                           </goals> -->
-<!--                                                           <configuration> -->
-<!--                                                                   <includeTypes>jar</includeTypes> -->
-<!--                                                                   <includeGroupIds>org.eclipse.core,org.eclipse.equinox,org.eclipse.rap,org.eclipse.help,org.argeo.dep.rap,org.eclipse.osgi,com.ibm.icu</includeGroupIds> -->
-<!--                                                                   <outputDirectory>${project.build.directory}/eclipse-rap</outputDirectory> -->
-<!--                                                           </configuration> -->
-<!--                                                   </execution> -->
-<!--                                           </executions> -->
-<!--                                   </plugin> -->
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
@@ -179,7 +176,8 @@
                                                                <configuration>
                                                                        <target>
                                                                                <copy todir="${rpm.stagingRepository}" verbose="true">
-                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>

diff --git a/eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml b/eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml
index f98693bda0d20e634d593bd16255b90206172a33..1ad10a6900cb810fe09db5d7202763aad3cfa59d 100644 (file)
--- a/eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml
+++ b/eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.commons.eclipse</groupId>
@@ -97,4 +98,29 @@ ex=*.source_*.jar,\
                        <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
                </dependency>
        </dependencies>
+       <profiles>
+               <profile>
+                       <id>check-osgi</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.argeo.maven.plugins</groupId>
+                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>check-osgi</id>
+                                                               <phase>test</phase>
+                                                               <goals>
+                                                                       <goal>equinox</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <onlyCheck>true</onlyCheck>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
 </project>

diff --git a/eclipse/dep/pom.xml b/eclipse/dep/pom.xml
index 36a3fd15e3556edb3c4e99925546f02e58df424c..d1f43702fa19fa6b68c63a92e4e212f4b1b56735 100644 (file)
--- a/eclipse/dep/pom.xml
+++ b/eclipse/dep/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.commons.eclipse</groupId>
@@ -53,30 +54,22 @@
                                                        </goals>
                                                        <phase>generate-resources</phase>
                                                </execution>
-                                               <execution>
-                                                       <id>check-osgi</id>
-                                                       <phase>test</phase>
-                                                       <goals>
-                                                               <goal>equinox</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <onlyCheck>true</onlyCheck>
-                                                               <argsToAppend>
-                                                                       <arg>-clean</arg>
-                                                               </argsToAppend>
-                                                       </configuration>
-                                               </execution>
                                        </executions>
                                </plugin>
                        </plugins>
                </pluginManagement>
        </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.commons.osgi</groupId>
-                       <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>0.3.5-SNAPSHOT</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
+       <profiles>
+               <profile>
+                       <id>check-osgi</id>
+                       <dependencies>
+                               <dependency>
+                                       <groupId>org.argeo.commons.osgi</groupId>
+                                       <artifactId>org.argeo.osgi.boot</artifactId>
+                                       <version>0.3.5-SNAPSHOT</version>
+                                       <scope>test</scope>
+                               </dependency>
+                       </dependencies>
+               </profile>
+       </profiles>
 </project>
\ No newline at end of file

diff --git a/osgi/dep/pom.xml b/osgi/dep/pom.xml
index 3b9ac15ca71af4294fc24f106086177e640cece9..481b2caa0f2897ce3a2559c2b1dfe261ca4b78ee 100644 (file)
--- a/osgi/dep/pom.xml
+++ b/osgi/dep/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.commons</groupId>
@@ -15,33 +16,38 @@
                <module>org.argeo.osgi.dep.stdruntime</module>
                <module>org.argeo.osgi.dep.jackrabbit</module>
        </modules>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.argeo.maven.plugins</groupId>
-                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>check-osgi</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>equinox</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <onlyCheck>true</onlyCheck>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <!-- OSGi test -->
-               <dependency>
-                       <groupId>org.argeo.commons.osgi</groupId>
-                       <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>0.3.5-SNAPSHOT</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
+       <profiles>
+               <profile>
+                       <id>check-osgi</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.argeo.maven.plugins</groupId>
+                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>check-osgi</id>
+                                                               <phase>test</phase>
+                                                               <goals>
+                                                                       <goal>equinox</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <onlyCheck>true</onlyCheck>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+                       <dependencies>
+                               <!-- OSGi test -->
+                               <dependency>
+                                       <groupId>org.argeo.commons.osgi</groupId>
+                                       <artifactId>org.argeo.osgi.boot</artifactId>
+                                       <version>0.3.5-SNAPSHOT</version>
+                                       <scope>test</scope>
+                               </dependency>
+                       </dependencies>
+               </profile>
+       </profiles>
 </project>
\ No newline at end of file

diff --git a/osgi/plugins/pom.xml b/osgi/plugins/pom.xml
index b13973fb32fc2c83b470ce106ec4514f5a6a3bac..03d0dfd1d475ce6744a86a6646531a5b3815a4b0 100644 (file)
--- a/osgi/plugins/pom.xml
+++ b/osgi/plugins/pom.xml
@@ -43,6 +43,15 @@
                                        </excludes>
                                </configuration>
                        </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
                </plugins>
        </build>
 </project>

diff --git a/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java b/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java
index 0f2eb7d3247e72878f8af12caba89e8daee551df..fd32f1ae08a3bebfb95954b230a4b7513840be74 100644 (file)
--- a/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java
+++ b/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/osgi/boot/OsgiBootRuntimeTest.java
@@ -21,7 +21,6 @@ import java.util.TreeMap;
 
 import junit.framework.TestCase;
 
-import org.argeo.osgi.boot.OsgiBoot;
 import org.eclipse.core.runtime.adaptor.EclipseStarter;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -29,8 +28,14 @@ import org.osgi.framework.BundleContext;
 /** Starts an Equinox runtime and provision it with OSGi boot. */
 public class OsgiBootRuntimeTest extends TestCase {
        protected OsgiBoot osgiBoot = null;
+       private boolean osgiRuntimeAlreadyRunning = false;
 
        public void testInstallAndStart() throws Exception {
+               if (osgiRuntimeAlreadyRunning) {
+                       System.out
+                                       .println("OSGi runtime already running, skipping test...");
+                       return;
+               }
                osgiBoot.installUrls(osgiBoot.getBundlesUrls(OsgiBoot.DEFAULT_BASE_URL,
                                OsgiBootNoRuntimeTest.BUNDLES));
                Map map = new TreeMap(osgiBoot.getBundlesBySymbolicName());
@@ -71,11 +76,16 @@ public class OsgiBootRuntimeTest extends TestCase {
        }
 
        public void setUp() throws Exception {
+               osgiRuntimeAlreadyRunning = EclipseStarter.isRunning();
+               if (osgiRuntimeAlreadyRunning)
+                       return;
                BundleContext bundleContext = startRuntime();
                osgiBoot = new OsgiBoot(bundleContext);
        }
 
        public void tearDown() throws Exception {
+               if (osgiRuntimeAlreadyRunning)
+                       return;
                osgiBoot = null;
                stopRuntime();
        }

diff --git a/security/dep/org.argeo.security.dep.node.rap/pom.xml b/security/dep/org.argeo.security.dep.node.rap/pom.xml
index 61d178d26ec6bfe3145f481d26cdf2d4d57a5f57..221023d17d01a0df58dcfb12fb01aec92c205e20 100644 (file)
--- a/security/dep/org.argeo.security.dep.node.rap/pom.xml
+++ b/security/dep/org.argeo.security.dep.node.rap/pom.xml
@@ -21,16 +21,6 @@
                                                </goals>
                                                <phase>generate-resources</phase>
                                        </execution>
-                                       <execution>
-                                               <id>check-osgi</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>equinox</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <onlyCheck>true</onlyCheck>
-                                               </configuration>
-                                       </execution>
                                </executions>
                        </plugin>
                </plugins>
@@ -74,6 +64,38 @@
                </dependency>
        </dependencies>
        <profiles>
+               <profile>
+                       <id>check-osgi</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.argeo.maven.plugins</groupId>
+                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>check-osgi</id>
+                                                               <phase>test</phase>
+                                                               <goals>
+                                                                       <goal>equinox</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <onlyCheck>true</onlyCheck>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+                       <dependencies>
+                               <!-- OSGi test -->
+                               <dependency>
+                                       <groupId>org.argeo.commons.osgi</groupId>
+                                       <artifactId>org.argeo.osgi.boot</artifactId>
+                                       <version>0.3.5-SNAPSHOT</version>
+                                       <scope>test</scope>
+                               </dependency>
+                       </dependencies>
+               </profile>
                <profile>
                        <id>rpmbuild</id>
                        <build>

diff --git a/security/dep/org.argeo.security.dep.node.rcp/pom.xml b/security/dep/org.argeo.security.dep.node.rcp/pom.xml
index af3f45b3e02d10acb61a99a0349ab6fb1e01ec47..9bc9da4e8dd04bb3a9b382f10ba0c5ca044cd65b 100644 (file)
--- a/security/dep/org.argeo.security.dep.node.rcp/pom.xml
+++ b/security/dep/org.argeo.security.dep.node.rcp/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.commons.security</groupId>
@@ -21,16 +22,6 @@
                                                </goals>
                                                <phase>generate-resources</phase>
                                        </execution>
-                                       <execution>
-                                               <id>check-osgi</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>equinox</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <onlyCheck>true</onlyCheck>
-                                               </configuration>
-                                       </execution>
                                </executions>
                        </plugin>
                </plugins>
@@ -49,6 +40,38 @@
                </dependency>
        </dependencies>
        <profiles>
+               <profile>
+                       <id>check-osgi</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.argeo.maven.plugins</groupId>
+                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>check-osgi</id>
+                                                               <phase>test</phase>
+                                                               <goals>
+                                                                       <goal>equinox</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <onlyCheck>true</onlyCheck>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+                       <dependencies>
+                               <!-- OSGi test -->
+                               <dependency>
+                                       <groupId>org.argeo.commons.osgi</groupId>
+                                       <artifactId>org.argeo.osgi.boot</artifactId>
+                                       <version>0.3.5-SNAPSHOT</version>
+                                       <scope>test</scope>
+                               </dependency>
+                       </dependencies>
+               </profile>
                <profile>
                        <id>rpmbuild</id>
                        <build>

diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index 7b9eeba17791e31e0a84a2677d0067cf116082d2..bdae6ee060a1a3b39259e5d60ebd023d0f0c0de3 100644 (file)
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/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.commons.security</groupId>
@@ -21,16 +22,6 @@
                                                </goals>
                                                <phase>generate-resources</phase>
                                        </execution>
-                                       <execution>
-                                               <id>check-osgi</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>equinox</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <onlyCheck>true</onlyCheck>
-                                               </configuration>
-                                       </execution>
                                </executions>
                        </plugin>
                </plugins>
@@ -115,14 +106,14 @@
                        <groupId>org.springframework</groupId>
                        <artifactId>org.springframework.context.support</artifactId>
                </dependency>
-<!--           <dependency> -->
-<!--                   <groupId>org.springframework</groupId> -->
-<!--                   <artifactId>org.springframework.orm</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.springframework</groupId> -->
-<!--                   <artifactId>org.springframework.jdbc</artifactId> -->
-<!--           </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.springframework</groupId> -->
+               <!-- <artifactId>org.springframework.orm</artifactId> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.springframework</groupId> -->
+               <!-- <artifactId>org.springframework.jdbc</artifactId> -->
+               <!-- </dependency> -->
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>org.springframework.jms</artifactId>
@@ -297,6 +288,38 @@
                </dependency>
        </dependencies>
        <profiles>
+               <profile>
+                       <id>check-osgi</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.argeo.maven.plugins</groupId>
+                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>check-osgi</id>
+                                                               <phase>test</phase>
+                                                               <goals>
+                                                                       <goal>equinox</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <onlyCheck>true</onlyCheck>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+                       <dependencies>
+                               <!-- OSGi test -->
+                               <dependency>
+                                       <groupId>org.argeo.commons.osgi</groupId>
+                                       <artifactId>org.argeo.osgi.boot</artifactId>
+                                       <version>0.3.5-SNAPSHOT</version>
+                                       <scope>test</scope>
+                               </dependency>
+                       </dependencies>
+               </profile>
                <profile>
                        <id>rpmbuild</id>
                        <build>

diff --git a/server/dep/pom.xml b/server/dep/pom.xml
index bb5be6047f8a5bb3b74a0d48102f9e2fc713ff33..e18a927ece05ef612911729132898db95b50a251 100644 (file)
--- a/server/dep/pom.xml
+++ b/server/dep/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.commons</groupId>
@@ -19,33 +20,38 @@
                <module>org.argeo.server.dep.jackrabbit.server</module>
                <module>org.argeo.server.dep.activemq</module>
        </modules>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.argeo.maven.plugins</groupId>
-                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>check-osgi</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>equinox</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <onlyCheck>true</onlyCheck>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <!-- OSGi test -->
-               <dependency>
-                       <groupId>org.argeo.commons.osgi</groupId>
-                       <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>0.3.5-SNAPSHOT</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
+       <profiles>
+               <profile>
+                       <id>check-osgi</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.argeo.maven.plugins</groupId>
+                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>check-osgi</id>
+                                                               <phase>test</phase>
+                                                               <goals>
+                                                                       <goal>equinox</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <onlyCheck>true</onlyCheck>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+                       <dependencies>
+                               <!-- OSGi test -->
+                               <dependency>
+                                       <groupId>org.argeo.commons.osgi</groupId>
+                                       <artifactId>org.argeo.osgi.boot</artifactId>
+                                       <version>0.3.5-SNAPSHOT</version>
+                                       <scope>test</scope>
+                               </dependency>
+                       </dependencies>
+               </profile>
+       </profiles>
 </project>
\ No newline at end of file

diff --git a/server/plugins/org.argeo.jcr.ui.explorer/pom.xml b/server/plugins/org.argeo.jcr.ui.explorer/pom.xml
index 1f353367470032f634f11d26f78a65b970c9da47..65285df491840621aa93459eedf76c81747c1ca8 100644 (file)
--- a/server/plugins/org.argeo.jcr.ui.explorer/pom.xml
+++ b/server/plugins/org.argeo.jcr.ui.explorer/pom.xml
@@ -26,6 +26,7 @@
                                                <Import-Package>
                                                        *,
                                                        org.argeo.eclipse.spring,
+                                                       org.argeo.util.crypto,
                                                </Import-Package>
                                                <Export-Package>org.argeo.jcr.ui.explorer.*</Export-Package>
                                        </instructions>

diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml
index 113b81a265223760b1cb49668b65a8194d0611ab..419d414933a6e92d7a7ac2af97783058b32bbbbf 100644 (file)
--- a/server/plugins/pom.xml
+++ b/server/plugins/pom.xml
@@ -47,6 +47,15 @@
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-surefire-plugin</artifactId>
                        </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
                </plugins>
        </build>
 </project>