Update manifest versions

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

diff --git a/demo/site/org.argeo.slc.demo.agent/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.agent/META-INF/MANIFEST.MF
index 7ed34c1ee5d36c78438c415d2b4ca32e6198927f..003d1e49f91993423245678d08da93243bb51774 100644 (file)
--- a/demo/site/org.argeo.slc.demo.agent/META-INF/MANIFEST.MF
+++ b/demo/site/org.argeo.slc.demo.agent/META-INF/MANIFEST.MF
@@ -1,4 +1,6 @@
-Bundle-SymbolicName: org.argeo.slc.demo.agent
-Bundle-Version: 0.11.3.SNAPSHOT
-Fragment-Host: org.argeo.slc.agent
-Bundle-Name: Argeo SLC Demo Agent
+Manifest-Version: 1.0\r
+Fragment-Host: org.argeo.slc.agent\r
+Bundle-Version: 0.11.4.SNAPSHOT\r
+Bundle-Name: Argeo SLC Demo Agent\r
+Bundle-SymbolicName: org.argeo.slc.demo.agent\r
+\r

diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF
index 8c256e44b2f258b1714b5e6896b02a4ee88e6519..e8cd8f5f7b3f7d9e898931cda653d63d6a0de59c 100644 (file)
--- a/demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF
+++ b/demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF
@@ -1,19 +1,12 @@
-Bundle-Name: Basic Plug-in
-Bundle-SymbolicName: org.argeo.slc.demo.basic
-Bundle-Version: 0.11.3.SNAPSHOT
-Spring-Context: conf/*,conf/testCases/*
-Require-Bundle: 
- org.argeo.slc.support.equinox,
- org.argeo.slc.specs,
- org.argeo.slc.support.simple
-Import-Package: 
- net.sf.cglib.core,
- net.sf.cglib.proxy,
- net.sf.cglib.reflect,
- org.aopalliance.aop,
- org.apache.commons.logging,
- org.springframework.aop,
- org.springframework.aop.framework,
- org.springframework.aop.scope,
- org.springframework.beans.factory.config,
- org.springframework.core.io
+Manifest-Version: 1.0\r
+Require-Bundle: org.argeo.slc.support.equinox,org.argeo.slc.specs,org.\r
+ argeo.slc.support.simple\r
+Bundle-Version: 0.11.4.SNAPSHOT\r
+Bundle-Name: Basic Plug-in\r
+Spring-Context: conf/*,conf/testCases/*\r
+Bundle-SymbolicName: org.argeo.slc.demo.basic\r
+Import-Package: net.sf.cglib.core,net.sf.cglib.proxy,net.sf.cglib.refl\r
+ ect,org.aopalliance.aop,org.apache.commons.logging,org.springframewor\r
+ k.aop,org.springframework.aop.framework,org.springframework.aop.scope\r
+ ,org.springframework.beans.factory.config,org.springframework.core.io\r
+\r

diff --git a/demo/site/org.argeo.slc.demo.log4j/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.log4j/META-INF/MANIFEST.MF
index e0d887f31731bfee51101199e62ef5d6c143b4e0..d04b1b441accbb648a8396b0b088dcbfa19c9943 100644 (file)
--- a/demo/site/org.argeo.slc.demo.log4j/META-INF/MANIFEST.MF
+++ b/demo/site/org.argeo.slc.demo.log4j/META-INF/MANIFEST.MF
@@ -1,5 +1,6 @@
-Bundle-Name: Log4j Configuration
-Bundle-SymbolicName: org.argeo.slc.demo.log4j
-Bundle-Version: 0.11.3.SNAPSHOT
-Fragment-Host: com.springsource.org.apache.log4j
-
+Manifest-Version: 1.0\r
+Fragment-Host: com.springsource.org.apache.log4j\r
+Bundle-Version: 0.11.4.SNAPSHOT\r
+Bundle-Name: Log4j Configuration\r
+Bundle-SymbolicName: org.argeo.slc.demo.log4j\r
+\r

diff --git a/demo/site/pom.xml b/demo/site/pom.xml
index c317cec7fd2c81775a03216438ea8a14e9e1ef3f..e2223f3798c3c902760f93e01e72b5b8e1fca4b1 100644 (file)
--- a/demo/site/pom.xml
+++ b/demo/site/pom.xml
@@ -16,6 +16,9 @@
                                <groupId>org.argeo.slc.maven</groupId>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
                                <extensions>true</extensions>
+                               <configuration>
+                                       <strictManifestVersion>true</strictManifestVersion>
+                               </configuration>
                        </plugin>
                </plugins>
        </build>

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index d9fca7f2b63df9916238fea191adc7acd43bbfc1..66a36df0b4e4e174975497906060792ad9626706 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -19,7 +19,7 @@
                <version.equinox>3.4.2.R34x_v20080826-1230</version.equinox>
                <version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
                <version.activemq>5.2.0.0006</version.activemq>
-               <version.maven-argeo-osgi>0.1.11</version.maven-argeo-osgi>
+               <version.maven-argeo-osgi>0.1.12</version.maven-argeo-osgi>
        </properties>
        <scm>
                <connection>scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc</connection>

diff --git a/server/org.argeo.slc.ria/src/META-INF/MANIFEST.MF b/server/org.argeo.slc.ria/src/META-INF/MANIFEST.MF
index 66559baae99afc007a1a587acdb9d868a775198d..d639b07974718cd03e27f4b6db7ad01f25d111f8 100644 (file)
--- a/server/org.argeo.slc.ria/src/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.ria/src/META-INF/MANIFEST.MF
@@ -1,12 +1,10 @@
-Web-ContextPath: org.argeo.slc.ria
-Bundle-Classpath: .
-Bundle-Name: SLC RIA
-Bundle-SymbolicName: org.argeo.slc.ria
-Bundle-Version: 0.11.3.qualifier
-Import-Package: javax.servlet,
- javax.servlet.http,
- javax.servlet.jsp,
- javax.servlet.jsp.jstl.core,
- javax.servlet.jsp.jstl.fmt,
- javax.servlet.jsp.jstl.tlv,
- javax.servlet.resources
+Manifest-Version: 1.0\r
+Bundle-Classpath: .\r
+Bundle-Version: 0.11.4.SNAPSHOT\r
+Bundle-Name: SLC RIA\r
+Import-Package: javax.servlet,javax.servlet.http,javax.servlet.jsp,jav\r
+ ax.servlet.jsp.jstl.core,javax.servlet.jsp.jstl.fmt,javax.servlet.jsp\r
+ .jstl.tlv,javax.servlet.resources\r
+Bundle-SymbolicName: org.argeo.slc.ria\r
+Web-ContextPath: org.argeo.slc.ria\r
+\r

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/MANIFEST.MF
index f7a716560de199052e4976e013efc353cbe933d3..3e5adbe484a546ca67d38b1c9df85347a31395ac 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/MANIFEST.MF
@@ -1,20 +1,12 @@
-Bundle-SymbolicName: org.argeo.slc.agent
-Bundle-Version: 0.11.3.SNAPSHOT
-Bundle-Name: Argeo SLC Agent
-Import-Package: 
- javax.jms,
- org.apache.activemq,
- org.apache.activemq.command,
- org.apache.activemq.pool,
- org.apache.commons.pool,
- org.springframework.beans.factory.config,
- org.springframework.jms.connection,
- org.springframework.jms.core,
- org.springframework.jms.listener,
- org.springframework.jms.listener.adapter,
- org.springframework.oxm.castor
-Require-Bundle: 
- org.argeo.slc.support.activemq,
- org.argeo.slc.specs,
- org.argeo.slc.support.simple,
- com.springsource.org.castor
+Manifest-Version: 1.0\r
+Require-Bundle: org.argeo.slc.support.activemq,org.argeo.slc.specs,org\r
+ .argeo.slc.support.simple,com.springsource.org.castor\r
+Bundle-Version: 0.11.4.SNAPSHOT\r
+Bundle-Name: Argeo SLC Agent\r
+Bundle-SymbolicName: org.argeo.slc.agent\r
+Import-Package: javax.jms,org.apache.activemq,org.apache.activemq.comm\r
+ and,org.apache.activemq.pool,org.apache.commons.pool,org.springframew\r
+ ork.beans.factory.config,org.springframework.jms.connection,org.sprin\r
+ gframework.jms.core,org.springframework.jms.listener,org.springframew\r
+ ork.jms.listener.adapter,org.springframework.oxm.castor\r
+\r

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/MANIFEST.MF
index c365ba04311d939e785c4d9134cd4431da1a2faa..5746861807d3e7d1f2fbee2795a3020c2dc7fbb8 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/MANIFEST.MF
@@ -1,19 +1,11 @@
-Bundle-SymbolicName: org.argeo.slc.server.activemq
-Bundle-Version: 0.11.3.SNAPSHOT
-Import-Package: javax.jms,
- javax.management.j2ee.statistics,
- org.apache.commons.logging,
- org.apache.activemq.pool,
- org.apache.commons.pool,
- org.springframework.transaction
-Require-Bundle: 
- org.argeo.slc.specs,
- org.argeo.slc.server,
- org.argeo.slc.support.activemq,
- com.springsource.org.castor,
- org.springframework.core,
- org.springframework.context,
- org.springframework.beans,
- org.springframework.oxm,
- org.springframework.jms,
- org.argeo.dep.osgi.activemq
+Manifest-Version: 1.0\r
+Require-Bundle: org.argeo.slc.specs,org.argeo.slc.server,org.argeo.slc\r
+ .support.activemq,com.springsource.org.castor,org.springframework.cor\r
+ e,org.springframework.context,org.springframework.beans,org.springfra\r
+ mework.oxm,org.springframework.jms,org.argeo.dep.osgi.activemq\r
+Bundle-Version: 0.11.4.SNAPSHOT\r
+Bundle-SymbolicName: org.argeo.slc.server.activemq\r
+Import-Package: javax.jms,javax.management.j2ee.statistics,org.apache.\r
+ commons.logging,org.apache.activemq.pool,org.apache.commons.pool,org.\r
+ springframework.transaction\r
+\r

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.catalina/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.catalina/META-INF/MANIFEST.MF
index 95ed13c45386e2cc01dc50bc9592af3ec26e0ad2..35de2e24bf198dd605dc7d8254720ee30318c2c6 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.catalina/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.catalina/META-INF/MANIFEST.MF
@@ -1,3 +1,6 @@
-Bundle-SymbolicName: org.argeo.slc.server.catalina
-Bundle-Version: 0.11.3.SNAPSHOT
-Fragment-Host: com.springsource.org.apache.catalina;bundle-version="[6.0.16,7.0.0)"
+Manifest-Version: 1.0\r
+Fragment-Host: com.springsource.org.apache.catalina;bundle-version="[6\r
+ .0.16,7.0.0)"\r
+Bundle-Version: 0.11.4.SNAPSHOT\r
+Bundle-SymbolicName: org.argeo.slc.server.catalina\r
+\r

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF
index 28c9d15fe9929774ec7b88bccbca5296ffe9a21f..fa23ccec193eccb6baa6f667fc07104e4f66e205 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF
@@ -1,15 +1,9 @@
-Bundle-SymbolicName: org.argeo.slc.server.hibernate
-Bundle-Version: 0.11.3.SNAPSHOT
-Import-Package: 
- org.aopalliance.aop,
- org.hibernate,
- org.hibernate.jdbc,
- org.springframework.aop,
- org.springframework.aop.framework,
- org.springframework.orm.hibernate3,
- org.springframework.transaction
-Require-Bundle: 
- org.argeo.slc.server,
- org.argeo.slc.specs,
- org.argeo.slc.support.simple,
- com.springsource.org.hibernate
+Manifest-Version: 1.0\r
+Require-Bundle: org.argeo.slc.server,org.argeo.slc.specs,org.argeo.slc\r
+ .support.simple,com.springsource.org.hibernate\r
+Bundle-Version: 0.11.4.SNAPSHOT\r
+Bundle-SymbolicName: org.argeo.slc.server.hibernate\r
+Import-Package: org.aopalliance.aop,org.hibernate,org.hibernate.jdbc,o\r
+ rg.springframework.aop,org.springframework.aop.framework,org.springfr\r
+ amework.orm.hibernate3,org.springframework.transaction\r
+\r

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/MANIFEST.MF
index 9331415e1a125fe840339ac7683a57a48a690b32..a8fc0e2223593d3a83df7ce58c7711a3863368d2 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/MANIFEST.MF
@@ -1,12 +1,9 @@
-Bundle-SymbolicName: org.argeo.slc.server.hsqldb
-Bundle-Version: 0.11.3.SNAPSHOT
-Require-Bundle: org.argeo.slc.server,
- org.argeo.slc.specs,
- org.argeo.slc.support.simple
-Import-Package: 
- org.springframework.orm.hibernate3,
- org.springframework.cache.ehcache,
- net.sf.ehcache.hibernate,
- org.hsqldb.jdbc,
- org.hibernate,
- org.springframework.beans.factory.config
+Manifest-Version: 1.0\r
+Require-Bundle: org.argeo.slc.server,org.argeo.slc.specs,org.argeo.slc\r
+ .support.simple\r
+Bundle-Version: 0.11.4.SNAPSHOT\r
+Bundle-SymbolicName: org.argeo.slc.server.hsqldb\r
+Import-Package: org.springframework.orm.hibernate3,org.springframework\r
+ .cache.ehcache,net.sf.ehcache.hibernate,org.hsqldb.jdbc,org.hibernate\r
+ ,org.springframework.beans.factory.config\r
+\r

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jdbc/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jdbc/META-INF/MANIFEST.MF
index 5c23db0396c5145f9f26ac50f84f2d73aa301fc9..215162ef2d54c53167b337c900c7f66e46a3d153 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jdbc/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jdbc/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
-Bundle-SymbolicName: org.argeo.slc.server.jdbc
-Bundle-Version: 0.11.3.SNAPSHOT
-Fragment-Host: org.springframework.jdbc
-Import-Package: 
- com.mysql.jdbc;resolution:=optional,
- net.sourceforge.jtds.jdbc;resolution:=optional,
- org.hsqldb;resolution:=optional
+Manifest-Version: 1.0\r
+Fragment-Host: org.springframework.jdbc\r
+Bundle-Version: 0.11.4.SNAPSHOT\r
+Bundle-SymbolicName: org.argeo.slc.server.jdbc\r
+Import-Package: com.mysql.jdbc;resolution:=optional,net.sourceforge.jt\r
+ ds.jdbc;resolution:=optional,org.hsqldb;resolution:=optional\r
+\r

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/MANIFEST.MF
index 58fb3ea785433e901906ca0010be3f95e15367f0..acbd68f9e7f8e8ceb21969c3c30dcdd1d9135677 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/MANIFEST.MF
@@ -1,18 +1,11 @@
-Bundle-SymbolicName: org.argeo.slc.server.jms
-Bundle-Version: 0.11.3.SNAPSHOT
-Import-Package: javax.jms,
- javax.management.j2ee.statistics,
- org.apache.commons.logging,
- org.springframework.transaction
-Require-Bundle: 
- org.argeo.slc.specs,
- org.argeo.slc.server,
- org.argeo.slc.support.simple,
- org.argeo.slc.support.activemq,
- org.springframework.core,
- org.springframework.context,
- org.springframework.beans,
- org.springframework.oxm,
- org.springframework.jms,
- com.springsource.org.castor,
- org.argeo.dep.osgi.activemq
+Manifest-Version: 1.0\r
+Require-Bundle: org.argeo.slc.specs,org.argeo.slc.server,org.argeo.slc\r
+ .support.simple,org.argeo.slc.support.activemq,org.springframework.co\r
+ re,org.springframework.context,org.springframework.beans,org.springfr\r
+ amework.oxm,org.springframework.jms,com.springsource.org.castor,org.a\r
+ rgeo.dep.osgi.activemq\r
+Bundle-Version: 0.11.4.SNAPSHOT\r
+Bundle-SymbolicName: org.argeo.slc.server.jms\r
+Import-Package: javax.jms,javax.management.j2ee.statistics,org.apache.\r
+ commons.logging,org.springframework.transaction\r
+\r

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.mysql/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.mysql/META-INF/MANIFEST.MF
index be865525e6e8860fbd6ba0bc6b7fab68eb31208b..4275f212d993f4d0da512e2b154eb7d38d31d52e 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.mysql/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.mysql/META-INF/MANIFEST.MF
@@ -1,15 +1,10 @@
-Bundle-Name: Argeo SLC MySQL
-Bundle-SymbolicName: org.argeo.slc.server.mysql
-Bundle-Version: 0.11.3.SNAPSHOT
-Import-Package: 
- com.mysql.jdbc,
- net.sf.ehcache.hibernate,
- org.hibernate,
- org.springframework.cache.ehcache,
- org.springframework.jdbc.datasource,
- org.springframework.orm.hibernate3,
- org.apache.commons.dbcp,
- org.springframework.beans.factory.config
-Require-Bundle: 
- org.argeo.slc.specs,
- org.argeo.slc.support.simple
+Manifest-Version: 1.0\r
+Require-Bundle: org.argeo.slc.specs,org.argeo.slc.support.simple\r
+Bundle-Version: 0.11.4.SNAPSHOT\r
+Bundle-Name: Argeo SLC MySQL\r
+Bundle-SymbolicName: org.argeo.slc.server.mysql\r
+Import-Package: com.mysql.jdbc,net.sf.ehcache.hibernate,org.hibernate,\r
+ org.springframework.cache.ehcache,org.springframework.jdbc.datasource\r
+ ,org.springframework.orm.hibernate3,org.apache.commons.dbcp,org.sprin\r
+ gframework.beans.factory.config\r
+\r

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/MANIFEST.MF
index 558ab8972efe41a73e2b637f6f4613c26d3719b9..3926ebdbe5fa2d0c9c9486117797ac8a45aba325 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/MANIFEST.MF
@@ -1,12 +1,10 @@
-Bundle-Name: SLC Server Services
-Bundle-SymbolicName: org.argeo.slc.server.services
-Bundle-Version: 0.11.3.SNAPSHOT
-Import-Package: org.hibernate.jdbc,
- org.springframework.transaction,
- org.springframework.aop,
- org.springframework.aop.framework,
- org.aopalliance.aop,
- org.springframework.beans.factory.config
-Require-Bundle: org.argeo.slc.server,
- org.argeo.slc.specs,
- org.argeo.slc.support.simple
+Manifest-Version: 1.0\r
+Require-Bundle: org.argeo.slc.server,org.argeo.slc.specs,org.argeo.slc\r
+ .support.simple\r
+Bundle-Version: 0.11.4.SNAPSHOT\r
+Bundle-Name: SLC Server Services\r
+Bundle-SymbolicName: org.argeo.slc.server.services\r
+Import-Package: org.hibernate.jdbc,org.springframework.transaction,org\r
+ .springframework.aop,org.springframework.aop.framework,org.aopallianc\r
+ e.aop,org.springframework.beans.factory.config\r
+\r

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.tomcat/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.tomcat/META-INF/MANIFEST.MF
index f5373a49f4bf287e26d53675602119a8a023d27e..ae4a9eeb8923d8d6ba6ebb53a295a72ae5a8ff89 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.tomcat/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.tomcat/META-INF/MANIFEST.MF
@@ -1,3 +1,5 @@
-Bundle-SymbolicName: org.argeo.slc.server.tomcat
-Bundle-Version: 0.11.3.SNAPSHOT
-Fragment-Host: org.argeo.dep.osgi.catalina.start
+Manifest-Version: 1.0\r
+Fragment-Host: org.argeo.dep.osgi.catalina.start\r
+Bundle-Version: 0.11.4.SNAPSHOT\r
+Bundle-SymbolicName: org.argeo.slc.server.tomcat\r
+\r

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
index e29023a390a2cc6b272f44c84256e4750fc02647..6f1df231b33a7cd4826a0a55f6919e39d238d635 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
@@ -1,46 +1,26 @@
-Web-ContextPath: org.argeo.slc.webapp
-Bundle-Name: SLC Webapp
-Bundle-SymbolicName: org.argeo.slc.webapp
-Bundle-Version: 0.11.3.SNAPSHOT
-Bundle-ClassPath: WEB-INF/classes
-Import-Package: com.sun.xml.messaging.saaj.soap;optional=true,
- javax.servlet,
- javax.servlet.http,
- javax.servlet.jsp,
- javax.servlet.jsp.jstl.core,
- javax.servlet.jsp.jstl.fmt,
- javax.servlet.jsp.jstl.tlv,
- javax.servlet.resources,
- org.aopalliance.aop,
- org.apache.taglibs.standard.resources,
- org.apache.taglibs.standard.tag.common.core,
- org.apache.taglibs.standard.tag.rt.core,
- org.apache.taglibs.standard.tei,
- org.apache.taglibs.standard.tlv,
- org.hibernate,
- org.hibernate.hql.ast,
- org.hibernate.jdbc,
- org.springframework.aop,
- org.springframework.aop.framework,
- org.springframework.aop.scope,
- net.sf.cglib.proxy,
- net.sf.cglib.core,
- net.sf.cglib.reflect,
- org.springframework.orm.hibernate3.support,
- org.springframework.osgi.web.context.support,
- org.springframework.oxm.castor,
- org.springframework.transaction,
- org.springframework.beans.factory.support,
- org.springframework.web.context,
- org.springframework.web.context.support,
- org.springframework.web.context.request,
- org.springframework.web.servlet,
- org.springframework.web.servlet.handler,
- org.springframework.web.servlet.view,
- org.springframework.web.util,
- org.springframework.web.servlet.mvc,
- org.springframework.xml.xsd
-Require-Bundle: org.argeo.slc.server,
- org.argeo.slc.specs,
- org.argeo.slc.support.simple,
- com.springsource.org.castor
+Manifest-Version: 1.0\r
+Require-Bundle: org.argeo.slc.server,org.argeo.slc.specs,org.argeo.slc\r
+ .support.simple,com.springsource.org.castor\r
+Bundle-ClassPath: WEB-INF/classes\r
+Bundle-Version: 0.11.4.SNAPSHOT\r
+Bundle-Name: SLC Webapp\r
+Web-ContextPath: org.argeo.slc.webapp\r
+Bundle-SymbolicName: org.argeo.slc.webapp\r
+Import-Package: com.sun.xml.messaging.saaj.soap;optional=true,javax.se\r
+ rvlet,javax.servlet.http,javax.servlet.jsp,javax.servlet.jsp.jstl.cor\r
+ e,javax.servlet.jsp.jstl.fmt,javax.servlet.jsp.jstl.tlv,javax.servlet\r
+ .resources,org.aopalliance.aop,org.apache.taglibs.standard.resources,\r
+ org.apache.taglibs.standard.tag.common.core,org.apache.taglibs.standa\r
+ rd.tag.rt.core,org.apache.taglibs.standard.tei,org.apache.taglibs.sta\r
+ ndard.tlv,org.hibernate,org.hibernate.hql.ast,org.hibernate.jdbc,org.\r
+ springframework.aop,org.springframework.aop.framework,org.springframe\r
+ work.aop.scope,net.sf.cglib.proxy,net.sf.cglib.core,net.sf.cglib.refl\r
+ ect,org.springframework.orm.hibernate3.support,org.springframework.os\r
+ gi.web.context.support,org.springframework.oxm.castor,org.springframe\r
+ work.transaction,org.springframework.beans.factory.support,org.spring\r
+ framework.web.context,org.springframework.web.context.support,org.spr\r
+ ingframework.web.context.request,org.springframework.web.servlet,org.\r
+ springframework.web.servlet.handler,org.springframework.web.servlet.v\r
+ iew,org.springframework.web.util,org.springframework.web.servlet.mvc,\r
+ org.springframework.xml.xsd\r
+\r

diff --git a/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/META-INF/MANIFEST.MF
index 0f66c487e53e9dae9babc927372cdc98b6589098..fe0a1ddb5ee8a6d591db3ee44762a3848d263a2f 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/META-INF/MANIFEST.MF
@@ -1,17 +1,13 @@
-Web-ContextPath: simple-web-app\r
+Manifest-Version: 1.0\r
+Bundle-ClassPath: WEB-INF/classes\r
+Bundle-Version: 0.11.4.SNAPSHOT\r
 Bundle-Name: Simple OSGi War\r
+Web-ContextPath: simple-web-app\r
 Bundle-SymbolicName: org.springframework.osgi.samples.simplewebapp\r
-Bundle-Version: 0.11.3.SNAPSHOT\r
-Bundle-ClassPath: WEB-INF/classes\r
-Import-Package: javax.servlet,\r
- javax.servlet.http,\r
- javax.servlet.jsp,\r
- javax.servlet.jsp.jstl.core,\r
- javax.servlet.jsp.jstl.fmt,\r
- javax.servlet.jsp.jstl.tlv,\r
- javax.servlet.resources,\r
- org.apache.taglibs.standard.resources,\r
- org.apache.taglibs.standard.tag.common.core,\r
- org.apache.taglibs.standard.tag.rt.core,\r
- org.apache.taglibs.standard.tei,\r
- org.apache.taglibs.standard.tlv\r
+Import-Package: javax.servlet,javax.servlet.http,javax.servlet.jsp,jav\r
+ ax.servlet.jsp.jstl.core,javax.servlet.jsp.jstl.fmt,javax.servlet.jsp\r
+ .jstl.tlv,javax.servlet.resources,org.apache.taglibs.standard.resourc\r
+ es,org.apache.taglibs.standard.tag.common.core,org.apache.taglibs.sta\r
+ ndard.tag.rt.core,org.apache.taglibs.standard.tei,org.apache.taglibs.\r
+ standard.tlv\r
+\r