Fix manifests generation

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

diff --git a/eclipse/plugins/org.argeo.eclipse.ui/pom.xml b/eclipse/plugins/org.argeo.eclipse.ui/pom.xml
index 6192d795cfcbd370a044eb6a2f027edc53a796be..acbba4ea4e07891298551ee9bcec661d53dc0542 100644 (file)
--- a/eclipse/plugins/org.argeo.eclipse.ui/pom.xml
+++ b/eclipse/plugins/org.argeo.eclipse.ui/pom.xml
@@ -31,7 +31,7 @@
                                        <instructions>
                                                <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
                                                <Bundle-Activator>org.argeo.eclipse.ui.ArgeoUiPlugin</Bundle-Activator>
-                                               <Require-Bundle>org.eclipse.ui;resolution:=optional,org.eclipse.rap.ui;resolution:=optional,org.eclipse.core.runtime</Require-Bundle>
+                                               <Require-Bundle>org.eclipse.ui;resolution:=optional,org.eclipse.rap.ui;resolution:=optional,org.eclipse.core.runtime,org.springframework.osgi.extender</Require-Bundle>
                                                <Import-Package>
                                                        org.springframework.beans.factory,
                                                        org.springframework.core.io.support,

diff --git a/osgi/runtime/org.argeo.osgi.boot/.classpath b/osgi/runtime/org.argeo.osgi.boot/.classpath
index 05a2e8f84a894dcd6505c19ac9dcfc5d67f53753..2f7e966c4310f494b3b36d957687d8073cc18956 100644 (file)
--- a/osgi/runtime/org.argeo.osgi.boot/.classpath
+++ b/osgi/runtime/org.argeo.osgi.boot/.classpath
@@ -2,7 +2,7 @@
 <classpath>
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
        <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/osgi/runtime/org.argeo.osgi.boot/.project b/osgi/runtime/org.argeo.osgi.boot/.project
index 16a9c13f03a8453ab698c2369c410921fa095908..e145e9691c74889a25b66f09b2ac1f0a41da93e8 100644 (file)
--- a/osgi/runtime/org.argeo.osgi.boot/.project
+++ b/osgi/runtime/org.argeo.osgi.boot/.project
@@ -11,13 +11,13 @@
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>

diff --git a/osgi/runtime/org.argeo.osgi.boot/build.properties b/osgi/runtime/org.argeo.osgi.boot/build.properties
new file mode 100644 (file)
index 0000000..d72c9c2
--- /dev/null
+++ b/osgi/runtime/org.argeo.osgi.boot/build.properties
@@ -0,0 +1 @@
+additional.bundles = com.springsource.junit

diff --git a/pom.xml b/pom.xml
index 10c625d0f86eff80253f3bac879d5c9b35a1f027..b928bd34e06632631032a16a204f45000e1cb5b6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo</groupId>
@@ -122,7 +123,7 @@ limitations under the License.
                                        <version>2.3.1</version>
                                        <configuration>
                                                <archive>
-                                                       <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+                                                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
                                                </archive>
                                        </configuration>
                                </plugin>
@@ -132,7 +133,7 @@ limitations under the License.
                                        <version>${version.maven-bundle-plugin}</version>
                                        <extensions>true</extensions>
                                        <configuration>
-                                               <manifestLocation>target/classes/META-INF</manifestLocation>
+                                               <manifestLocation>META-INF</manifestLocation>
                                                <instructions>
                                                        <Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
                                                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>

diff --git a/sandbox/runtime/org.argeo.sandbox.jackrabbit/.classpath b/sandbox/runtime/org.argeo.sandbox.jackrabbit/.classpath
index 70a3874cccba06af186a341740f76c43d9deecee..12a0b50244995deb51d28a1042c6d8be1dc57c57 100644 (file)
--- a/sandbox/runtime/org.argeo.sandbox.jackrabbit/.classpath
+++ b/sandbox/runtime/org.argeo.sandbox.jackrabbit/.classpath
@@ -3,6 +3,6 @@
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
        <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/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="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

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

diff --git a/security/eclipse/plugins/org.argeo.security.equinox/.classpath b/security/eclipse/plugins/org.argeo.security.equinox/.classpath
index 92f19d2ff95b83a87f5210157582c70bb070ed48..d3d5c80958677f1f8de5b580c289b3baf7c5452c 100644 (file)
--- a/security/eclipse/plugins/org.argeo.security.equinox/.classpath
+++ b/security/eclipse/plugins/org.argeo.security.equinox/.classpath
@@ -3,5 +3,6 @@
        <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.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src/main/java"/>
