Plugin is compatible to cdmlib trunk again

diff --git a/eclipse-plugin/.classpath b/eclipse-plugin/.classpath
index 414773749b7e2237da06c10c47e72f8545cacff4..ecda35e7902547a29728e2f59bce9f737d6d819e 100644 (file)
--- a/eclipse-plugin/.classpath
+++ b/eclipse-plugin/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry exported="true" kind="lib" path="spring-tx-3.0.0.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="spring-security-core-3.0.0.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="spring-security-core-3.0.0.RELEASE.jar" sourcepath="spring-security-core-3.0.0.RELEASEsrc.zip"/>
        <classpathentry exported="true" kind="lib" path="spring-expression-3.0.0.RELEASE.jar"/>
        <classpathentry exported="true" kind="lib" path="spring-beans-3.0.0.RELEASE.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
@@ -67,7 +67,6 @@
        <classpathentry exported="true" kind="lib" path="spring-2.5.6.jar" sourcepath="spring-2.5.6src.zip"/>
        <classpathentry exported="true" kind="lib" path="spring-agent-2.5.6.jar" sourcepath="spring-agent-2.5.6src.zip"/>
        <classpathentry exported="true" kind="lib" path="spring-modules-lucene-0.8a.jar" sourcepath="spring-modules-lucene-0.8asrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="spring-security-core-2.0.4.jar" sourcepath="spring-security-core-2.0.4src.zip"/>
        <classpathentry exported="true" kind="lib" path="spring-web-2.5.6.jar" sourcepath="spring-web-2.5.6src.zip"/>
        <classpathentry exported="true" kind="lib" path="spring-webmvc-2.5.6.jar" sourcepath="spring-webmvc-2.5.6src.zip"/>
        <classpathentry exported="true" kind="lib" path="wsdl4j-1.6.1.jar" sourcepath="wsdl4j-1.6.1src.zip"/>

diff --git a/eclipse-plugin/META-INF/MANIFEST.MF b/eclipse-plugin/META-INF/MANIFEST.MF
index 148608d13b4ca3edfa26df82ef840a5e4e2a2609..4610a6f1a35c7f6e8da05eeeba8f7df2098370bc 100644 (file)
--- a/eclipse-plugin/META-INF/MANIFEST.MF
+++ b/eclipse-plugin/META-INF/MANIFEST.MF
@@ -61,8 +61,10 @@ Bundle-ClassPath: activation-1.1.jar,
  slf4j-log4j12-1.5.2.jar,
  spring-2.5.6.jar,
  spring-agent-2.5.6.jar,
+ spring-beans-3.0.0.RELEASE.jar,
+ spring-expression-3.0.0.RELEASE.jar,
  spring-modules-lucene-0.8a.jar,
- spring-security-core-2.0.4.jar,
+ spring-security-core-3.0.0.RELEASE.jar,
  spring-web-2.5.6.jar,
  spring-webmvc-2.5.6.jar,
  wsdl4j-1.6.1.jar,
@@ -72,11 +74,8 @@ Bundle-ClassPath: activation-1.1.jar,
  commons-dbcp-1.2.2.jar,
  org.springframework.aop-3.0.0.RC1.jar,
  org.springframework.aspects-3.0.0.RC1.jar,
- spring-beans-3.0.0.RELEASE.jar,
- spring-security-core-3.0.0.RELEASE.jar,
  org.springframework.context-3.0.0.RC1.jar,
  org.springframework.core-3.0.0.RC1.jar,
- spring-expression-3.0.0.RELEASE.jar,
  org.springframework.jdbc-3.0.0.RC1.jar,
  org.springframework.orm-3.0.0.RC1.jar,
  org.springframework.test-3.0.0.RC1.jar,
@@ -557,376 +556,41 @@ Export-Package: eu.etaxonomy.cdm,
    org.hibernate.classic,
    org.hibernate.transaction,
    org.hibernate.engine",
