From 5dfb5e0f10c9edebe362f09ca476c6bc3a37cbae Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 14 Feb 2011 11:28:22 +0000 Subject: [PATCH] Fix manifests generation git-svn-id: https://svn.argeo.org/commons/trunk@4137 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- eclipse/plugins/org.argeo.eclipse.ui/pom.xml | 2 +- osgi/runtime/org.argeo.osgi.boot/.classpath | 2 +- osgi/runtime/org.argeo.osgi.boot/.project | 4 ++-- osgi/runtime/org.argeo.osgi.boot/build.properties | 1 + pom.xml | 7 ++++--- sandbox/runtime/org.argeo.sandbox.jackrabbit/.classpath | 2 +- sandbox/runtime/org.argeo.sandbox.jackrabbit/.project | 4 ++-- .../eclipse/plugins/org.argeo.security.equinox/.classpath | 1 + .../plugins/org.argeo.security.equinox/build.properties | 4 ++-- .../eclipse/plugins/org.argeo.security.equinox/pom.xml | 3 ++- .../java/org/argeo/security/equinox/EquinoxSecurity.java | 2 +- .../resources/org/argeo/security/equinox}/jaas_default.txt | 0 12 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 osgi/runtime/org.argeo.osgi.boot/build.properties rename security/eclipse/plugins/org.argeo.security.equinox/{jaas => src/main/resources/org/argeo/security/equinox}/jaas_default.txt (100%) diff --git a/eclipse/plugins/org.argeo.eclipse.ui/pom.xml b/eclipse/plugins/org.argeo.eclipse.ui/pom.xml index 6192d795c..acbba4ea4 100644 --- a/eclipse/plugins/org.argeo.eclipse.ui/pom.xml +++ b/eclipse/plugins/org.argeo.eclipse.ui/pom.xml @@ -31,7 +31,7 @@ lazy org.argeo.eclipse.ui.ArgeoUiPlugin - org.eclipse.ui;resolution:=optional,org.eclipse.rap.ui;resolution:=optional,org.eclipse.core.runtime + org.eclipse.ui;resolution:=optional,org.eclipse.rap.ui;resolution:=optional,org.eclipse.core.runtime,org.springframework.osgi.extender 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 05a2e8f84..2f7e966c4 100644 --- a/osgi/runtime/org.argeo.osgi.boot/.classpath +++ b/osgi/runtime/org.argeo.osgi.boot/.classpath @@ -2,7 +2,7 @@ - + diff --git a/osgi/runtime/org.argeo.osgi.boot/.project b/osgi/runtime/org.argeo.osgi.boot/.project index 16a9c13f0..e145e9691 100644 --- a/osgi/runtime/org.argeo.osgi.boot/.project +++ b/osgi/runtime/org.argeo.osgi.boot/.project @@ -11,13 +11,13 @@ - org.maven.ide.eclipse.maven2Builder + org.eclipse.pde.ManifestBuilder org.eclipse.jdt.core.javanature - org.maven.ide.eclipse.maven2Nature + org.eclipse.pde.PluginNature diff --git a/osgi/runtime/org.argeo.osgi.boot/build.properties b/osgi/runtime/org.argeo.osgi.boot/build.properties new file mode 100644 index 000000000..d72c9c2e6 --- /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 10c625d0f..b928bd34e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.argeo @@ -122,7 +123,7 @@ limitations under the License. 2.3.1 - target/classes/META-INF/MANIFEST.MF + META-INF/MANIFEST.MF @@ -132,7 +133,7 @@ limitations under the License. ${version.maven-bundle-plugin} true - target/classes/META-INF + META-INF ${project.version}-r${buildNumber} ${project.artifactId} diff --git a/sandbox/runtime/org.argeo.sandbox.jackrabbit/.classpath b/sandbox/runtime/org.argeo.sandbox.jackrabbit/.classpath index 70a3874cc..12a0b5024 100644 --- a/sandbox/runtime/org.argeo.sandbox.jackrabbit/.classpath +++ b/sandbox/runtime/org.argeo.sandbox.jackrabbit/.classpath @@ -3,6 +3,6 @@ - + diff --git a/sandbox/runtime/org.argeo.sandbox.jackrabbit/.project b/sandbox/runtime/org.argeo.sandbox.jackrabbit/.project index ff231666e..c4fb1ac2a 100644 --- a/sandbox/runtime/org.argeo.sandbox.jackrabbit/.project +++ b/sandbox/runtime/org.argeo.sandbox.jackrabbit/.project @@ -11,13 +11,13 @@ - org.maven.ide.eclipse.maven2Builder + org.eclipse.pde.ManifestBuilder - org.maven.ide.eclipse.maven2Nature + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature diff --git a/security/eclipse/plugins/org.argeo.security.equinox/.classpath b/security/eclipse/plugins/org.argeo.security.equinox/.classpath index 92f19d2ff..d3d5c8095 100644 --- a/security/eclipse/plugins/org.argeo.security.equinox/.classpath +++ b/security/eclipse/plugins/org.argeo.security.equinox/.classpath @@ -3,5 +3,6 @@ + diff --git a/security/eclipse/plugins/org.argeo.security.equinox/build.properties b/security/eclipse/plugins/org.argeo.security.equinox/build.properties index 87a7fc250..5e565ebc8 100644 --- 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/pom.xml b/security/eclipse/plugins/org.argeo.security.equinox/pom.xml index b1b43c7f0..9f662d802 100644 --- a/security/eclipse/plugins/org.argeo.security.equinox/pom.xml +++ b/security/eclipse/plugins/org.argeo.security.equinox/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.commons.security 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 61c5e796e..00f9faa18 100644 --- 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/jaas/jaas_default.txt b/security/eclipse/plugins/org.argeo.security.equinox/src/main/resources/org/argeo/security/equinox/jaas_default.txt similarity index 100% rename from security/eclipse/plugins/org.argeo.security.equinox/jaas/jaas_default.txt rename to security/eclipse/plugins/org.argeo.security.equinox/src/main/resources/org/argeo/security/equinox/jaas_default.txt -- 2.30.2