+       <classpathentry kind="src" path="src/main/resources"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/security/eclipse/plugins/org.argeo.security.equinox/build.properties b/security/eclipse/plugins/org.argeo.security.equinox/build.properties
index 87a7fc250c8178f386f64c66cabd0090137d2db4..5e565ebc8ae2ae2677e24bd0e36657929d269ef5 100644 (file)
--- a/security/eclipse/plugins/org.argeo.security.equinox/build.properties
+++ b/security/eclipse/plugins/org.argeo.security.equinox/build.properties
@@ -1,5 +1,5 @@
 bin.includes = META-INF/,\
-               jaas/,\
                plugin.xml
-source.. = src/main/java/
+source.. = src/main/java/,\
+           src/main/resources/
 output.. = target/classes/

diff --git a/security/eclipse/plugins/org.argeo.security.equinox/jaas/jaas_default.txt b/security/eclipse/plugins/org.argeo.security.equinox/jaas/jaas_default.txt
deleted file mode 100644 (file)
index b6cbaa6..0000000
--- a/security/eclipse/plugins/org.argeo.security.equinox/jaas/jaas_default.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-UNIX {
-    org.eclipse.equinox.security.auth.module.ExtensionLoginModule sufficient
-        extensionId="org.argeo.security.equinox.unixLoginModule";
-};
-
-SPRING {
-    org.eclipse.equinox.security.auth.module.ExtensionLoginModule sufficient
-        extensionId="org.argeo.security.equinox.springLoginModule";
-};
-
-SPRING_SECURITY_CONTEXT {
-    org.eclipse.equinox.security.auth.module.ExtensionLoginModule sufficient
-        extensionId="org.argeo.security.equinox.springSecurityContextLoginModule";
-};
\ No newline at end of file

diff --git a/security/eclipse/plugins/org.argeo.security.equinox/pom.xml b/security/eclipse/plugins/org.argeo.security.equinox/pom.xml
index b1b43c7f0a99e74385dda835a1c91f524eae47bb..9f662d802333b697bebf72f5757a9c95b32ab1ac 100644 (file)
--- a/security/eclipse/plugins/org.argeo.security.equinox/pom.xml
+++ b/security/eclipse/plugins/org.argeo.security.equinox/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/eclipse/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/EquinoxSecurity.java b/security/eclipse/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/EquinoxSecurity.java
index 61c5e796e03693930a1f9890ff29efd0c0d7755f..00f9faa18efa6601753c2d02981b4fc39231857d 100644 (file)
--- a/security/eclipse/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/EquinoxSecurity.java
+++ b/security/eclipse/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/EquinoxSecurity.java
@@ -9,7 +9,7 @@ import org.osgi.framework.BundleContext;
 
 public class EquinoxSecurity implements BundleActivator {
        public final static String CONTEXT_SPRING = "SPRING";
-       private static final String JAAS_CONFIG_FILE = "jaas/jaas_default.txt";
+       private static final String JAAS_CONFIG_FILE = "org/argeo/security/equinox/jaas_default.txt";
 
        private static ILoginContext loginContext = null;
 

diff --git a/security/eclipse/plugins/org.argeo.security.equinox/src/main/resources/org/argeo/security/equinox/jaas_default.txt b/security/eclipse/plugins/org.argeo.security.equinox/src/main/resources/org/argeo/security/equinox/jaas_default.txt
new file mode 100644 (file)
index 0000000..b6cbaa6
--- /dev/null
+++ b/security/eclipse/plugins/org.argeo.security.equinox/src/main/resources/org/argeo/security/equinox/jaas_default.txt
@@ -0,0 +1,14 @@
+UNIX {
+    org.eclipse.equinox.security.auth.module.ExtensionLoginModule sufficient
+        extensionId="org.argeo.security.equinox.unixLoginModule";
+};
+
+SPRING {
+    org.eclipse.equinox.security.auth.module.ExtensionLoginModule sufficient
+        extensionId="org.argeo.security.equinox.springLoginModule";
+};
+
+SPRING_SECURITY_CONTEXT {
+    org.eclipse.equinox.security.auth.module.ExtensionLoginModule sufficient
+        extensionId="org.argeo.security.equinox.springSecurityContextLoginModule";
+};
\ No newline at end of file