- org.springframework.security;uses:="org.springframework.core,org.springframework.context.support",
- org.springframework.security.acl;uses:="org.springframework.security,org.springframework.beans.factory",
- org.springframework.security.acl.basic;uses:="org.springframework.security,org.springframework.security.acl,org.springframework.beans.factory",
- org.springframework.security.acl.basic.cache;uses:="net.sf.ehcache,org.springframework.beans.factory,org.springframework.security.acl.basic",
- org.springframework.security.acl.basic.jdbc;
-  uses:="org.springframework.jdbc.core.support,
-   org.springframework.jdbc.object,
-   javax.sql,
-   org.springframework.security.acl.basic",
- org.springframework.security.adapters;
-  uses:="org.springframework.security,
-   javax.servlet,
-   org.springframework.security.providers,
-   org.springframework.context,
-   org.springframework.beans.factory,
-   org.springframework.context.support",
- org.springframework.security.afterinvocation;
-  uses:="org.springframework.security,
-   org.springframework.security.acl,
-   org.apache.commons.logging,
-   org.springframework.context,
-   org.springframework.context.support,
-   org.springframework.beans.factory",
- org.springframework.security.authoritymapping;uses:="org.springframework.security,org.springframework.beans.factory",
- org.springframework.security.concurrent;
-  uses:="javax.servlet.http,
-   org.apache.commons.logging,
-   org.springframework.context,
-   org.springframework.context.support,
-   org.springframework.security,
-   org.springframework.security.ui.logout,
-   javax.servlet,
-   org.springframework.beans.factory,
-   org.springframework.security.ui",
- org.springframework.security.config;
-  uses:="org.springframework.ldap.core,
-   org.springframework.core,
-   org.w3c.dom,
-   org.apache.commons.logging,
-   org.springframework.context,
-   org.springframework.security.util,
-   org.springframework.security,
-   org.springframework.beans.factory.support,
-   org.apache.directory.server.configuration,
-   org.springframework.security.userdetails,
-   javax.servlet,
-   org.springframework.beans.factory.config,
-   org.springframework.beans.factory.xml,
-   org.springframework.security.providers,
-   org.springframework.aop.config,
-   org.springframework.beans,
-   org.springframework.security.providers.dao,
-   org.springframework.beans.factory",
- org.springframework.security.context;
-  uses:="org.springframework.security,
-   javax.servlet.http,
-   javax.servlet,
-   org.springframework.beans.factory,
-   org.springframework.security.ui",
- org.springframework.security.context.httpinvoker;uses:="org.springframework.remoting.httpinvoker",
- org.springframework.security.context.rmi;uses:="org.springframework.remoting.support,org.aopalliance.intercept",
- org.springframework.security.event.authentication;uses:="org.springframework.security,org.springframework.security.userdetails,org.springframework.context",
- org.springframework.security.event.authorization;uses:="org.springframework.security,org.springframework.context",
- org.springframework.security.intercept;
-  uses:="org.springframework.security,
-   org.apache.commons.logging,
-   org.springframework.context,
-   org.springframework.beans.factory,
-   org.springframework.context.support",
- org.springframework.security.intercept.method;
-  uses:="org.springframework.security,
-   org.springframework.beans.factory.config,
-   org.springframework.metadata,
-   org.springframework.security.intercept,
-   org.apache.commons.logging,
-   org.springframework.beans.factory,
-   org.aopalliance.intercept",
- org.springframework.security.intercept.method.aopalliance;
-  uses:="org.springframework.security.intercept,
-   org.springframework.security.intercept.method,
-   org.springframework.aop.support,
-   org.springframework.beans.factory,
-   org.aopalliance.aop,
-   org.aopalliance.intercept,
-   org.springframework.aop",
- org.springframework.security.intercept.method.aspectj;uses:="org.springframework.security.intercept,org.aspectj.lang,org.springframework.security.intercept.method",
- org.springframework.security.intercept.web;
-  uses:="javax.servlet.http,
-   org.springframework.security.intercept,
-   org.springframework.core,
-   org.apache.commons.logging,
-   org.springframework.context,
-   org.springframework.security.util,
-   org.springframework.security,
-   javax.servlet,
-   org.springframework.beans.factory",
- org.springframework.security.ldap;
-  uses:="org.springframework.security,
-   javax.naming,
-   javax.naming.directory,
-   org.springframework.ldap.core,
-   org.apache.commons.logging,
-   org.springframework.dao,
-   org.springframework.context,
-   org.springframework.context.support,
-   org.springframework.ldap.core.support",
- org.springframework.security.ldap.populator;
-  uses:="org.springframework.security,
-   org.springframework.security.userdetails,
-   org.springframework.ldap.core,
-   org.springframework.security.ldap",
- org.springframework.security.ldap.search;uses:="org.springframework.ldap.core,org.springframework.security.ldap,org.springframework.ldap.core.support",
- org.springframework.security.providers;
-  uses:="org.springframework.security,
-   org.springframework.security.concurrent,
-   org.springframework.context,
-   org.springframework.beans.factory,
-   org.springframework.context.support",
- org.springframework.security.providers.anonymous;
-  uses:="org.springframework.security,
-   javax.servlet.http,
-   javax.servlet,
-   org.springframework.security.providers,
-   org.springframework.security.userdetails.memory,
-   org.springframework.context,
-   org.springframework.beans.factory,
-   org.springframework.context.support,
-   org.springframework.security.ui",
- org.springframework.security.providers.dao;
-  uses:="org.springframework.security,
-   org.springframework.security.userdetails,
-   org.springframework.security.providers,
-   org.springframework.context,
-   org.springframework.beans.factory,
-   org.springframework.context.support,
-   org.springframework.security.providers.encoding",
- org.springframework.security.providers.dao.cache;
-  uses:="org.springframework.security.userdetails,
-   net.sf.ehcache,
-   org.springframework.security.providers.dao,
-   org.springframework.beans.factory",
- org.springframework.security.providers.dao.salt;uses:="org.springframework.security.userdetails,org.springframework.security.providers.dao,org.springframework.beans.factory",
- org.springframework.security.providers.encoding,
- org.springframework.security.providers.jaas;
-  uses:="javax.security.auth.login,
-   org.springframework.security.ui.session,
-   org.apache.commons.logging,
-   org.springframework.context,
-   org.springframework.security,
-   javax.security.auth.spi,
-   org.springframework.core.io,
-   org.springframework.security.providers,
-   javax.security.auth,
-   org.springframework.beans.factory,
-   javax.security.auth.callback",
- org.springframework.security.providers.jaas.event;uses:="org.springframework.security,org.springframework.context",
- org.springframework.security.providers.ldap;
-  uses:="org.springframework.security,
-   org.springframework.security.userdetails.ldap,
-   org.springframework.security.userdetails,
-   org.springframework.ldap.core,
-   org.springframework.security.providers,
-   org.springframework.context.support,
-   org.springframework.security.ldap",
- org.springframework.security.providers.ldap.authenticator;
-  uses:="org.springframework.security,
-   org.springframework.security.providers.ldap,
-   org.springframework.ldap.core,
-   org.springframework.context,
-   org.springframework.beans.factory,
-   org.springframework.context.support,
-   org.springframework.security.ldap,
-   org.springframework.security.providers.encoding,
-   org.springframework.ldap.core.support",
- org.springframework.security.providers.preauth;
-  uses:="org.springframework.security,
-   org.springframework.security.userdetails,
-   org.springframework.core,
-   org.springframework.security.providers,
-   org.springframework.beans.factory",
- org.springframework.security.providers.rcp;uses:="org.springframework.security,org.springframework.security.providers,org.springframework.beans.factory",
- org.springframework.security.providers.rememberme;
-  uses:="org.springframework.security,
-   org.springframework.security.providers,
-   org.springframework.context,
-   org.springframework.beans.factory,
-   org.springframework.context.support",
- org.springframework.security.providers.x509;
-  uses:="org.springframework.security,
-   org.springframework.security.userdetails,
-   org.springframework.security.providers,
-   org.springframework.context,
-   org.springframework.beans.factory,
-   org.springframework.context.support",
- org.springframework.security.providers.x509.cache;
-  uses:="org.springframework.security.userdetails,
-   net.sf.ehcache,
-   org.springframework.security.providers.x509,
-   org.springframework.beans.factory",
- org.springframework.security.providers.x509.populator;
-  uses:="org.springframework.security.userdetails,
-   org.springframework.security.providers.x509,
-   org.springframework.context,
-   org.springframework.beans.factory,
-   org.springframework.context.support",
- org.springframework.security.runas;
-  uses:="org.springframework.security,
-   org.springframework.security.providers,
-   org.springframework.context,
-   org.springframework.beans.factory,
-   org.springframework.context.support",
- org.springframework.security.securechannel;
-  uses:="org.springframework.security,
-   javax.servlet.http,
-   javax.servlet,
-   org.springframework.security.intercept.web,
-   org.springframework.beans.factory,
-   org.springframework.security.ui,
-   org.springframework.security.util",
- org.springframework.security.token;uses:="org.springframework.core.io,org.springframework.beans.factory",
- org.springframework.security.ui;
-  uses:="javax.servlet.http,
-   org.springframework.security.ui.rememberme,
-   org.springframework.core,
-   org.springframework.security.concurrent,
-   org.apache.commons.logging,
-   org.springframework.context,
-   org.springframework.context.support,
-   org.springframework.security.util,
-   org.springframework.security,
-   org.springframework.security.ui.savedrequest,
-   javax.servlet,
-   org.springframework.beans.factory",
- org.springframework.security.ui.basicauth;
-  uses:="org.springframework.security,
-   javax.servlet.http,
-   javax.servlet,
-   org.springframework.security.ui.rememberme,
-   org.springframework.beans.factory,
-   org.springframework.security.ui",
- org.springframework.security.ui.digestauth;
-  uses:="org.springframework.security,
-   org.springframework.security.userdetails,
-   javax.servlet,
-   org.springframework.core,
-   org.springframework.context,
-   org.springframework.security.providers.dao,
-   org.springframework.beans.factory,
-   org.springframework.context.support,
-   org.springframework.security.ui",
- org.springframework.security.ui.logout;
-  uses:="org.springframework.security,
-   javax.servlet.http,
-   javax.servlet,
-   org.springframework.security.ui",
- org.springframework.security.ui.preauth;
-  uses:="org.springframework.security,
-   javax.servlet.http,
-   javax.servlet,
-   org.springframework.core,
-   org.springframework.context,
-   org.springframework.beans.factory,
-   org.springframework.security.ui",
- org.springframework.security.ui.preauth.header;uses:="javax.servlet.http,org.springframework.security.ui.preauth",
- org.springframework.security.ui.preauth.j2ee;
-  uses:="javax.servlet.http,
-   org.springframework.security.authoritymapping,
-   org.springframework.security.ui.preauth,
-   org.apache.commons.logging,
-   org.springframework.security.ui",
- org.springframework.security.ui.preauth.websphere;
-  uses:="org.springframework.security,
-   javax.servlet.http,
-   org.springframework.security.authoritymapping,
-   org.springframework.security.ui.preauth,
-   org.springframework.beans.factory,
-   org.aopalliance.intercept,
-   org.springframework.security.ui",
- org.springframework.security.ui.preauth.x509;
-  uses:="javax.servlet.http,
-   org.springframework.security.ui.preauth,
-   org.apache.commons.logging,
-   org.springframework.context,
-   org.springframework.context.support",
- org.springframework.security.ui.rememberme;
-  uses:="javax.servlet.http,
-   org.apache.commons.logging,
-   org.springframework.context,
-   org.springframework.jdbc.core.support,
-   org.springframework.context.support,
-   javax.sql,
-   org.springframework.security,
-   org.springframework.security.ui.logout,
-   org.springframework.security.userdetails,
-   javax.servlet,
-   org.springframework.jdbc.object,
-   org.springframework.beans.factory,
-   org.springframework.security.ui",
- org.springframework.security.ui.savedrequest;uses:="javax.servlet.http,org.apache.commons.logging,org.springframework.security.util",
- org.springframework.security.ui.session;uses:="javax.servlet.http,javax.servlet,org.springframework.context",
- org.springframework.security.ui.switchuser;
-  uses:="org.springframework.security,
-   javax.servlet.http,
-   org.springframework.security.userdetails,
-   javax.servlet,
-   org.springframework.context,
-   org.springframework.beans.factory,
-   org.springframework.context.support,
-   org.springframework.security.ui",
- org.springframework.security.ui.webapp;
-  uses:="org.springframework.security,
-   javax.servlet.http,
-   javax.servlet,
-   org.springframework.security.providers,
-   org.springframework.beans.factory,
-   org.springframework.security.util,
-   org.springframework.security.ui",
- org.springframework.security.ui.x509;
-  uses:="org.springframework.security,
-   javax.servlet.http,
-   javax.servlet,
-   org.springframework.context,
-   org.springframework.beans.factory,
-   org.springframework.security.ui",
- org.springframework.security.userdetails;uses:="org.springframework.security,org.springframework.beans.factory",
- org.springframework.security.userdetails.checker;uses:="org.springframework.security.userdetails,org.springframework.context.support",
- org.springframework.security.userdetails.hierarchicalroles;uses:="org.springframework.security,org.springframework.security.userdetails",
- org.springframework.security.userdetails.jdbc;
-  uses:="org.springframework.security,
-   org.springframework.security.userdetails,
-   org.apache.commons.logging,
-   org.springframework.jdbc.core,
-   org.springframework.security.providers.dao,
-   org.springframework.jdbc.core.support,
-   org.springframework.context.support",
- org.springframework.security.userdetails.ldap;
-  uses:="org.springframework.security,
-   org.springframework.security.userdetails,
-   javax.naming,
-   javax.naming.directory,
-   org.springframework.ldap.core,
-   org.springframework.security.ldap",
- org.springframework.security.userdetails.memory;uses:="org.springframework.security,org.springframework.security.userdetails,org.springframework.beans.factory",
- org.springframework.security.util;
-  uses:="javax.servlet.http,
-   org.springframework.security.concurrent,
-   org.apache.commons.logging,
-   org.springframework.context,
-   org.springframework.context.support,
-   org.aopalliance.intercept,
-   org.springframework.security,
-   org.springframework.security.ui.savedrequest,
-   javax.servlet,
-   org.springframework.core.io,
-   org.springframework.security.intercept.web,
-   org.springframework.beans.factory",
- org.springframework.security.vote;
-  uses:="org.springframework.security.userdetails.hierarchicalroles,
-   org.springframework.security,
-   org.springframework.security.acl,
-   org.springframework.context,
-   org.springframework.beans.factory,
-   org.springframework.context.support",
- org.springframework.security.wrapper;
-  uses:="javax.servlet.http,
-   org.springframework.security.ui.savedrequest,
-   javax.servlet,
-   org.apache.commons.logging,
-   org.springframework.security.ui,
-   org.springframework.security.util",
+ org.springframework.security.access,
+ org.springframework.security.access.annotation,
+ org.springframework.security.access.event,
+ org.springframework.security.access.expression,
+ org.springframework.security.access.expression.method,
+ org.springframework.security.access.hierarchicalroles,
+ org.springframework.security.access.intercept,
+ org.springframework.security.access.intercept.aopalliance,
+ org.springframework.security.access.intercept.aspectj,
+ org.springframework.security.access.method,
+ org.springframework.security.access.prepost,
+ org.springframework.security.access.vote,
+ org.springframework.security.authentication,
+ org.springframework.security.authentication.dao,
+ org.springframework.security.authentication.encoding,
+ org.springframework.security.authentication.event,
+ org.springframework.security.authentication.jaas,
+ org.springframework.security.authentication.jaas.event,
+ org.springframework.security.authentication.rcp,
+ org.springframework.security.core,
+ org.springframework.security.core.authority,
+ org.springframework.security.core.authority.mapping,
+ org.springframework.security.core.codec,
+ org.springframework.security.core.context,
+ org.springframework.security.core.session,
+ org.springframework.security.core.token,
+ org.springframework.security.core.userdetails,
+ org.springframework.security.core.userdetails.cache,
+ org.springframework.security.core.userdetails.jdbc,
+ org.springframework.security.core.userdetails.memory,
+ org.springframework.security.provisioning,
+ org.springframework.security.remoting.dns,
+ org.springframework.security.remoting.httpinvoker,
+ org.springframework.security.remoting.rmi,
+ org.springframework.security.util,
  org.springframework.transaction;uses:="org.springframework.core",
  org.springframework.transaction.annotation;uses:="javax.ejb,org.springframework.transaction.interceptor",
  org.springframework.transaction.config;

diff --git a/eclipse-plugin/build.properties b/eclipse-plugin/build.properties
index 951a858eb88080ac1fe506d9d52253fade9c2dc9..e596ceb3df73f55f10d9639842fec8b13b9697a1 100644 (file)
--- a/eclipse-plugin/build.properties
+++ b/eclipse-plugin/build.properties
@@ -114,7 +114,6 @@ src.includes = spring-context-support-2.5src.zip,\
                spring-2.5.6src.zip,\\r
                spring-agent-2.5.6src.zip,\\r
                spring-modules-lucene-0.8asrc.zip,\\r
-               spring-security-core-2.0.4src.zip,\\r
                spring-web-2.5.6src.zip,\\r
                spring-webmvc-2.5.6src.zip,\\r
                unitils-1.0src.zip,\\r