Sfoglia il codice sorgente

SEC-1743: Separate remoting from core into separate module.

Luke Taylor 14 anni fa
parent
commit
295ea27526
22 ha cambiato i file con 65 aggiunte e 5 eliminazioni
  1. 0 1
      core/core.gradle
  2. 0 1
      core/template.mf
  3. 28 0
      docs/manual/src/docbook/appendix-dependencies.xml
  4. 6 3
      docs/manual/src/docbook/introduction.xml
  5. 11 0
      remoting/remoting.gradle
  6. 0 0
      remoting/src/main/java/org/springframework/security/remoting/dns/DnsEntryNotFoundException.java
  7. 0 0
      remoting/src/main/java/org/springframework/security/remoting/dns/DnsLookupException.java
  8. 0 0
      remoting/src/main/java/org/springframework/security/remoting/dns/DnsResolver.java
  9. 0 0
      remoting/src/main/java/org/springframework/security/remoting/dns/InitialContextFactory.java
  10. 0 0
      remoting/src/main/java/org/springframework/security/remoting/dns/JndiDnsResolver.java
  11. 0 0
      remoting/src/main/java/org/springframework/security/remoting/dns/package-info.java
  12. 0 0
      remoting/src/main/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java
  13. 0 0
      remoting/src/main/java/org/springframework/security/remoting/httpinvoker/package-info.java
  14. 0 0
      remoting/src/main/java/org/springframework/security/remoting/package-info.java
  15. 0 0
      remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocation.java
  16. 0 0
      remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationFactory.java
  17. 0 0
      remoting/src/main/java/org/springframework/security/remoting/rmi/package-info.java
  18. 0 0
      remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTest.java
  19. 0 0
      remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java
  20. 0 0
      remoting/src/test/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationTests.java
  21. 19 0
      remoting/template.mf
  22. 1 0
      settings.gradle

+ 0 - 1
core/core.gradle

