From 2101bfb7ae055b0e18fbb0001e278aeba13af346 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 22 Feb 2010 14:05:13 +0000 Subject: [PATCH] Restructure security projects Update MANIFEST versions git-svn-id: https://svn.argeo.org/commons/trunk@3384 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../META-INF/MANIFEST.MF | 2 +- security/modules/.classpath | 6 -- .../.project | 9 ++- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/spring/osgi.xml | 3 +- .../org.argeo.security.webapp/.project | 22 ++++++ .../META-INF/MANIFEST.MF | 3 +- .../org.argeo.security.core/.classpath | 6 +- .../runtime/org.argeo.security.core/.project | 9 ++- .../org.argeo.security.core/build.properties | 13 ++++ .../runtime/org.argeo.security.core/pom.xml | 3 +- .../security/core/DefaultArgeoSecurity.java | 2 +- .../resources/META-INF/spring/natures.xml | 9 --- .../main/resources/META-INF/spring/osgi.xml | 22 ------ .../resources/META-INF/spring/services.xml | 10 --- .../runtime/org.argeo.security.mvc/.classpath | 4 +- .../runtime/org.argeo.security.mvc/.project | 9 ++- .../security/mvc/UsersRolesController.java | 6 +- .../runtime/org.argeo.security.ria/pom.xml | 8 --- security/runtime/pom.xml | 69 +++++++++++++++++++ .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.argeo.server.ads.server/init.ldif | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- 35 files changed, 157 insertions(+), 92 deletions(-) delete mode 100644 security/modules/.classpath rename security/modules/{ => org.argeo.security.manager.ldap}/.project (55%) create mode 100644 security/modules/org.argeo.security.webapp/.project create mode 100644 security/runtime/org.argeo.security.core/build.properties delete mode 100644 security/runtime/org.argeo.security.core/src/main/resources/META-INF/spring/natures.xml delete mode 100644 security/runtime/org.argeo.security.core/src/main/resources/META-INF/spring/osgi.xml delete mode 100644 security/runtime/org.argeo.security.core/src/main/resources/META-INF/spring/services.xml 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 9180f70d5..4fe3ac9b6 100644 --- 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 index d0bec0f76..000000000 --- a/security/modules/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/security/modules/.project b/security/modules/org.argeo.security.manager.ldap/.project similarity index 55% rename from security/modules/.project rename to security/modules/org.argeo.security.manager.ldap/.project index c47b78c55..6de38255f 100644 --- a/security/modules/.project +++ b/security/modules/org.argeo.security.manager.ldap/.project @@ -1,23 +1,22 @@ - org.argeo.security.modules + org.argeo.security.manager.ldap - org.eclipse.jdt.core.javabuilder + org.eclipse.pde.ManifestBuilder - org.maven.ide.eclipse.maven2Builder + org.eclipse.pde.SchemaBuilder - org.maven.ide.eclipse.maven2Nature - org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature 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 4f36c0f7d..d02bee48f 100644 --- 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 0162170cc..c1f697c72 100644 --- 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 204ae5ce4..80e86bd7b 100644 --- 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 @@ - + diff --git a/security/modules/org.argeo.security.webapp/.project b/security/modules/org.argeo.security.webapp/.project new file mode 100644 index 000000000..f28005ed5 --- /dev/null +++ b/security/modules/org.argeo.security.webapp/.project @@ -0,0 +1,22 @@ + + + org.argeo.security.webapp + + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + + 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 380fe8567..52d2cd873 100644 --- 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 e2de5961c..3e6ecf767 100644 --- a/security/runtime/org.argeo.security.core/.classpath +++ b/security/runtime/org.argeo.security.core/.classpath @@ -3,8 +3,8 @@ - + - - + + diff --git a/security/runtime/org.argeo.security.core/.project b/security/runtime/org.argeo.security.core/.project index 578bb7b27..a8e385a9c 100644 --- a/security/runtime/org.argeo.security.core/.project +++ b/security/runtime/org.argeo.security.core/.project @@ -11,13 +11,18 @@ - org.maven.ide.eclipse.maven2Builder + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder - org.maven.ide.eclipse.maven2Nature org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature diff --git a/security/runtime/org.argeo.security.core/build.properties b/security/runtime/org.argeo.security.core/build.properties new file mode 100644 index 000000000..2e1a6e7fb --- /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 c2bea2b9e..44b512ac5 100644 --- a/security/runtime/org.argeo.security.core/pom.xml +++ b/security/runtime/org.argeo.security.core/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.commons.security 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 c3b593246..b5e2ae925 100644 --- 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 index b2ac1178b..000000000 --- a/security/runtime/org.argeo.security.core/src/main/resources/META-INF/spring/natures.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ 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 index 204ae5ce4..000000000 --- a/security/runtime/org.argeo.security.core/src/main/resources/META-INF/spring/osgi.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - \ 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 index dbf648926..000000000 --- a/security/runtime/org.argeo.security.core/src/main/resources/META-INF/spring/services.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ 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 16f01e2ee..fc460145a 100644 --- a/security/runtime/org.argeo.security.mvc/.classpath +++ b/security/runtime/org.argeo.security.mvc/.classpath @@ -2,6 +2,6 @@ - - + + diff --git a/security/runtime/org.argeo.security.mvc/.project b/security/runtime/org.argeo.security.mvc/.project index b9ec44fba..b287d0835 100644 --- a/security/runtime/org.argeo.security.mvc/.project +++ b/security/runtime/org.argeo.security.mvc/.project @@ -11,13 +11,18 @@ - org.maven.ide.eclipse.maven2Builder + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder - org.maven.ide.eclipse.maven2Nature org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature 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 4f9c723fb..e1e66346c 100644 --- 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 f5972735b..90d65178c 100644 --- a/security/runtime/org.argeo.security.ria/pom.xml +++ b/security/runtime/org.argeo.security.ria/pom.xml @@ -85,14 +85,6 @@ - - maven-jar-plugin - - - target/classes/META-INF/MANIFEST.MF - - - org.apache.felix maven-bundle-plugin diff --git a/security/runtime/pom.xml b/security/runtime/pom.xml index 6925993b8..c6afca4e3 100644 --- a/security/runtime/pom.xml +++ b/security/runtime/pom.xml @@ -15,6 +15,75 @@ org.argeo.security.core org.argeo.security.mvc + + + + src/main/resources + + + . + + META-INF/** + + + + + + maven-clean-plugin + + + + META-INF + + MANIFEST.MF + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + META-INF/MANIFEST.MF + + + + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.felix + maven-bundle-plugin + ${version.maven-bundle-plugin} + true + + META-INF + + ${project.version}-r${buildNumber} + ${pom.artifactId} + J2SE-1.5 + <_removeheaders>Bnd-LastModified + + + + + bundle-manifest + process-classes + + manifest + + + + + + withRia 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 5c274b175..d3f7ded7a 100644 --- 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 fa115ac0d..2a8dabf1c 100644 --- 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 f3aa79937..b3577e5e2 100644 --- 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 c37dff083..321ada0e0 100644 --- 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 c14201d01..69f7b93b4 100644 --- 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 8b0c8276a..98b9944a0 100644 --- 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 f4999224d..8e17b15d5 100644 --- 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 92fc80df5..f0a647910 100644 --- 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 2da11017f..af3027faf 100644 --- 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 dfde83c75..fabe0aebb 100644 --- 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 abcbf4d56..94f457734 100644 --- 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 c368b79bb..7892cbb6e 100644 --- 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 f3087d047..fe5c9e8ed 100644 --- 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 cbc5c115e..9922ec2b3 100644 --- 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 -- 2.30.2