Restructure security projects

Update MANIFEST versions

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

diff --git a/security/demo/org.argeo.security.demo.log4j/META-INF/MANIFEST.MF b/security/demo/org.argeo.security.demo.log4j/META-INF/MANIFEST.MF
index 9180f70d5fc61b7d9954cd177662444e07514ba7..4fe3ac9b6ad69843036798d01ebd4beeb9739f54 100644 (file)
--- a/security/demo/org.argeo.security.demo.log4j/META-INF/MANIFEST.MF
+++ b/security/demo/org.argeo.security.demo.log4j/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Bundle-SymbolicName: org.argeo.security.demo.log4j
-Bundle-Version: 0.1.2.SNAPSHOT
+Bundle-Version: 0.1.3.SNAPSHOT
 Fragment-Host: com.springsource.org.apache.log4j

diff --git a/security/modules/.classpath b/security/modules/.classpath
deleted file mode 100644 (file)
index d0bec0f..0000000
--- a/security/modules/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-       <classpathentry kind="output" path="target/classes"/>
-</classpath>

diff --git a/security/modules/.project b/security/modules/.project
deleted file mode 100644 (file)
index c47b78c..0000000
--- a/security/modules/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.security.modules</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>

diff --git a/security/modules/org.argeo.security.manager.ldap/.project b/security/modules/org.argeo.security.manager.ldap/.project
new file mode 100644 (file)
index 0000000..6de3825
--- /dev/null
+++ b/security/modules/org.argeo.security.manager.ldap/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.argeo.security.manager.ldap</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.PluginNature</nature>
+       </natures>
+</projectDescription>

diff --git a/security/modules/org.argeo.security.manager.ldap/META-INF/MANIFEST.MF b/security/modules/org.argeo.security.manager.ldap/META-INF/MANIFEST.MF
index 4f36c0f7da1a5e7f0060189e1ad0bd71cef05d9e..d02bee48f5acdbae748f0c1e3283f8aedbfd5ab1 100644 (file)
--- a/security/modules/org.argeo.security.manager.ldap/META-INF/MANIFEST.MF
+++ b/security/modules/org.argeo.security.manager.ldap/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Bundle-SymbolicName: org.argeo.security.manager.ldap
-Bundle-Version: 0.1.2.SNAPSHOT
+Bundle-Version: 0.1.3.SNAPSHOT
 Import-Package: com.sun.jndi.ldap;resolution:=optional,
  org.argeo.security,
  org.argeo.security.ldap,
@@ -13,3 +13,4 @@ Import-Package: com.sun.jndi.ldap;resolution:=optional,
  org.springframework.security.providers.ldap.authenticator,
  org.springframework.security.userdetails,
  org.springframework.security.userdetails.ldap
+Bundle-Name: Security Manager LDAP

diff --git a/security/modules/org.argeo.security.services/META-INF/MANIFEST.MF b/security/modules/org.argeo.security.services/META-INF/MANIFEST.MF
index 0162170ccff3d8265dcbbe3052953056c65733a4..c1f697c723f0825236dcc23f0eb159cff7d8a057 100644 (file)
--- a/security/modules/org.argeo.security.services/META-INF/MANIFEST.MF
+++ b/security/modules/org.argeo.security.services/META-INF/MANIFEST.MF
@@ -1,8 +1,9 @@
 Bundle-SymbolicName: org.argeo.security.services
-Bundle-Version: 0.1.2.SNAPSHOT
+Bundle-Version: 0.1.3.SNAPSHOT
 Import-Package: org.argeo.security,
  org.argeo.security.core,
  org.argeo.security.ldap,
  org.argeo.security.ldap.nature,
+ org.argeo.security.nature,
  org.argeo.server.json
 Bundle-Name: Security Services

diff --git a/security/modules/org.argeo.security.services/META-INF/spring/osgi.xml b/security/modules/org.argeo.security.services/META-INF/spring/osgi.xml
index 204ae5ce4a9df620da7be4e30d15920da0d7a465..80e86bd7b2887083c2f24e1c50563d9facf48cca 100644 (file)
--- a/security/modules/org.argeo.security.services/META-INF/spring/osgi.xml
+++ b/security/modules/org.argeo.security.services/META-INF/spring/osgi.xml
@@ -9,7 +9,8 @@
        <service ref="jsonObjectFactory" interface="org.argeo.server.json.JsonObjectFactory" />\r
        <service ref="securityService" interface="org.argeo.security.ArgeoSecurityService" />\r
 \r
