Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-28 14:52:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEC-562: Repackaging core-tiger.

Browse Source
This commit is contained in:
Luke Taylor 2007-09-21 18:29:12 +00:00
parent 43cca63394
commit a122e6bb74
20 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core-tiger/pom.xml
View File

@ -1,11 +1,11 @@
<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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.acegisecurity</groupId> <groupId>org.springframework.security</groupId>
<artifactId>acegi-security-parent</artifactId> <artifactId>spring-security-parent</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>acegi-security-tiger</artifactId> <artifactId>spring-security-core-tiger</artifactId>
<name>Acegi Security System for Spring - Java 5 (Tiger)</name> <name>Acegi Security System for Spring - Java 5 (Tiger)</name>
<scm> <scm>
@ -16,8 +16,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.acegisecurity</groupId> <groupId>org.springframework.security</groupId>
<artifactId>acegi-security</artifactId> <artifactId>spring-security-core</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>

2
core-tiger/src/main/java/org/acegisecurity/annotation/Secured.java → core-tiger/src/main/java/org/springframework/security/annotation/Secured.java
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.annotation; package org.springframework.security.annotation;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;

12
core-tiger/src/main/java/org/acegisecurity/annotation/SecurityAnnotationAttributes.java → core-tiger/src/main/java/org/springframework/security/annotation/SecurityAnnotationAttributes.java
View File

