]> git.argeo.org Git - gpl/argeo-slc.git/commitdiff
Fix manifests
authorMathieu Baudier <mbaudier@argeo.org>
Sat, 5 Feb 2011 14:12:03 +0000 (14:12 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Sat, 5 Feb 2011 14:12:03 +0000 (14:12 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@4123 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

22 files changed:
demo/server.properties
demo/site/org.argeo.slc.demo.maven/META-INF/MANIFEST.MF
dep/org.argeo.slc.dep.sdk/pom.xml
eclipse/plugins/modules/org.argeo.slc.client.agent/META-INF/MANIFEST.MF
eclipse/plugins/org.argeo.slc.client.rap/META-INF/MANIFEST.MF
eclipse/plugins/runtime/org.argeo.slc.client.commons/pom.xml
eclipse/plugins/runtime/org.argeo.slc.client.core/pom.xml
eclipse/plugins/runtime/org.argeo.slc.client.oxm/pom.xml
eclipse/plugins/runtime/org.argeo.slc.client.rcp/pom.xml
eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/META-INF/MANIFEST.MF
eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/org.argeo.slc.client.ui.dist.jar [new file with mode: 0644]
eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/BndProcess.java [new file with mode: 0644]
eclipse/plugins/runtime/org.argeo.slc.client.ui/pom.xml
modules/agent/org.argeo.slc.agent.jmx/META-INF/MANIFEST.MF
modules/server/org.argeo.slc.server.jackrabbit.derby/META-INF/MANIFEST.MF
modules/server/org.argeo.slc.server.jcr/META-INF/MANIFEST.MF
modules/server/org.argeo.slc.server.jms/META-INF/MANIFEST.MF
modules/server/org.argeo.slc.server.main.rap/META-INF/MANIFEST.MF
modules/server/org.argeo.slc.server.services/META-INF/MANIFEST.MF
modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
pom.xml
runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/obr/ObrWrapper.java [new file with mode: 0644]

index c35f8760dc9feb47d7c442d75e314d5db733bd17..1188b5fbe70d315b954f1df29d9db85870d58220 100644 (file)
@@ -4,4 +4,7 @@ org.argeo.server.ads.server,\
 org.argeo.slc.server.h2,\
 org.argeo.slc.server.hibernate,\
 org.argeo.slc.server.main,\
-org.argeo.slc.ria
+org.argeo.slc.ria,\
+org.apache.felix.bundlerepository
+
+log4j.configuration=file:../../log4j.properties
index 74979b000e53da1c429099ef95cc57b595ed279e..4cd54e753888884c2411177fd834b482b282569f 100644 (file)
@@ -4,13 +4,13 @@ Bundle-Name: SLC Demo Maven
 Bundle-SymbolicName: org.argeo.slc.demo.maven
 Bundle-Version: 0.13.1.SNAPSHOT
 Bundle-Description: Demonstrate Maven support
-Import-Package: org.aopalliance.aop;version="1.0.0",
- org.argeo.slc.core.execution;version="0.12.2.SNAPSHOT-r3445",
- org.argeo.slc.execution;version="0.12.2.SNAPSHOT-r3445",
+Import-Package: org.aopalliance.aop,
+ org.argeo.slc.core.execution,
+ org.argeo.slc.execution,
  org.argeo.slc.maven,
- org.argeo.slc.osgi;version="0.12.2.SNAPSHOT-r3424",
- org.springframework.aop;version="2.5.6.SEC01",
- org.springframework.aop.framework;version="2.5.6.SEC01",
- org.springframework.aop.scope;version="2.5.6.SEC01",
- org.springframework.beans.factory.config;version="2.5.6.SEC01",
- org.springframework.osgi.util;version="1.2.1"
+ org.argeo.slc.osgi,
+ org.springframework.aop,
+ org.springframework.aop.framework,
+ org.springframework.aop.scope,
+ org.springframework.beans.factory.config,
+ org.springframework.osgi.util
index 884ea749c340d5b3086ac09379dccfbd3c1ea402..96caf9415f50c163985d704f9f75ad0d37ca9030 100644 (file)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>
                        <type>tar.gz</type>
                        <classifier>base</classifier>
                </dependency>
+
+               <!-- Felix -->
+               <dependency>
+                       <groupId>org.apache.felix</groupId>
+                       <artifactId>org.osgi.service.obr</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.felix</groupId>
+                       <artifactId>org.apache.felix.bundlerepository</artifactId>
+               </dependency>
+
        </dependencies>
        <profiles>
                <profile>
index 0e30d47b1e14815936e2dbf316d24e8cc3f3bef8..f34b228d3a22d32e030752a36f65e5eecd97b6e7 100644 (file)
@@ -4,5 +4,5 @@ Bundle-Name: Agent
 Bundle-SymbolicName: org.argeo.slc.client.agent
 Bundle-Version: 0.13.1.SNAPSHOT
 Import-Package: org.argeo.slc.core.runtime,
- org.argeo.slc.execution;version="0.13.0.SNAPSHOT-r3770",
- org.argeo.slc.runtime;version="0.13.0.SNAPSHOT-r3770"
+ org.argeo.slc.execution,
+ org.argeo.slc.runtime
index 39e781093ffd6d32b032380a4986a9583cec56a9..eedcc6ea342d7e939a32631712bf9ab5ba76a4d7 100644 (file)
@@ -1,13 +1,13 @@
-Manifest-Version: 1.0\r
-Bundle-ManifestVersion: 2\r
-Bundle-Name: Rap Client for SLC\r
-Bundle-SymbolicName: org.argeo.slc.client.rap;singleton:=true\r
-Bundle-Version: 1.0.0.qualifier\r
-Bundle-Activator: org.argeo.slc.client.rap.SlcClientRapPlugin\r
-Bundle-Vendor: Argeo SASU\r
-Require-Bundle: org.eclipse.rap.ui;resolution:=optional\r
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6\r
-Bundle-ActivationPolicy: lazy\r
-Import-Package: javax.servlet;version="2.4.0",\r
- javax.servlet.http;version="2.4.0",\r
- org.argeo.slc.client.ui.perspectives\r
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Rap Client for SLC
+Bundle-SymbolicName: org.argeo.slc.client.rap;singleton:=true
+Bundle-Version: 0.13.1.SNAPSHOT
+Bundle-Activator: org.argeo.slc.client.rap.SlcClientRapPlugin
+Bundle-Vendor: Argeo SASU
+Require-Bundle: org.eclipse.rap.ui;resolution:=optional
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Import-Package: javax.servlet;version="2.4.0",
+ javax.servlet.http;version="2.4.0",
+ org.argeo.slc.client.ui.perspectives
index 5bd223f60d9068c5a6466e8c2897a6275b859d3c..e3fb26720189d4fc4b19ce1787fb2e56486e6a2d 100644 (file)
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc.eclipse</groupId>
-               <artifactId>plugins</artifactId>
+               <artifactId>runtime</artifactId>
                <version>0.13.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
index c640fe6c87c2beb8927af5b51fe34a73fdceaa0b..bb8404291b13839dcca175b52f212b58a8d3b26a 100644 (file)
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc.eclipse</groupId>
-               <artifactId>plugins</artifactId>
+               <artifactId>runtime</artifactId>
                <version>0.13.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
index 86cf8a95159abe86ed88fdaec89488fb646cd62f..6019b3bb4e00b279c0d913d28b0dd1ed47ebf723 100644 (file)
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc.eclipse</groupId>
-               <artifactId>plugins</artifactId>
+               <artifactId>runtime</artifactId>
                <version>0.13.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
index a28df93b8477b6683962f91896a36fef70118598..03f7f1f22cb1225b1658ad2da4f1052733b08952 100644 (file)
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc.eclipse</groupId>
-               <artifactId>plugins</artifactId>
+               <artifactId>runtime</artifactId>
                <version>0.13.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
index 7652771b18fcff5829041dd283baf55226b7058b..788114fb3187f1c7ad187aa4b714740ca3753dd5 100644 (file)
@@ -2,10 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Dist
 Bundle-SymbolicName: org.argeo.slc.client.ui.dist;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.13.1.SNAPSHOT
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.1",
  org.eclipse.core.runtime;bundle-version="3.6.0"
 Bundle-Activator: org.argeo.slc.client.ui.dist.DistPlugin
-Import-Package: org.argeo.eclipse.ui
+Import-Package: aQute.lib.osgi,
+ org.argeo.eclipse.ui
 Bundle-ActivationPolicy: lazy
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/org.argeo.slc.client.ui.dist.jar b/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/org.argeo.slc.client.ui.dist.jar
new file mode 100644 (file)
index 0000000..676dc77
Binary files /dev/null and b/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/org.argeo.slc.client.ui.dist.jar differ
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/BndProcess.java b/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/BndProcess.java
new file mode 100644 (file)
index 0000000..3a82072
--- /dev/null
@@ -0,0 +1,48 @@
+package org.argeo.slc.client.ui.dist.commands;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.jar.Manifest;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+
+import aQute.lib.osgi.Builder;
+import aQute.lib.osgi.Constants;
+import aQute.lib.osgi.Jar;
+
+public class BndProcess extends AbstractHandler implements Constants {
+
+       public Object execute(ExecutionEvent event) throws ExecutionException {
+               try {
+                       Builder b = new Builder();
+                       b.setProperty(EXPORT_PACKAGE, "org.osgi.framework");
+                       b.setProperty(PRIVATE_PACKAGE, "*");
+                       b.addClasspath(new File(
+                                       "/home/mbaudier/.m2/repository/org/eclipse/osgi/org.eclipse.osgi/3.6.1/org.eclipse.osgi-3.6.1.jar"));
+
+                       Jar jar = b.build();
+                       Manifest m = jar.getManifest();
+                       jar.write(new File(b.getBsn() + ".jar"));
+               } catch (IOException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               } catch (Exception e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+
+               return null;
+       }
+
+       public static void main(String[] args) {
+               try {
+                       new BndProcess().execute(null);
+               } catch (ExecutionException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+
+}
index f58754615ce7e2900db73dba4f1b9c1dbfca0cee..dca9232250d037accc608617d0154fd43e66f174 100644 (file)
@@ -1,8 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc.eclipse</groupId>
-               <artifactId>plugins</artifactId>
+               <artifactId>runtime</artifactId>
                <version>0.13.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
index 004032893dbb9ef0ecd3ef2b6e66fca64781c4a8..ba9e36c478025a3565f7a1e52021ed9124fb60a4 100644 (file)
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-Version: 0.13.1.SNAPSHOT
 Bundle-Name: SLC Agent JMX
 Bundle-SymbolicName: org.argeo.slc.agent.jmx
-Import-Package: org.argeo.slc.core.execution;specification-version="0.12.2.SNAPSHOT-r3341",
- org.argeo.slc.execution;specification-version="0.12.2.SNAPSHOT-r3335"
+Import-Package: org.argeo.slc.core.execution,
+ org.argeo.slc.execution
index e3781f65636708850304427cca26c1cf53554c5a..c1e51cc544160b4f0b3a3148b0d2ae90a33660ee 100644 (file)
@@ -4,6 +4,6 @@ Bundle-Name: Jackrabbit JCR Repository Derby
 Bundle-SymbolicName: org.argeo.slc.server.jackrabbit.derby
 Bundle-Version: 0.13.1.SNAPSHOT
 Bundle-Vendor: Argeo
-Import-Package: javax.jcr;version="1.0.0",
- org.argeo.server.jackrabbit;version="0.1.3.SNAPSHOT-r3516",
- org.springframework.beans.factory.config;version="2.5.6.SEC01"
+Import-Package: javax.jcr,
+ org.argeo.server.jackrabbit,
+ org.springframework.beans.factory.config
index f9e2a293e781bf8c8cdd100b4f5258b622940c35..812f08caf85372897831fe9a8692f2e6bf67ea44 100644 (file)
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.argeo.slc.server.jcr
 Bundle-Name: Server JCR
 Import-Package: javax.jcr,
  org.argeo.jcr,
- org.argeo.server.jcr.mvc;specification-version="0.1.3.SNAPSHOT-r3478",
+ org.argeo.server.jcr.mvc,
  org.argeo.slc.core.attachment,
  org.argeo.slc.core.execution,
  org.argeo.slc.core.structure,
@@ -18,8 +18,8 @@ Import-Package: javax.jcr,
  org.argeo.slc.execution,
  org.argeo.slc.jcr.dao,
  org.argeo.slc.process,
- org.argeo.slc.runtime;specification-version="0.12.2.SNAPSHOT-r3445",
+ org.argeo.slc.runtime,
  org.argeo.slc.test,
  org.springframework.beans.factory.config,
  org.springframework.osgi.util,
- org.springframework.web.context.request;specification-version="2.5.6.SEC01"
+ org.springframework.web.context.request
index e6e1865c955614b26373e771e4ea655737e72491..5ac7da62919d73e24314a45ff56658be486cc850 100644 (file)
@@ -6,14 +6,14 @@ Import-Package: javax.jms,
  org.apache.activemq,
  org.apache.activemq.command,
  org.apache.commons.logging,
- org.argeo.security;specification-version="0.1.3.SNAPSHOT-r3430",
- org.argeo.security.core;specification-version="0.1.3.SNAPSHOT-r3430",
+ org.argeo.security,
+ org.argeo.security.core,
  org.argeo.slc.activemq,
  org.argeo.slc.core.attachment,
  org.argeo.slc.jms,
  org.argeo.slc.msg.event,
  org.argeo.slc.services,
- org.springframework.beans.factory.config;specification-version="2.5.6.SEC01",
+ org.springframework.beans.factory.config,
  org.springframework.jms.core,
  org.springframework.jms.listener,
  org.springframework.jms.listener.adapter,
index 498c5f542fbff9368cca21091e28c461eec92be8..770ea80c8249765c1c0b8f0395636b8bf47e831f 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-Name: SLC Server Main for RAP applications
 Bundle-Description: List all Slc components needed  by SLC to run with a RAP UI.
 Bundle-SymbolicName: org.argeo.slc.server.main.rap
-Bundle-Version: 0.13.0.SNAPSHOT
+Bundle-Version: 0.13.1.SNAPSHOT
 Require-Bundle: org.argeo.slc.specs,
  org.argeo.slc.support.equinox
 Import-Package: org.argeo.slc.build,
index e803d16ac61da046229c683f53d668b6474c90dc..4538f8ef9ea725388d9bb65de6a3395f0938576b 100644 (file)
@@ -3,7 +3,7 @@ Bundle-Version: 0.13.1.SNAPSHOT
 Bundle-Name: SLC Server Services
 Bundle-SymbolicName: org.argeo.slc.server.services
 Import-Package: org.aopalliance.aop,
- org.argeo.security;specification-version="0.1.3.SNAPSHOT-r3430",
+ org.argeo.security,
  org.argeo.slc.core.attachment,
  org.argeo.slc.dao.process,
  org.argeo.slc.dao.runtime,
index 27383e4163d86252b6245dc07096f82cfb3d9dae..5fa7d93d684b26f2a4058f1cf41eebe92513f8c5 100644 (file)
@@ -4,16 +4,16 @@ Bundle-Version: 0.13.1.SNAPSHOT
 Bundle-Name: SLC Webapp
 Web-ContextPath: org.argeo.slc.webapp
 Bundle-SymbolicName: org.argeo.slc.webapp
-Import-Package: javax.jcr;specification-version="1.0.0",
+Import-Package: javax.jcr,
  net.sf.cglib.core,
  net.sf.cglib.proxy,
  net.sf.cglib.reflect,
  org.aopalliance.aop,
- org.argeo.security.mvc;specification-version="0.1.3.SNAPSHOT-r3402",
+ org.argeo.security.mvc,
  org.argeo.server,
- org.argeo.server.jackrabbit.webdav;specification-version="0.1.3.SNAPSHOT-r3543",
- org.argeo.server.jcr.mvc;specification-version="0.1.3.SNAPSHOT-r3478",
- org.argeo.server.json;specification-version="0.1.3.SNAPSHOT-r3371",
+ org.argeo.server.jackrabbit.webdav,
+ org.argeo.server.jcr.mvc,
+ org.argeo.server.json,
  org.argeo.server.mvc,
  org.argeo.slc.build,
  org.argeo.slc.core.attachment,
@@ -26,8 +26,8 @@ Import-Package: javax.jcr;specification-version="1.0.0",
  org.argeo.slc.msg.event,
  org.argeo.slc.runtime,
  org.argeo.slc.services,
- org.argeo.slc.web.ajaxplorer.file;specification-version="0.13.0.SNAPSHOT-r3788",
- org.argeo.slc.web.ajaxplorer.mvc;specification-version="0.13.0.SNAPSHOT-r3788",
+ org.argeo.slc.web.ajaxplorer.file,
+ org.argeo.slc.web.ajaxplorer.mvc,
  org.argeo.slc.web.mvc,
  org.argeo.slc.web.mvc.controllers,
  org.argeo.slc.web.mvc.provisioning,
@@ -40,12 +40,12 @@ Import-Package: javax.jcr;specification-version="1.0.0",
  org.springframework.osgi.web.context.support,
  org.springframework.oxm,
  org.springframework.security,
- org.springframework.security.config;specification-version="2.0.4.A",
+ org.springframework.security.config,
  org.springframework.security.context,
  org.springframework.security.providers,
  org.springframework.security.ui,
  org.springframework.security.ui.webapp,
- org.springframework.security.userdetails;specification-version="2.0.4.A",
+ org.springframework.security.userdetails,
  org.springframework.security.userdetails.memory,
  org.springframework.transaction,
  org.springframework.web.context,
@@ -56,4 +56,4 @@ Import-Package: javax.jcr;specification-version="1.0.0",
  org.springframework.web.servlet.handler,
  org.springframework.web.servlet.mvc,
  org.springframework.web.servlet.mvc.annotation,
- org.springframework.web.servlet.view;specification-version="2.5.6.SEC01"
+ org.springframework.web.servlet.view
diff --git a/pom.xml b/pom.xml
index d252fa50a4ee8596bf46d19502c36d3caf94a44b..5bba9fa74fef688b4f51aa36dfb7c2dadd026355 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>0.2.2-SNAPSHOT</version>
+               <version>0.2.3-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.slc</groupId>
        <artifactId>argeo-slc</artifactId>
diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/obr/ObrWrapper.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/obr/ObrWrapper.java
new file mode 100644 (file)
index 0000000..dbb6e13
--- /dev/null
@@ -0,0 +1,5 @@
+package org.argeo.slc.repo.obr;
+
+public class ObrWrapper {
+
+}