-       <reference id="securityDao" interface="org.argeo.security.ArgeoSecurityDao" />\r
+       <reference id="securityDao" interface="org.argeo.security.ArgeoSecurityDao"\r
+               context-class-loader="service-provider" />\r
 \r
        <service interface="org.argeo.security.ldap.UserNatureMapper">\r
                <beans:bean class="org.argeo.security.ldap.nature.SimpleUserNatureMapper" />\r

diff --git a/security/modules/org.argeo.security.webapp/.project b/security/modules/org.argeo.security.webapp/.project
new file mode 100644 (file)
index 0000000..f28005e
--- /dev/null
+++ b/security/modules/org.argeo.security.webapp/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.argeo.security.webapp</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.PluginNature</nature>
+       </natures>
+</projectDescription>

diff --git a/security/modules/org.argeo.security.webapp/META-INF/MANIFEST.MF b/security/modules/org.argeo.security.webapp/META-INF/MANIFEST.MF
index 380fe85673e3c83cbec3ab8e57b001f3ecf614c7..52d2cd87391ee0ca340164d6d9df7b07165ba598 100644 (file)
--- a/security/modules/org.argeo.security.webapp/META-INF/MANIFEST.MF
+++ b/security/modules/org.argeo.security.webapp/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Bundle-SymbolicName: org.argeo.security.webapp
-Bundle-Version: 0.1.2.SNAPSHOT
+Bundle-Version: 0.1.3.SNAPSHOT
 Web-ContextPath: org.argeo.security.webapp
 Import-Package: javax.servlet,
  javax.servlet.http,
@@ -18,3 +18,4 @@ Import-Package: javax.servlet,
  org.springframework.web.context.support,
  org.springframework.web.filter,
  org.springframework.web.servlet
+Bundle-Name: Security Webapp

diff --git a/security/runtime/org.argeo.security.core/.classpath b/security/runtime/org.argeo.security.core/.classpath
index e2de5961c7f120f78cc335ffdddfaf0c28ef297e..3e6ecf767d5519108c40bc9c9ea27c164872ca49 100644 (file)
--- a/security/runtime/org.argeo.security.core/.classpath
+++ b/security/runtime/org.argeo.security.core/.classpath
@@ -3,8 +3,8 @@
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
        <classpathentry kind="src" output="target/classes" path="src/main/resources"/>
        <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-       <classpathentry kind="src" path="src/test/resources"/>
+       <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-       <classpathentry kind="output" path="target/classes"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/security/runtime/org.argeo.security.core/.project b/security/runtime/org.argeo.security.core/.project
index 578bb7b27e52cd17bedfc9d6486a7f05e475792e..a8e385a9c78a6c6e699cfc45dd9c2588566031ba 100644 (file)
--- a/security/runtime/org.argeo.security.core/.project
+++ b/security/runtime/org.argeo.security.core/.project
@@ -11,13 +11,18 @@
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
        </buildSpec>
        <natures>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>

diff --git a/security/runtime/org.argeo.security.core/build.properties b/security/runtime/org.argeo.security.core/build.properties
new file mode 100644 (file)
index 0000000..2e1a6e7
--- /dev/null
+++ b/security/runtime/org.argeo.security.core/build.properties
@@ -0,0 +1,13 @@
+additional.bundles = org.springframework.transaction,\
+                     org.springframework.core,\
+                     com.springsource.junit,\
+                     com.springsource.org.apache.commons.io,\
+                     com.springsource.org.codehaus.jackson,\
+                     com.springsource.json,\
+                     com.springsource.org.apache.commons.codec,\
+                     org.springframework.security,\
+                     com.springsource.org.codehaus.jackson.mapper
+source.. = src/main/java/,\
+           src/main/resources/,\
+           src/test/java/,\
+           src/test/resources/

diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml
index c2bea2b9e064f16c986461fb353ff6edec465c59..44b512ac5517c108a4b87ccf00ed77bd6eb3417c 100644 (file)
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/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>

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultArgeoSecurity.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultArgeoSecurity.java
index c3b59324672ea6a8990052a124722d760f6411f1..b5e2ae925d381b0e806008e44588c499448e4cd7 100644 (file)
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultArgeoSecurity.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultArgeoSecurity.java
@@ -9,7 +9,7 @@ public class DefaultArgeoSecurity implements ArgeoSecurity {
 
        public void beforeCreate(ArgeoUser user) {
                SimpleUserNature simpleUserNature = new SimpleUserNature();
-               simpleUserNature.setLastName("");// to prevent issue with sn in LDAP
+               simpleUserNature.setLastName("empty");// to prevent issue with sn in LDAP
                user.getUserNatures().add(simpleUserNature);
        }
 

diff --git a/security/runtime/org.argeo.security.core/src/main/resources/META-INF/spring/natures.xml b/security/runtime/org.argeo.security.core/src/main/resources/META-INF/spring/natures.xml
deleted file mode 100644 (file)
index b2ac117..0000000
--- a/security/runtime/org.argeo.security.core/src/main/resources/META-INF/spring/natures.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-       <bean id="jsonObjectFactory" class="org.argeo.server.json.JsonObjectFactoryImpl">
-       </bean>
-</beans>
\ No newline at end of file

diff --git a/security/runtime/org.argeo.security.core/src/main/resources/META-INF/spring/osgi.xml b/security/runtime/org.argeo.security.core/src/main/resources/META-INF/spring/osgi.xml
deleted file mode 100644 (file)
index 204ae5c..0000000
--- a/security/runtime/org.argeo.security.core/src/main/resources/META-INF/spring/osgi.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/osgi  \r
-       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
-       http://www.springframework.org/schema/beans   \r
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <service ref="jsonObjectFactory" interface="org.argeo.server.json.JsonObjectFactory" />\r
-       <service ref="securityService" interface="org.argeo.security.ArgeoSecurityService" />\r
-\r
-       <reference id="securityDao" interface="org.argeo.security.ArgeoSecurityDao" />\r
-\r
-       <service interface="org.argeo.security.ldap.UserNatureMapper">\r
-               <beans:bean class="org.argeo.security.ldap.nature.SimpleUserNatureMapper" />\r
-       </service>\r
-\r
-       <service interface="org.argeo.security.ldap.UserNatureMapper">\r
-               <beans:bean class="org.argeo.security.ldap.nature.CoworkerUserNatureMapper" />\r
-       </service>\r
-\r
-</beans:beans>
\ No newline at end of file

diff --git a/security/runtime/org.argeo.security.core/src/main/resources/META-INF/spring/services.xml b/security/runtime/org.argeo.security.core/src/main/resources/META-INF/spring/services.xml
deleted file mode 100644 (file)
index dbf6489..0000000
--- a/security/runtime/org.argeo.security.core/src/main/resources/META-INF/spring/services.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-       <bean id="securityService" class="org.argeo.security.core.DefaultSecurityService">
-               <property name="securityDao" ref="securityDao" />
-       </bean>
-</beans>
\ No newline at end of file

diff --git a/security/runtime/org.argeo.security.mvc/.classpath b/security/runtime/org.argeo.security.mvc/.classpath
index 16f01e2ee7b671c44c26c453773dab706e98da1e..fc460145a4b82500722cb922fc76d370cbfc9f2e 100644 (file)
--- a/security/runtime/org.argeo.security.mvc/.classpath
+++ b/security/runtime/org.argeo.security.mvc/.classpath
@@ -2,6 +2,6 @@
 <classpath>
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-       <classpathentry kind="output" path="target/classes"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/security/runtime/org.argeo.security.mvc/.project b/security/runtime/org.argeo.security.mvc/.project
index b9ec44fba2bcf32d26fc137800e84ceafa5d7b3e..b287d0835f622d3ae0135075a673eb71dee420be 100644 (file)
--- a/security/runtime/org.argeo.security.mvc/.project
+++ b/security/runtime/org.argeo.security.mvc/.project
@@ -11,13 +11,18 @@
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
        </buildSpec>
        <natures>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>

diff --git a/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java b/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java
index 4f9c723fb150474b827dafff097e4d233aa2a5bc..e1e66346ca6b88ed07bd67e10f0bbd57319aabc4 100644 (file)
--- a/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java
+++ b/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java
@@ -66,7 +66,8 @@ public class UsersRolesController implements MvcConstants {
        @RequestMapping("/createUser.security")
        @ModelAttribute(ANSWER_MODEL_KEY)
        public ArgeoUser createUser(Reader reader) {
-               ArgeoUser user = userDeserializer.deserialize(reader, ArgeoUser.class);
+               ArgeoUser user = userDeserializer.deserialize(reader,
+                               SimpleArgeoUser.class);
                // cleanUserBeforeCreate(user);
                securityService.newUser(user);
                return securityService.getSecurityDao().getUser(user.getUsername());
@@ -75,7 +76,8 @@ public class UsersRolesController implements MvcConstants {
        @RequestMapping("/updateUser.security")
        @ModelAttribute(ANSWER_MODEL_KEY)
        public ArgeoUser updateUser(Reader reader) {
-               ArgeoUser user = userDeserializer.deserialize(reader, ArgeoUser.class);
+               ArgeoUser user = userDeserializer.deserialize(reader,
+                               SimpleArgeoUser.class);
                securityService.updateUser(user);
                return securityService.getSecurityDao().getUser(user.getUsername());
        }

diff --git a/security/runtime/org.argeo.security.ria/pom.xml b/security/runtime/org.argeo.security.ria/pom.xml
index f5972735b4e8a77e40b1eeef36cf0b38a915db7f..90d65178cc0eaedb836a5016891b676e81ec7b03 100644 (file)
--- a/security/runtime/org.argeo.security.ria/pom.xml
+++ b/security/runtime/org.argeo.security.ria/pom.xml
@@ -85,14 +85,6 @@
                                        </execution>
                                </executions>
                        </plugin>
-                       <plugin>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <archive>
-                                               <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
-                                       </archive>
-                               </configuration>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>

diff --git a/security/runtime/pom.xml b/security/runtime/pom.xml
index 6925993b8c2d77d83f17f1dcdeb2b12191943737..c6afca4e3d5b400c5ff53006b03d264ddaab000e 100644 (file)
--- a/security/runtime/pom.xml
+++ b/security/runtime/pom.xml
@@ -15,6 +15,75 @@
                <module>org.argeo.security.core</module>
                <module>org.argeo.security.mvc</module>
        </modules>
+       <build>
+               <resources>
+                       <resource>
+                               <directory>src/main/resources</directory>
+                       </resource>
+                       <resource>
+                               <directory>.</directory>
+                               <includes>
+                                       <include>META-INF/**</include>
+                               </includes>
+                       </resource>
+               </resources>
+               <plugins>
+                       <plugin>
+                               <artifactId>maven-clean-plugin</artifactId>
+                               <configuration>
+                                       <filesets>
+                                               <fileset>
+                                                       <directory>META-INF</directory>
+                                                       <includes>
+                                                               <include>MANIFEST.MF</include>
+                                                       </includes>
+                                               </fileset>
+                                       </filesets>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-jar-plugin</artifactId>
+                               <configuration>
+                                       <archive>
+                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                                       </archive>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-source-plugin</artifactId>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <version>${version.maven-bundle-plugin}</version>
+                               <extensions>true</extensions>
+                               <configuration>
+                                       <manifestLocation>META-INF</manifestLocation>
+                                       <instructions>
+                                               <Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
+                                               <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                                               <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+                                               <_removeheaders>Bnd-LastModified</_removeheaders>
+                                       </instructions>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>bundle-manifest</id>
+                                               <phase>process-classes</phase>
+                                               <goals>
+                                                       <goal>manifest</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
+       </build>
        <profiles>
                <profile>
                        <id>withRia</id>

diff --git a/server/demo/org.argeo.server.demo.log4j/META-INF/MANIFEST.MF b/server/demo/org.argeo.server.demo.log4j/META-INF/MANIFEST.MF
index 5c274b175bfc4f4800e82c21ac8f95d8e05600d9..d3f7ded7a2bc82040b09b7cc7e3acfdcb04b4248 100644 (file)
--- a/server/demo/org.argeo.server.demo.log4j/META-INF/MANIFEST.MF
+++ b/server/demo/org.argeo.server.demo.log4j/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Bundle-SymbolicName: org.argeo.server.demo.log4j
-Bundle-Version: 0.1.2.SNAPSHOT
+Bundle-Version: 0.1.3.SNAPSHOT
 Fragment-Host: com.springsource.org.apache.log4j

diff --git a/server/demo/org.argeo.server.demo.miniwebapp/META-INF/MANIFEST.MF b/server/demo/org.argeo.server.demo.miniwebapp/META-INF/MANIFEST.MF
index fa115ac0de4d3be9e5833cde144eb7acf474596b..2a8dabf1c0ede01ad05012851a9ddc02c1dcd441 100644 (file)
--- a/server/demo/org.argeo.server.demo.miniwebapp/META-INF/MANIFEST.MF
+++ b/server/demo/org.argeo.server.demo.miniwebapp/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Web-ContextPath: org.argeo.server.demo.miniwebapp
 Bundle-SymbolicName: org.argeo.server.demo.miniwebapp
-Bundle-Version: 0.1.2.SNAPSHOT
+Bundle-Version: 0.1.3.SNAPSHOT
 Import-Package: javax.servlet,
  javax.servlet.http,
  javax.servlet.jsp,

diff --git a/server/demo/org.argeo.server.osgi.monitor/META-INF/MANIFEST.MF b/server/demo/org.argeo.server.osgi.monitor/META-INF/MANIFEST.MF
index f3aa7993775def4cf1be1e48d3af0e362793fcc5..b3577e5e2b7f107d82a353064a7f53de693d7240 100644 (file)
--- a/server/demo/org.argeo.server.osgi.monitor/META-INF/MANIFEST.MF
+++ b/server/demo/org.argeo.server.osgi.monitor/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Web-ContextPath: org.argeo.server.osgi.monitor
 Bundle-SymbolicName: org.argeo.server.osgi.monitor
-Bundle-Version: 0.1.2.SNAPSHOT
+Bundle-Version: 0.1.3.SNAPSHOT
 Import-Package: javax.servlet,
  javax.servlet.http,
  javax.servlet.jsp,

diff --git a/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF
index c37dff083026fec48c1d9d7380599f1dabf4d242..321ada0e0e78dceb05a5c1d34727e8d7264408fa 100644 (file)
--- a/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Bundle-Version: 0.1.2.SNAPSHOT
+Bundle-Version: 0.1.3.SNAPSHOT
 Bundle-SymbolicName: org.argeo.server.activemq.broker
 Import-Package: ietf.params.xml.ns.xmpp_sasl;resolution:=optional,
  ietf.params.xml.ns.xmpp_stanzas;resolution:=optional,

diff --git a/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF
index c14201d01d10c2cf819615ff6579ee49b624b918..69f7b93b48c0bb26b947fc690e2f2203e7c46e06 100644 (file)
--- a/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF
@@ -1,4 +1,4 @@
-Bundle-Version: 0.1.2.SNAPSHOT
+Bundle-Version: 0.1.3.SNAPSHOT
 Bundle-SymbolicName: org.argeo.server.ads.server
 Import-Package: org.apache.directory.server.configuration,
  org.apache.directory.server.core.authn,

diff --git a/server/modules/org.argeo.server.ads.server/init.ldif b/server/modules/org.argeo.server.ads.server/init.ldif
index 8b0c8276adc53507e56645679c892187efb43857..98b9944a00a048033429054fa6117b3361915138 100644 (file)
--- a/server/modules/org.argeo.server.ads.server/init.ldif
+++ b/server/modules/org.argeo.server.ads.server/init.ldif
@@ -2,7 +2,7 @@ dn: dc=demo,dc=argeo,dc=org
 objectClass: domain
 objectClass: extensibleObject
 objectClass: top
-dc: springsecurity
+dc: demo
 
 dn: ou=groups,dc=demo,dc=argeo,dc=org
 objectClass: organizationalUnit

diff --git a/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF
index f4999224d3f0ebae5516d853e66d930e3e33af51..8e17b15d5df1639a5ca0186fddcefaa3e0f10a30 100644 (file)
--- a/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Fragment-Host: com.springsource.org.apache.catalina.springsource;bundle-version="[6
  .0.16,7.0.0)"
-Bundle-Version: 0.1.2.SNAPSHOT
+Bundle-Version: 0.1.3.SNAPSHOT
 Bundle-SymbolicName: org.argeo.server.catalina
 Import-Package: org.apache.commons.logging.impl;resolution:=optional,
  org.argeo.security.core;resolution:=optional,

diff --git a/server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF
index 92fc80df52ab64f7a547735f1d53279080b56c91..f0a6479108bb630dba6a801b7d1cc17a9b868829 100644 (file)
--- a/server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Bundle-Version: 0.1.2.SNAPSHOT
+Bundle-Version: 0.1.3.SNAPSHOT
 Bundle-SymbolicName: org.argeo.server.hsqldb
 Import-Package: org.hsqldb.jdbc,
  org.springframework.beans.factory.config

diff --git a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF
index 2da11017fb0dc9257c0cb47c35110289838b02f9..af3027faf709945e62120ca7dc640cc206e75160 100644 (file)
--- a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Bundle-SymbolicName: org.argeo.server.jackrabbit.repo
-Bundle-Version: 0.1.2.SNAPSHOT
+Bundle-Version: 0.1.3.SNAPSHOT
 Import-Package: javax.jcr,
  org.apache.jackrabbit.core,
  org.apache.jackrabbit.core.config,

diff --git a/server/modules/org.argeo.server.jackrabbit.webdav/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.jackrabbit.webdav/META-INF/MANIFEST.MF
index dfde83c756d4957c9449a37621207acd6ec9d7f0..fabe0aebb79c8280dd00b02dd1091d4d9be5e9bd 100644 (file)
--- a/server/modules/org.argeo.server.jackrabbit.webdav/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.jackrabbit.webdav/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Bundle-SymbolicName: org.argeo.server.jackrabbit.webdav
-Bundle-Version: 0.1.2.SNAPSHOT
+Bundle-Version: 0.1.3.SNAPSHOT
 Web-ContextPath: webdav
 Import-Package: javax.jcr,
  javax.servlet,

diff --git a/server/modules/org.argeo.server.jdbc/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.jdbc/META-INF/MANIFEST.MF
index abcbf4d5682ade7462d7b3bac879c0a394893683..94f4577342828be8608ba4ef4b8d6275c1b58b9e 100644 (file)
--- a/server/modules/org.argeo.server.jdbc/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.jdbc/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Fragment-Host: org.springframework.jdbc
-Bundle-Version: 0.1.2.SNAPSHOT
+Bundle-Version: 0.1.3.SNAPSHOT
 Bundle-SymbolicName: org.argeo.server.jdbc
 Import-Package: com.microsoft.sqlserver.jdbc;resolution:=optional,
  com.mysql.jdbc;resolution:=optional,

diff --git a/server/modules/org.argeo.server.mysql/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.mysql/META-INF/MANIFEST.MF
index c368b79bb081d6edd4f8d82861709522dc477403..7892cbb6e36cb3ff0bd41e787797742c7077c8f2 100644 (file)
--- a/server/modules/org.argeo.server.mysql/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.mysql/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Require-Bundle: org.argeo.slc.specs,org.argeo.slc.core
-Bundle-Version: 0.1.2.SNAPSHOT
+Bundle-Version: 0.1.3.SNAPSHOT
 Bundle-Name: Argeo SLC MySQL
 Bundle-SymbolicName: org.argeo.server.mysql
 Import-Package: com.mysql.jdbc,net.sf.ehcache.hibernate,org.hibernate,

diff --git a/server/modules/org.argeo.server.tomcat/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.tomcat/META-INF/MANIFEST.MF
index f3087d0478980f31186ded7898747a2ec11d0824..fe5c9e8ed69cccae18e5266850e2075010e9d201 100644 (file)
--- a/server/modules/org.argeo.server.tomcat/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.tomcat/META-INF/MANIFEST.MF
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 Fragment-Host: org.argeo.dep.osgi.catalina.start
-Bundle-Version: 0.1.2.SNAPSHOT
+Bundle-Version: 0.1.3.SNAPSHOT
 Bundle-SymbolicName: org.argeo.server.tomcat

diff --git a/server/modules/org.argeo.server.webextender/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.webextender/META-INF/MANIFEST.MF
index cbc5c115ea81bb2bdb45e764e463ac44ef078fcf..9922ec2b31a645f4da69f5d2caf144f62a342295 100644 (file)
--- a/server/modules/org.argeo.server.webextender/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.webextender/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 Fragment-Host: org.springframework.osgi.web.extender
-Bundle-Version: 0.1.2.SNAPSHOT
+Bundle-Version: 0.1.3.SNAPSHOT
 Bundle-SymbolicName: org.argeo.server.webextender
 Import-Package: org.apache.catalina,org.apache.catalina.connector