@@ -9,7 +9,6 @@ dependencies {
             "org.springframework:spring-expression:$springVersion",
             "org.springframework:spring-jdbc:$springVersion",
             "org.springframework:spring-tx:$springVersion",
-            "org.springframework:spring-web:$springVersion",
             "org.aspectj:aspectjrt:$aspectjVersion",
             'javax.annotation:jsr250-api:1.0'
 

+ 0 - 1
core/template.mf

@@ -17,7 +17,6 @@ Import-Template:
  org.springframework.context.*;version="${springRange}",
  org.springframework.core.*;version="${springRange}",
  org.springframework.expression.*;version="${springRange}";resolution:=optional,
- org.springframework.remoting.*;version="${springRange}";resolution:=optional,
  org.springframework.dao.*;version="${springRange}";resolution:=optional,
  org.springframework.jdbc.*;version="${springRange}";resolution:=optional,
  org.springframework.transaction.*;version="${springRange}";resolution:=optional,

+ 28 - 0
docs/manual/src/docbook/appendix-dependencies.xml

@@ -92,6 +92,34 @@
 
     </section>
 
+    <section>
+        <title><literal>spring-security-remoting</literal></title>
+        <para>This module is typically required in web applications which use the Servlet API.
+            <table xml:id="deps-remoting">
+                <title>Remoting Dependencies</title>
+                <tgroup cols="3" align="left">
+                    <colspec colnum="1" colname="col1" colwidth="2*"/>
+                    <colspec colnum="2" colname="col2" colwidth="1*"/>
+                    <colspec colnum="3" colname="col3" colwidth="3*"/>
+                    <thead>
+                        <row>
+                            <entry align="center">Dependency</entry>
+                            <entry align="center">Version</entry>
+                            <entry align="center">Description</entry>
+                        </row>
+                    </thead>
+                    <tbody>
+                        <row>
+                            <entry>spring-security-core</entry>
+                            <entry></entry>
+                            <entry></entry>
+                        </row>
+                    </tbody>
+                </tgroup>
+            </table>
+        </para>
+    </section>
+
     <section>
         <title><literal>spring-security-web</literal></title>
         <para>This module is typically required in web applications which use the Servlet API.

+ 6 - 3
docs/manual/src/docbook/introduction.xml

@@ -239,11 +239,14 @@
                     <listitem>
                         <para><literal>org.springframework.security.provisioning</literal></para>
                     </listitem>
-                    <listitem>
-                        <para><literal>org.springframework.security.remoting</literal></para>
-                    </listitem>
                     </itemizedlist></para>
             </section>
+            <section xml:id="spring-security-remoting">
+                <title>Remoting - <literal>spring-security-remoting.jar</literal></title>
+                <para>Provides intergration with Spring Remoting. You don't need this unless you are
+                    writing a remote client which uses Spring Remoting. The main package is
+                    <literal>org.springframework.security.remoting</literal>.</para>
+            </section>
             <section xml:id="spring-security-web">
                 <title>Web - <literal>spring-security-web.jar</literal></title>
                 <para>Contains filters and related web-security infrastructure code. Anything with a

+ 11 - 0
remoting/remoting.gradle

@@ -0,0 +1,11 @@
+// Remoting module build file
+
+dependencies {
+    compile project(':spring-security-core'),
+            'aopalliance:aopalliance:1.0',
+            "org.springframework:spring-beans:$springVersion",
+            "org.springframework:spring-context:$springVersion",
+            "org.springframework:spring-web:$springVersion"
+
+    testCompile project(':spring-security-core').sourceSets.test.classes
+}

+ 0 - 0
core/src/main/java/org/springframework/security/remoting/dns/DnsEntryNotFoundException.java → remoting/src/main/java/org/springframework/security/remoting/dns/DnsEntryNotFoundException.java


+ 0 - 0
core/src/main/java/org/springframework/security/remoting/dns/DnsLookupException.java → remoting/src/main/java/org/springframework/security/remoting/dns/DnsLookupException.java


+ 0 - 0
core/src/main/java/org/springframework/security/remoting/dns/DnsResolver.java → remoting/src/main/java/org/springframework/security/remoting/dns/DnsResolver.java


+ 0 - 0
core/src/main/java/org/springframework/security/remoting/dns/InitialContextFactory.java → remoting/src/main/java/org/springframework/security/remoting/dns/InitialContextFactory.java


+ 0 - 0
core/src/main/java/org/springframework/security/remoting/dns/JndiDnsResolver.java → remoting/src/main/java/org/springframework/security/remoting/dns/JndiDnsResolver.java


+ 0 - 0
core/src/main/java/org/springframework/security/remoting/dns/package-info.java → remoting/src/main/java/org/springframework/security/remoting/dns/package-info.java


+ 0 - 0
core/src/main/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java → remoting/src/main/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java


+ 0 - 0
core/src/main/java/org/springframework/security/remoting/httpinvoker/package-info.java → remoting/src/main/java/org/springframework/security/remoting/httpinvoker/package-info.java


+ 0 - 0
core/src/main/java/org/springframework/security/remoting/package-info.java → remoting/src/main/java/org/springframework/security/remoting/package-info.java


+ 0 - 0
core/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocation.java → remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocation.java


+ 0 - 0
core/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationFactory.java → remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationFactory.java


+ 0 - 0
core/src/main/java/org/springframework/security/remoting/rmi/package-info.java → remoting/src/main/java/org/springframework/security/remoting/rmi/package-info.java


+ 0 - 0
core/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTest.java → remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTest.java


+ 0 - 0
core/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java → remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java


+ 0 - 0
core/src/test/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationTests.java → remoting/src/test/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationTests.java


+ 19 - 0
remoting/template.mf

@@ -0,0 +1,19 @@
+Implementation-Title: org.springframework.security.remoting
+Implementation-Version: ${version}
+Bundle-SymbolicName: org.springframework.security.remoting
+Bundle-Name: Spring Security Remoting
+Bundle-Vendor: SpringSource
+Bundle-Version: ${version}
+Bundle-ManifestVersion: 2
+Excluded-Imports:
+ javax.naming.*
+Ignored-Existing-Headers:
+ Import-Package,
+ Export-Package
+Import-Template:
+ org.aopalliance.*;version="${aopAllianceRange}",
+ org.apache.commons.logging.*;version="${cloggingRange}",
+ org.springframework.security.core.*;version="${secRange}",
+ org.springframework.security.crypto.*;version="${secRange}",
+ org.springframework.core.*;version="${springRange}",
+ org.springframework.remoting.*;version="${springRange}"

+ 1 - 0
settings.gradle

@@ -1,5 +1,6 @@
 def String[] modules = [
     'core',
+    'remoting',
     'web',
     'ldap',
     'acl',