Add spring oauth2 dependency

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index 0b0bd589a2f2dfbfb1e449d248e2b641a3928623..87625512d4af3808d0c8f6153de95b7513ff12fd 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>

+       <classpathentry exported="true" kind="lib" path="lib/spring-security-oauth2-2.0.11.RELEASE.jar"/>

        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src/main/java"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src/main/java"/>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 59335dd779c8ef55c63930647ae869497b9cdb8a..caa7a21ee7748ce027e306a1e703d600fdeb4a45 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -165,6 +165,7 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.remote.json.processor.value,
  eu.etaxonomy.cdm.remote.json.util,
  eu.etaxonomy.cdm.remote.l10n,
  eu.etaxonomy.cdm.remote.json.processor.value,
  eu.etaxonomy.cdm.remote.json.util,
  eu.etaxonomy.cdm.remote.l10n,

+ eu.etaxonomy.cdm.remote.oauth2,

  eu.etaxonomy.cdm.remote.service,
  eu.etaxonomy.cdm.remote.view,
  eu.etaxonomy.cdm.remote.view.oaipmh,
  eu.etaxonomy.cdm.remote.service,
  eu.etaxonomy.cdm.remote.view,
  eu.etaxonomy.cdm.remote.view.oaipmh,


@@ -421,6 +422,46 @@ Export-Package: com.google.api,
  org.springframework.security.core,
  org.springframework.security.core.context,
  org.springframework.security.core.userdetails,
  org.springframework.security.core,
  org.springframework.security.core.context,
  org.springframework.security.core.userdetails,

+ org.springframework.security.oauth2.client,
+ org.springframework.security.oauth2.client.filter,
+ org.springframework.security.oauth2.client.filter.state,
+ org.springframework.security.oauth2.client.http,
+ org.springframework.security.oauth2.client.resource,
+ org.springframework.security.oauth2.client.test,
+ org.springframework.security.oauth2.client.token,
+ org.springframework.security.oauth2.client.token.auth,
+ org.springframework.security.oauth2.client.token.grant.client,
+ org.springframework.security.oauth2.client.token.grant.code,
+ org.springframework.security.oauth2.client.token.grant.implicit,
+ org.springframework.security.oauth2.client.token.grant.password,
+ org.springframework.security.oauth2.client.token.grant.redirect,
+ org.springframework.security.oauth2.common,
+ org.springframework.security.oauth2.common.exceptions,
+ org.springframework.security.oauth2.common.util,
+ org.springframework.security.oauth2.config.annotation.builders,
+ org.springframework.security.oauth2.config.annotation.configuration,
+ org.springframework.security.oauth2.config.annotation.configurers,
+ org.springframework.security.oauth2.config.annotation.web.configuration,
+ org.springframework.security.oauth2.config.annotation.web.configurers,
+ org.springframework.security.oauth2.config.xml,
+ org.springframework.security.oauth2.http.converter,
+ org.springframework.security.oauth2.http.converter.jaxb,
+ org.springframework.security.oauth2.provider,
+ org.springframework.security.oauth2.provider.approval,
+ org.springframework.security.oauth2.provider.authentication,
+ org.springframework.security.oauth2.provider.client,
+ org.springframework.security.oauth2.provider.code,
+ org.springframework.security.oauth2.provider.endpoint,
+ org.springframework.security.oauth2.provider.error,
+ org.springframework.security.oauth2.provider.expression,
+ org.springframework.security.oauth2.provider.implicit,
+ org.springframework.security.oauth2.provider.password,
+ org.springframework.security.oauth2.provider.refresh,
+ org.springframework.security.oauth2.provider.request,
+ org.springframework.security.oauth2.provider.token,
+ org.springframework.security.oauth2.provider.token.store,
+ org.springframework.security.oauth2.provider.token.store.redis,
+ org.springframework.security.oauth2.provider.vote,

  org.springframework.security.provisioning,
  org.springframework.stereotype,
  org.springframework.transaction;uses:="org.springframework.core",
  org.springframework.security.provisioning,
  org.springframework.stereotype,
  org.springframework.transaction;uses:="org.springframework.core",


@@ -715,5 +756,6 @@ Bundle-ClassPath: .,
  lib/xpp3-1.1.4c.jar,
  lib/xsom-20140925.jar,
  lib/xstream-1.4.8.jar,
  lib/xpp3-1.1.4c.jar,
  lib/xsom-20140925.jar,
  lib/xstream-1.4.8.jar,

- lib/yjp-controller-api-redist-9.0.8.jar
+ lib/yjp-controller-api-redist-9.0.8.jar,
+ lib/spring-security-oauth2-2.0.11.RELEASE.jar

 Import-Package: eu.etaxonomy.cdm.api.application
 Import-Package: eu.etaxonomy.cdm.api.application

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index eea0ce8c97856a183a596863b6f95efac272ede5..ff0cf1b253d671ccb2bbc0b3fbb610ff0197f78b 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -242,7 +242,8 @@ bin.includes = META-INF/,\
                lib/xpp3-1.1.4c.jar,\
                lib/xsom-20140925.jar,\
                lib/xstream-1.4.8.jar,\
                lib/xpp3-1.1.4c.jar,\
                lib/xsom-20140925.jar,\
                lib/xstream-1.4.8.jar,\

-               lib/yjp-controller-api-redist-9.0.8.jar
+               lib/yjp-controller-api-redist-9.0.8.jar,\
+               lib/spring-security-oauth2-2.0.11.RELEASE.jar

 
 jars.compile.order = .
 output.. = bin/
 
 jars.compile.order = .
 output.. = bin/

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-oauth2-2.0.11.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-oauth2-2.0.11.RELEASE.jar
new file mode 100644 (file)
index 0000000..a0a9a4e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-oauth2-2.0.11.RELEASE.jar differ