@ -12,9 +12,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.annotation; package org.springframework.security.annotation;
import org.acegisecurity.SecurityConfig; import org.springframework.security.SecurityConfig;
import org.springframework.metadata.Attributes; import org.springframework.metadata.Attributes;
@ -36,10 +36,10 @@ import java.util.Set;
* <p>The <code>SecurityAnnotationAttributes</code> implementation can be used to configure a * <p>The <code>SecurityAnnotationAttributes</code> implementation can be used to configure a
* <code>MethodDefinitionAttributes</code> and <code>MethodSecurityInterceptor</code> bean definition (see below).</p> * <code>MethodDefinitionAttributes</code> and <code>MethodSecurityInterceptor</code> bean definition (see below).</p>
* <p>For example:<pre>&lt;bean id="attributes" * <p>For example:<pre>&lt;bean id="attributes"
* class="org.acegisecurity.annotation.SecurityAnnotationAttributes"/>&lt;bean id="objectDefinitionSource" * class="org.springframework.security.annotation.SecurityAnnotationAttributes"/>&lt;bean id="objectDefinitionSource"
* class="org.acegisecurity.intercept.method.MethodDefinitionAttributes"> &lt;property name="attributes"> * class="org.springframework.security.intercept.method.MethodDefinitionAttributes"> &lt;property name="attributes">
* &lt;ref local="attributes"/> &lt;/property>&lt;/bean>&lt;bean id="securityInterceptor" * &lt;ref local="attributes"/> &lt;/property>&lt;/bean>&lt;bean id="securityInterceptor"
* class="org.acegisecurity.intercept.method.aopalliance.MethodSecurityInterceptor"> . . . * class="org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor"> . . .
* &lt;property name="objectDefinitionSource"> &lt;ref local="objectDefinitionSource"/> &lt;/property> * &lt;property name="objectDefinitionSource"> &lt;ref local="objectDefinitionSource"/> &lt;/property>
* &lt;/bean></pre></p> * &lt;/bean></pre></p>
* <p>These security annotations are similiar to the Commons Attributes approach, however they are using Java 5 * <p>These security annotations are similiar to the Commons Attributes approach, however they are using Java 5
@ -50,7 +50,7 @@ import java.util.Set;
* @author Mark St.Godard * @author Mark St.Godard
* @version $Id$ * @version $Id$
* *
* @see org.acegisecurity.annotation.Secured * @see org.springframework.security.annotation.Secured
*/ */
public class SecurityAnnotationAttributes implements Attributes { public class SecurityAnnotationAttributes implements Attributes {
//~ Methods ======================================================================================================== //~ Methods ========================================================================================================

2
core-tiger/src/test/java/org/acegisecurity/annotation/BusinessService.java → core-tiger/src/test/java/org/springframework/security/annotation/BusinessService.java
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.annotation; package org.springframework.security.annotation;
/** /**
* DOCUMENT ME! * DOCUMENT ME!

2
core-tiger/src/test/java/org/acegisecurity/annotation/BusinessServiceImpl.java → core-tiger/src/test/java/org/springframework/security/annotation/BusinessServiceImpl.java
View File

@ -1,4 +1,4 @@
package org.acegisecurity.annotation; package org.springframework.security.annotation;
/** /**
* *

2
core-tiger/src/test/java/org/acegisecurity/annotation/Department.java → core-tiger/src/test/java/org/springframework/security/annotation/Department.java
View File

@ -1,4 +1,4 @@
package org.acegisecurity.annotation; package org.springframework.security.annotation;
/** /**
* *

2
core-tiger/src/test/java/org/acegisecurity/annotation/DepartmentService.java → core-tiger/src/test/java/org/springframework/security/annotation/DepartmentService.java
View File

@ -1,4 +1,4 @@
package org.acegisecurity.annotation; package org.springframework.security.annotation;
/** /**
* *

2
core-tiger/src/test/java/org/acegisecurity/annotation/DepartmentServiceImpl.java → core-tiger/src/test/java/org/springframework/security/annotation/DepartmentServiceImpl.java
View File

@ -1,4 +1,4 @@
package org.acegisecurity.annotation; package org.springframework.security.annotation;
/** /**
* @author Joe Scalise * @author Joe Scalise

2
core-tiger/src/test/java/org/acegisecurity/annotation/Entity.java → core-tiger/src/test/java/org/springframework/security/annotation/Entity.java
View File

@ -1,4 +1,4 @@
package org.acegisecurity.annotation; package org.springframework.security.annotation;
/** /**
* Class to act as a superclass for annotations testing. * Class to act as a superclass for annotations testing.

26
core-tiger/src/test/java/org/acegisecurity/annotation/MethodDefinitionSourceEditorTigerTests.java → core-tiger/src/test/java/org/springframework/security/annotation/MethodDefinitionSourceEditorTigerTests.java
View File

@ -13,23 +13,23 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.annotation; package org.springframework.security.annotation;
import java.lang.reflect.AccessibleObject; import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.acegisecurity.ConfigAttributeDefinition; import org.springframework.security.ConfigAttributeDefinition;
import org.acegisecurity.SecurityConfig; import org.springframework.security.SecurityConfig;
import org.acegisecurity.annotation.test.Entity; import org.springframework.security.annotation.test.Entity;
import org.acegisecurity.annotation.test.OrganisationService; import org.springframework.security.annotation.test.OrganisationService;
import org.acegisecurity.annotation.test.PersonService; import org.springframework.security.annotation.test.PersonService;
import org.acegisecurity.annotation.test.PersonServiceImpl; import org.springframework.security.annotation.test.PersonServiceImpl;
import org.acegisecurity.annotation.test.Service; import org.springframework.security.annotation.test.Service;
import org.acegisecurity.annotation.test.ServiceImpl; import org.springframework.security.annotation.test.ServiceImpl;
import org.acegisecurity.intercept.method.MethodDefinitionMap; import org.springframework.security.intercept.method.MethodDefinitionMap;
import org.acegisecurity.intercept.method.MethodDefinitionSourceEditor; import org.springframework.security.intercept.method.MethodDefinitionSourceEditor;
import org.aopalliance.intercept.MethodInvocation; import org.aopalliance.intercept.MethodInvocation;
@ -64,7 +64,7 @@ public class MethodDefinitionSourceEditorTigerTests extends TestCase {
throws Exception { throws Exception {
MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor(); MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
editor.setAsText( editor.setAsText(
"org.acegisecurity.annotation.test.Service.makeLower*=ROLE_FROM_INTERFACE\r\norg.acegisecurity.annotation.test.Service.makeUpper*=ROLE_FROM_INTERFACE\r\norg.acegisecurity.annotation.test.ServiceImpl.makeUpper*=ROLE_FROM_IMPLEMENTATION"); "org.springframework.security.annotation.test.Service.makeLower*=ROLE_FROM_INTERFACE\r\norg.springframework.security.annotation.test.Service.makeUpper*=ROLE_FROM_INTERFACE\r\norg.springframework.security.annotation.test.ServiceImpl.makeUpper*=ROLE_FROM_IMPLEMENTATION");
MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue(); MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
assertEquals(3, map.getMethodMapSize()); assertEquals(3, map.getMethodMapSize());
@ -87,7 +87,7 @@ public class MethodDefinitionSourceEditorTigerTests extends TestCase {
throws Exception { throws Exception {
MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor(); MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
editor.setAsText( editor.setAsText(
"org.acegisecurity.annotation.test.Service.makeLower*=ROLE_FROM_INTERFACE\r\norg.acegisecurity.annotation.test.Service.makeUpper*=ROLE_FROM_INTERFACE\r\norg.acegisecurity.annotation.test.ServiceImpl.makeUpper*=ROLE_FROM_IMPLEMENTATION"); "org.springframework.security.annotation.test.Service.makeLower*=ROLE_FROM_INTERFACE\r\norg.springframework.security.annotation.test.Service.makeUpper*=ROLE_FROM_INTERFACE\r\norg.springframework.security.annotation.test.ServiceImpl.makeUpper*=ROLE_FROM_IMPLEMENTATION");
MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue(); MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
assertEquals(3, map.getMethodMapSize()); assertEquals(3, map.getMethodMapSize());

6
core-tiger/src/test/java/org/acegisecurity/annotation/SecurityAnnotationAttributesTests.java → core-tiger/src/test/java/org/springframework/security/annotation/SecurityAnnotationAttributesTests.java
View File

@ -12,11 +12,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.annotation; package org.springframework.security.annotation;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.acegisecurity.SecurityConfig; import org.springframework.security.SecurityConfig;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -30,7 +30,7 @@ import java.util.Collection;
/** /**
* Tests for {@link org.acegisecurity.annotation.SecurityAnnotationAttributes} * Tests for {@link org.springframework.security.annotation.SecurityAnnotationAttributes}
* *
* @author Mark St.Godard * @author Mark St.Godard
* @author Joe Scalise * @author Joe Scalise

2
core-tiger/src/test/java/org/acegisecurity/annotation/test/Entity.java → core-tiger/src/test/java/org/springframework/security/annotation/test/Entity.java
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.annotation.test; package org.springframework.security.annotation.test;
import org.springframework.util.Assert; import org.springframework.util.Assert;

2
core-tiger/src/test/java/org/acegisecurity/annotation/test/Organisation.java → core-tiger/src/test/java/org/springframework/security/annotation/test/Organisation.java
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.annotation.test; package org.springframework.security.annotation.test;
/** /**
* An extended version of <code>Entity</code>. * An extended version of <code>Entity</code>.

2
core-tiger/src/test/java/org/acegisecurity/annotation/test/OrganisationService.java → core-tiger/src/test/java/org/springframework/security/annotation/test/OrganisationService.java
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.annotation.test; package org.springframework.security.annotation.test;
/** /**
* DOCUMENT ME! * DOCUMENT ME!

2
core-tiger/src/test/java/org/acegisecurity/annotation/test/OrganisationServiceImpl.java → core-tiger/src/test/java/org/springframework/security/annotation/test/OrganisationServiceImpl.java
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.annotation.test; package org.springframework.security.annotation.test;
/** /**
* DOCUMENT ME! * DOCUMENT ME!

2
core-tiger/src/test/java/org/acegisecurity/annotation/test/Person.java → core-tiger/src/test/java/org/springframework/security/annotation/test/Person.java
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.annotation.test; package org.springframework.security.annotation.test;
/** /**
* An extended version of <code>Entity</code>. * An extended version of <code>Entity</code>.

2
core-tiger/src/test/java/org/acegisecurity/annotation/test/PersonService.java → core-tiger/src/test/java/org/springframework/security/annotation/test/PersonService.java
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.annotation.test; package org.springframework.security.annotation.test;
/** /**
* DOCUMENT ME! * DOCUMENT ME!

2
core-tiger/src/test/java/org/acegisecurity/annotation/test/PersonServiceImpl.java → core-tiger/src/test/java/org/springframework/security/annotation/test/PersonServiceImpl.java
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.annotation.test; package org.springframework.security.annotation.test;
/** /**
* DOCUMENT ME! * DOCUMENT ME!

2
core-tiger/src/test/java/org/acegisecurity/annotation/test/Service.java → core-tiger/src/test/java/org/springframework/security/annotation/test/Service.java
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.annotation.test; package org.springframework.security.annotation.test;
import java.util.Collection; import java.util.Collection;

2
core-tiger/src/test/java/org/acegisecurity/annotation/test/ServiceImpl.java → core-tiger/src/test/java/org/springframework/security/annotation/test/ServiceImpl.java
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.acegisecurity.annotation.test; package org.springframework.security.annotation.test;
import java.util.Collection; import java.util.Collection;