You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2012/07/29 23:39:28 UTC

[1/5] git commit: DELTASPIKE-249 remove packages authentication, credential, idm and permission

Updated Branches:
  refs/heads/master 9dd321106 -> 79b067158


DELTASPIKE-249 remove packages authentication, credential, idm and permission

 of the security module (details are available at http://s.apache.org/DS-249)


Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/79b06715
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/79b06715
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/79b06715

Branch: refs/heads/master
Commit: 79b067158335d743b28fcefa80b91c10ec6bce2a
Parents: 9dd3211
Author: gpetracek <gp...@apache.org>
Authored: Fri Jul 27 22:07:34 2012 +0200
Committer: gpetracek <gp...@apache.org>
Committed: Sun Jul 29 23:32:25 2012 +0200

----------------------------------------------------------------------
 deltaspike/examples/security-console/pom.xml       |  142 --
 .../securityconsole/BasicAuthenticator.java        |   23 -
 .../securityconsole/action/CustomerAction.java     |    9 -
 .../securityconsole/action/PermissionSearch.java   |   76 -
 .../example/securityconsole/model/Customer.java    |   54 -
 .../securityconsole/model/CustomerPermission.java  |   71 -
 .../securityconsole/model/ModelPopulator.java      |   30 -
 .../securityconsole/model/ObjectPermission.java    |   71 -
 .../example/securityconsole/model/Product.java     |   38 -
 .../util/EntityManagerProducer.java                |   13 -
 .../WEB-INF/classes/META-INF/persistence.xml       |   14 -
 .../classes/META-INF/security-console-ds.xml       |   15 -
 .../src/main/resources/META-INF/beans.xml          |   23 -
 .../main/webapp/WEB-INF/templates/default.xhtml    |   38 -
 .../src/main/webapp/WEB-INF/web.xml                |   30 -
 .../security-console/src/main/webapp/home.xhtml    |   45 -
 .../security-console/src/main/webapp/index.html    |    5 -
 .../src/main/webapp/managegroups.xhtml             |   59 -
 .../src/main/webapp/managepermissions.xhtml        |   71 -
 .../src/main/webapp/manageroletypes.xhtml          |   58 -
 .../src/main/webapp/manageusers.xhtml              |   69 -
 .../security-console/src/main/webapp/menu.xhtml    |   31 -
 .../src/main/webapp/style/default.css              |   61 -
 .../apache/deltaspike/security/api/Identity.java   |   94 -
 .../api/SecurityConfigurationException.java        |   49 -
 .../authentication/AuthenticationException.java    |   37 -
 .../UnexpectedCredentialException.java             |   35 -
 .../authentication/event/AlreadyLoggedInEvent.java |   27 -
 .../api/authentication/event/LoggedInEvent.java    |   27 -
 .../api/authentication/event/LoginFailedEvent.java |   38 -
 .../event/PostAuthenticateEvent.java               |   27 -
 .../authentication/event/PostLoggedOutEvent.java   |   39 -
 .../authentication/event/PreAuthenticateEvent.java |   26 -
 .../authentication/event/PreLoggedOutEvent.java    |   39 -
 .../security/api/credential/Credential.java        |   27 -
 .../security/api/credential/LoginCredentials.java  |   36 -
 .../security/api/idm/AbstractIdentityType.java     |   98 -
 .../apache/deltaspike/security/api/idm/Group.java  |   61 -
 .../deltaspike/security/api/idm/GroupQuery.java    |   79 -
 .../security/api/idm/IdentityManager.java          |  116 --
 .../deltaspike/security/api/idm/IdentityType.java  |   84 -
 .../deltaspike/security/api/idm/Membership.java    |   34 -
 .../security/api/idm/MembershipQuery.java          |   64 -
 .../apache/deltaspike/security/api/idm/Range.java  |   70 -
 .../apache/deltaspike/security/api/idm/Role.java   |   30 -
 .../deltaspike/security/api/idm/RoleQuery.java     |   60 -
 .../deltaspike/security/api/idm/SimpleGroup.java   |   52 -
 .../deltaspike/security/api/idm/SimpleRole.java    |   38 -
 .../deltaspike/security/api/idm/SimpleUser.java    |   83 -
 .../apache/deltaspike/security/api/idm/User.java   |   59 -
 .../deltaspike/security/api/idm/UserQuery.java     |   97 -
 .../security/api/permission/Permission.java        |   54 -
 .../security/api/permission/PermissionManager.java |   59 -
 .../security/api/permission/PermissionQuery.java   |   96 -
 .../api/permission/annotations/ACLIdentifier.java  |   40 -
 .../api/permission/annotations/ACLPermission.java  |   40 -
 .../api/permission/annotations/ACLRecipient.java   |   39 -
 .../permission/annotations/ACLResourceClass.java   |   40 -
 .../api/permission/annotations/ACLStore.java       |   46 -
 .../permission/annotations/CheckPermissions.java   |   39 -
 .../permission/annotations/RequiresPermission.java |   34 -
 .../security/spi/authentication/Authenticator.java |   44 -
 .../spi/authentication/AuthenticatorSelector.java  |   35 -
 .../spi/authentication/BaseAuthenticator.java      |   56 -
 .../deltaspike/security/spi/idm/IdentityStore.java |  201 --
 .../spi/permission/PermissionResolver.java         |   43 -
 .../security/spi/permission/PermissionStore.java   |   48 -
 .../deltaspike/security/impl/DefaultIdentity.java  |  245 ---
 .../DefaultAuthenticatorSelector.java              |  132 --
 .../impl/credential/DefaultLoginCredentials.java   |  112 --
 .../security/impl/extension/SecurityExtension.java |   25 +-
 .../security/impl/idm/DefaultIdentityManager.java  |  272 ---
 .../security/impl/idm/JPAIdentityStore.java        |  238 ---
 .../security/impl/idm/LDAPIdentityStore.java       |  238 ---
 .../impl/permission/DefaultPermissionManager.java  |   75 -
 .../impl/permission/JPAPermissionStore.java        |  204 ---
 .../impl/permission/JPAPermissionStoreConfig.java  |  181 --
 .../security/impl/permission/PermissionMapper.java |   78 -
 .../permission/PersistentPermissionResolver.java   |   45 -
 .../impl/util/properties/FieldProperty.java        |   27 -
 .../impl/util/properties/FieldPropertyImpl.java    |  112 --
 .../impl/util/properties/MethodProperty.java       |   27 -
 .../impl/util/properties/MethodPropertyImpl.java   |  268 ---
 .../security/impl/util/properties/Properties.java  |  104 --
 .../security/impl/util/properties/Property.java    |  111 --
 .../query/AnnotatedPropertyCriteria.java           |   49 -
 .../properties/query/NamedPropertyCriteria.java    |   64 -
 .../util/properties/query/PropertyCriteria.java    |   60 -
 .../util/properties/query/PropertyQueries.java     |   45 -
 .../impl/util/properties/query/PropertyQuery.java  |  255 ---
 .../properties/query/TypedPropertyCriteria.java    |   47 -
 .../impl/util/reflection/HierarchyDiscovery.java   |  225 ---
 .../util/reflection/ParameterizedTypeImpl.java     |  102 --
 .../security/impl/util/reflection/Reflections.java | 1411 ---------------
 .../reflection/SetAccessiblePriviligedAction.java  |   43 -
 .../security/impl/util/reflection/Types.java       |   99 -
 .../services/javax.enterprise.inject.spi.Extension |    1 -
 .../authentication/FailedLoginFailedObserver.java  |   40 -
 .../impl/authentication/InMemoryUserStorage.java   |   43 -
 .../test/security/impl/authentication/Inquiry.java |   24 -
 .../security/impl/authentication/InquiryEntry.java |   78 -
 .../impl/authentication/InquiryStorage.java        |   24 -
 .../impl/authentication/LoginLogoutTest.java       |  166 --
 .../impl/authentication/NewProductInquiry.java     |   58 -
 .../test/security/impl/authentication/Shop.java    |   43 -
 .../security/impl/authentication/ShopClient.java   |   65 -
 .../impl/authentication/TestAuthenticator.java     |   63 -
 .../impl/authentication/TestInquiryStorage.java    |   61 -
 108 files changed, 1 insertions(+), 9045 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/pom.xml b/deltaspike/examples/security-console/pom.xml
deleted file mode 100644
index 7fd3c24..0000000
--- a/deltaspike/examples/security-console/pom.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.deltaspike.examples</groupId>
-        <artifactId>jse-examples-project</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.deltaspike.examples</groupId>
-    <artifactId>security-console</artifactId>
-
-    <name>Apache DeltaSpike Security Console Example</name>
-
-    <packaging>war</packaging>
-
-    <dependencies>
-
-        <!-- DeltaSpike modules -->
-        <dependency>
-            <groupId>org.apache.deltaspike.core</groupId>
-            <artifactId>deltaspike-core-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.deltaspike.core</groupId>
-            <artifactId>deltaspike-core-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.deltaspike.modules</groupId>
-            <artifactId>deltaspike-security-module-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.deltaspike.modules</groupId>
-            <artifactId>deltaspike-security-module-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-jpa_2.0_spec</artifactId>
-        </dependency>        
-
-	<dependency>
-	  <groupId>org.apache.geronimo.specs</groupId>
-	  <artifactId>geronimo-ejb_3.0_spec</artifactId>
-	  <version>1.0.1</version>
-	</dependency>
-
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>OWB</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-impl</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-spi</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.deltaspike.cdictrl</groupId>
-                    <artifactId>deltaspike-cdictrl-owb</artifactId>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        
-        <profile>
-            <id>Weld</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.deltaspike.cdictrl</groupId>
-                    <artifactId>deltaspike-cdictrl-weld</artifactId>
-                    <scope>runtime</scope>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.jboss.weld.se</groupId>
-                    <artifactId>weld-se</artifactId>
-                    <version>${weld.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        
-        <profile>
-            <id>jbossas7</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-war-plugin</artifactId>
-                        <configuration>
-                            <webResources>
-                                <resource>
-                                    <directory>src/main/resources-jbossas7</directory>
-                                </resource>
-                            </webResources>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>        
-    </profiles>
-    
-    <build>
-        <finalName>security-console</finalName>
-    </build>
-</project>
-

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/BasicAuthenticator.java
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/BasicAuthenticator.java b/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/BasicAuthenticator.java
deleted file mode 100644
index 9acd940..0000000
--- a/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/BasicAuthenticator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.apache.deltaspike.example.securityconsole;
-
-import javax.inject.Inject;
-
-import org.apache.deltaspike.security.api.credential.LoginCredentials;
-import org.apache.deltaspike.security.api.idm.SimpleUser;
-import org.apache.deltaspike.security.spi.authentication.BaseAuthenticator;
-
-public class BasicAuthenticator extends BaseAuthenticator 
-{
-    @Inject 
-    private LoginCredentials credentials;
-
-    public void authenticate() 
-    {
-        if ("shane".equals(credentials.getUserId()) &&
-                "password".equals(credentials.getCredential().getValue()))
-        {
-            setUser(new SimpleUser("shane"));
-            setStatus(AuthenticationStatus.SUCCESS);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/action/CustomerAction.java
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/action/CustomerAction.java b/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/action/CustomerAction.java
deleted file mode 100644
index 439b650..0000000
--- a/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/action/CustomerAction.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.apache.deltaspike.example.securityconsole.action;
-
-import javax.enterprise.inject.Model;
-
-@Model 
-public class CustomerAction 
-{
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/action/PermissionSearch.java
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/action/PermissionSearch.java b/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/action/PermissionSearch.java
deleted file mode 100644
index 9b17942..0000000
--- a/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/action/PermissionSearch.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.apache.deltaspike.example.securityconsole.action;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.enterprise.inject.Model;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.ejb.Stateful;
-import javax.inject.Inject;
-
-import org.apache.deltaspike.example.securityconsole.model.Customer;
-import org.apache.deltaspike.security.api.permission.Permission;
-import org.apache.deltaspike.security.api.permission.PermissionManager;
-import org.apache.deltaspike.security.api.permission.PermissionQuery;
-
-@Stateful
-@Model
-public class PermissionSearch 
-{
-    private static final List<String> ENTITY_TYPES = Arrays.asList(new String[] {"Customer", "Project"});
-    
-    private String entityType = ENTITY_TYPES.get(0);
-    
-    @PersistenceContext
-    private EntityManager em;
-    
-    private Object resource;
-    private List<Permission> permissions;
-    
-    @Inject
-    private PermissionManager permissionManager;
-    
-    public String getEntityType()
-    {
-        return entityType;
-    }
-    
-    public void setEntityType(String entityType)
-    {
-        this.entityType = entityType;
-    }
-    
-    public List<String> getEntityTypes()
-    {
-        return ENTITY_TYPES;
-    }
-    
-    public List<Customer> getCustomers()
-    {
-        return em.createQuery("select C from Customer C").getResultList();
-    }
-    
-    public Object getResource()
-    {
-        return resource;
-    }
-    
-    public void setResource(Object resource)
-    {
-        this.resource = resource;
-    }
-    
-    public List<Permission> getPermissions()
-    {
-        if (permissions == null && resource != null)
-        {
-            permissions = permissionManager.createPermissionQuery()
-                    .setResource(resource)
-                    .getResultList();
-            
-        }
-        return permissions;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/model/Customer.java
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/model/Customer.java b/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/model/Customer.java
deleted file mode 100644
index 276c149..0000000
--- a/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/model/Customer.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.apache.deltaspike.example.securityconsole.model;
-
-import java.io.Serializable;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-
-@Entity
-public class Customer implements Serializable 
-{
-    private static final long serialVersionUID = 8279444660789483143L;
-    
-    @Id @GeneratedValue
-    private Long id;
-        
-    private String firstName;
-    private String lastName;
-    
-    public Long getId()
-    {
-        return id;
-    }
-    
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-    
-    public String getFirstName()
-    {
-        return firstName;
-    }
-    
-    public void setFirstName(String firstName)
-    {
-        this.firstName = firstName;
-    }
-    
-    public String getLastName()
-    {
-        return lastName;
-    }
-    
-    public void setLastName(String lastName)
-    {
-        this.lastName = lastName;
-    }
-    
-    public String toString()
-    {
-        return String.format("%d: %s %s", id, firstName, lastName);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/model/CustomerPermission.java
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/model/CustomerPermission.java b/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/model/CustomerPermission.java
deleted file mode 100644
index ebf32c7..0000000
--- a/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/model/CustomerPermission.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.apache.deltaspike.example.securityconsole.model;
-
-import java.io.Serializable;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-
-import org.apache.deltaspike.security.api.permission.annotations.ACLIdentifier;
-import org.apache.deltaspike.security.api.permission.annotations.ACLPermission;
-import org.apache.deltaspike.security.api.permission.annotations.ACLRecipient;
-import org.apache.deltaspike.security.api.permission.annotations.ACLStore;
-
-@ACLStore(Customer.class)
-@Entity
-public class CustomerPermission implements Serializable
-{
-    private static final long serialVersionUID = 372174826909042844L;
-    
-    @Id @GeneratedValue
-    private Long id;
-    
-    @ACLIdentifier
-    private Long identifier;
-    
-    @ACLRecipient
-    private String recipient;
-    
-    @ACLPermission
-    private String permission;
-    
-    public Long getId()
-    {
-        return id;
-    }
-    
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-    
-    public Long getIdentifier()
-    {
-        return identifier;
-    }
-    
-    public void setIdentifier(Long identifier)
-    {
-        this.identifier = identifier;
-    }
-    
-    public String getRecipient()
-    {
-        return recipient;
-    }
-    
-    public void setRecipient(String recipient)
-    {
-        this.recipient = recipient;
-    }
-    
-    public String getPermission()
-    {
-        return permission;
-    }
-    
-    public void setPermission(String permission)
-    {
-        this.permission = permission;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/model/ModelPopulator.java
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/model/ModelPopulator.java b/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/model/ModelPopulator.java
deleted file mode 100644
index 9045e14..0000000
--- a/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/model/ModelPopulator.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.apache.deltaspike.example.securityconsole.model;
-
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-/**
- * Populates the database with default values
- *
- */
-@Stateless
-public @Named class ModelPopulator 
-{
-    @PersistenceContext
-    private EntityManager em;
-    
-    public void populate()
-    {
-        Customer c = new Customer();
-        c.setFirstName("Shane");
-        c.setLastName("Bryzak");
-        em.persist(c);
-        
-        c = new Customer();
-        c.setFirstName("John");
-        c.setLastName("Smith");
-        em.persist(c);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/model/ObjectPermission.java
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/model/ObjectPermission.java b/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/model/ObjectPermission.java
deleted file mode 100644
index 9b3b989..0000000
--- a/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/model/ObjectPermission.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.apache.deltaspike.example.securityconsole.model;
-
-import java.io.Serializable;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-
-import org.apache.deltaspike.security.api.permission.annotations.ACLIdentifier;
-import org.apache.deltaspike.security.api.permission.annotations.ACLPermission;
-import org.apache.deltaspike.security.api.permission.annotations.ACLRecipient;
-import org.apache.deltaspike.security.api.permission.annotations.ACLStore;
-
-@ACLStore
-@Entity
-public class ObjectPermission implements Serializable 
-{
-    private static final long serialVersionUID = 2386489292457994509L;
-    
-    @Id @GeneratedValue
-    private Long id;
-    
-    @ACLIdentifier
-    private String identifier;
-    
-    @ACLRecipient
-    private String recipient;
-    
-    @ACLPermission
-    private String permission;
-    
-    public Long getId()
-    {
-        return id;
-    }
-    
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-    
-    public String getIdentifier()
-    {
-        return identifier;
-    }
-    
-    public void setIdentifier(String identifier)
-    {
-        this.identifier = identifier;
-    }
-    
-    public String getRecipient()
-    {
-        return recipient;
-    }
-    
-    public void setRecipient(String recipient)
-    {
-        this.recipient = recipient;
-    }
-    
-    public String getPermission()
-    {
-        return permission;
-    }
-    
-    public void setPermission(String permission)
-    {
-        this.permission = permission;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/model/Product.java
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/model/Product.java b/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/model/Product.java
deleted file mode 100644
index d3c69a5..0000000
--- a/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/model/Product.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.deltaspike.example.securityconsole.model;
-
-import java.io.Serializable;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-
-@Entity
-public class Product implements Serializable 
-{
-    private static final long serialVersionUID = 7371229127406305675L;
-
-    @Id @GeneratedValue
-    private Long id;
-    
-    private String description;
-    
-    public Long getId()
-    {
-        return id;
-    }
-    
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-    
-    public String getDescription()
-    {
-        return description;
-    }
-    
-    public void setDescription(String description)
-    {
-        this.description = description;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/util/EntityManagerProducer.java
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/util/EntityManagerProducer.java b/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/util/EntityManagerProducer.java
deleted file mode 100644
index 1195bff..0000000
--- a/deltaspike/examples/security-console/src/main/java/org/apache/deltaspike/example/securityconsole/util/EntityManagerProducer.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.apache.deltaspike.example.securityconsole.util;
-
-import javax.ejb.Stateless;
-import javax.enterprise.inject.Produces;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-public class EntityManagerProducer 
-{
-    @Produces
-    @PersistenceContext
-    private EntityManager em;
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/resources-jbossas7/WEB-INF/classes/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/resources-jbossas7/WEB-INF/classes/META-INF/persistence.xml b/deltaspike/examples/security-console/src/main/resources-jbossas7/WEB-INF/classes/META-INF/persistence.xml
deleted file mode 100644
index 6242ac5..0000000
--- a/deltaspike/examples/security-console/src/main/resources-jbossas7/WEB-INF/classes/META-INF/persistence.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
-             version="2.0">
-    <persistence-unit name="securityConsoleDatabase">
-        <jta-data-source>java:jboss/datasources/SecurityConsoleDS</jta-data-source>
-        <properties>
-            <!-- Properties for Hibernate (default provider for JBoss AS) -->
-            <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
-            <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-        </properties>
-    </persistence-unit>
-</persistence>

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/resources-jbossas7/WEB-INF/classes/META-INF/security-console-ds.xml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/resources-jbossas7/WEB-INF/classes/META-INF/security-console-ds.xml b/deltaspike/examples/security-console/src/main/resources-jbossas7/WEB-INF/classes/META-INF/security-console-ds.xml
deleted file mode 100644
index 2cdb097..0000000
--- a/deltaspike/examples/security-console/src/main/resources-jbossas7/WEB-INF/classes/META-INF/security-console-ds.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources xmlns="http://www.jboss.org/ironjacamar/schema">
-    <datasource 
-        jndi-name="java:jboss/datasources/SecurityConsoleDS" 
-        enabled="true" 
-        use-java-context="true" pool-name="securityconsoledb">
-        <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
-        <driver>h2</driver>
-        <pool></pool>
-        <security>
-            <user-name>sa</user-name>
-            <password></password>
-        </security>
-    </datasource>
-</datasources>

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/resources/META-INF/beans.xml b/deltaspike/examples/security-console/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index 4070730..0000000
--- a/deltaspike/examples/security-console/src/main/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-</beans>

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/webapp/WEB-INF/templates/default.xhtml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/webapp/WEB-INF/templates/default.xhtml b/deltaspike/examples/security-console/src/main/webapp/WEB-INF/templates/default.xhtml
deleted file mode 100644
index 1010f7a..0000000
--- a/deltaspike/examples/security-console/src/main/webapp/WEB-INF/templates/default.xhtml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:ui="http://java.sun.com/jsf/facelets">
-<h:head>
-    <title>DeltaSpike Example - Security Console</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <link rel="stylesheet" href="style/default.css" type="text/css" media="screen"/>
-</h:head>
-<h:body>
-    <div id="container">
-        <div id="header">
-            <div id="title">
-                Security Console
-            </div>
-
-            <div id="headerMenu">
-                <h:form>
-                    <ui:fragment rendered="#{identity.loggedIn}">
-                        Welcome, #{identity.user.id}!<br/>
-                        <a href="changepassword.jsf">Change password</a><span> | </span>
-                        <h:commandLink value="Log out" action="#{identity.logout}"/>
-                    </ui:fragment>
-                </h:form>
-            </div>
-        </div>
-
-        <div id="sidebar">
-            <ui:insert name="sidebar"/>
-        </div>
-
-        <div id="content">
-            <ui:insert name="content"/>
-        </div>
-    </div>
-</h:body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/webapp/WEB-INF/web.xml b/deltaspike/examples/security-console/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 11f6635..0000000
--- a/deltaspike/examples/security-console/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="3.0"
-         xmlns="http://java.sun.com/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="
-      http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
-    <!-- Activate the JSF 2.0 servlet -->
-    <!-- The JSF servlet declaration and mapping are not required for GlassFish V3 -->
-    <servlet>
-        <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <!-- Tell the context which URLs to process as facelets.  -->
-    <servlet-mapping>
-        <servlet-name>Faces Servlet</servlet-name>
-        <url-pattern>*.jsf</url-pattern>
-    </servlet-mapping>
-
-    <!-- This is an optional parameter, but it makes troubleshooting errors much easier -->
-    <!-- You are advised to delete this context parameter before a production deployment -->
-    <context-param>
-        <param-name>facelets.DEVELOPMENT</param-name>
-        <param-value>true</param-value>
-    </context-param>
-
-</web-app>

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/webapp/home.xhtml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/webapp/home.xhtml b/deltaspike/examples/security-console/src/main/webapp/home.xhtml
deleted file mode 100644
index c680f7f..0000000
--- a/deltaspike/examples/security-console/src/main/webapp/home.xhtml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:f="http://java.sun.com/jsf/core"
-                xmlns:h="http://java.sun.com/jsf/html"
-                template="/WEB-INF/templates/default.xhtml">
-
-    <ui:define name="sidebar">
-        <ui:include src="menu.xhtml"/>
-    </ui:define>
-
-    <ui:define name="content">
-        <p>This example demonstrates DeltaSpike's security features.</p>
-
-        <h:form id="loginForm" rendered="#{not identity.loggedIn}">
-            <h:messages id="messages" globalOnly="true"/>
-
-            <div class="loginRow">
-                <h:outputLabel for="name" value="Username" styleClass="loginLabel"/>
-                <h:inputText id="name" value="#{loginCredentials.userId}"/>
-            </div>
-
-            <div class="loginRow">
-                <h:outputLabel for="password" value="Password" styleClass="loginLabel"/>
-                <h:inputSecret id="password" value="#{loginCredentials.password}" redisplay="true"/>
-            </div>
-
-            <div class="buttons">
-                <h:commandButton id="login" value="LOGIN" action="#{identity.login}" styleClass="loginButton"/>
-            </div>
-
-            Tip: you can login with a username/password of demo/demo.
-        </h:form>
-        
-        <h:form>
-            <div>
-              <h:commandButton action="#{modelPopulator.populate}" value="Populate database"/>
-              (TODO - refactor this after DeltaSpike supports application initialization events)
-            </div>
-        </h:form>
-
-        <br style="clear:both"/>
-
-    </ui:define>
-</ui:composition>

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/webapp/index.html b/deltaspike/examples/security-console/src/main/webapp/index.html
deleted file mode 100644
index c54885e..0000000
--- a/deltaspike/examples/security-console/src/main/webapp/index.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<head>
-    <meta http-equiv="Refresh" content="0; URL=home.jsf">
-</head>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/webapp/managegroups.xhtml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/webapp/managegroups.xhtml b/deltaspike/examples/security-console/src/main/webapp/managegroups.xhtml
deleted file mode 100644
index a83e39c..0000000
--- a/deltaspike/examples/security-console/src/main/webapp/managegroups.xhtml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:f="http://java.sun.com/jsf/core"
-                xmlns:h="http://java.sun.com/jsf/html"
-                template="/WEB-INF/templates/default.xhtml">
-
-    <ui:define name="sidebar">
-        <ui:include src="menu.xhtml"/>
-    </ui:define>
-
-    <ui:define name="content">
-        <script type="text/javascript">
-            function confirmDelete() {
-                return confirm("Are you sure you wish to delete this group? This action cannot be undone.");
-            }
-        </script>
-
-        <h3>Manage Groups</h3>
-
-        <h:form>
-            <h:commandLink action="#{groupAction.createGroup}" value="Create new group"
-                           rendered="#{identity.hasPermission('seam.account', 'create')}"/>
-        </h:form>
-
-        <h:form>
-            <h:dataTable
-                    id="threads"
-                    value="#{groupSearch.groups}"
-                    var="group"
-                    styleClass="security"
-                    cellspacing="0"
-                    headerClass="header"
-                    rowClasses="odd,even"
-                    columnClasses=",,action">
-                <h:column width="auto">
-                    <f:facet name="header">
-                        Group name
-                    </f:facet>
-                    #{group.name}
-                </h:column>
-                <h:column id="action" width="auto">
-                    <f:facet name="header">
-                        Action
-                    </f:facet>
-
-                    <ui:fragment rendered="#{identity.hasPermission('seam.identity', 'delete')}">
-                        <h:commandLink id="delete" value="Delete"
-                                       action="#{groupAction.deleteGroup(group.name, group.groupType)}"
-                                       onclick="return confirmDelete()"/>
-                    </ui:fragment>
-                </h:column>
-            </h:dataTable>
-        </h:form>
-
-        <br style="clear:both"/>
-
-    </ui:define>
-</ui:composition>

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/webapp/managepermissions.xhtml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/webapp/managepermissions.xhtml b/deltaspike/examples/security-console/src/main/webapp/managepermissions.xhtml
deleted file mode 100644
index 1ca2c65..0000000
--- a/deltaspike/examples/security-console/src/main/webapp/managepermissions.xhtml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:f="http://java.sun.com/jsf/core"
-                xmlns:h="http://java.sun.com/jsf/html"
-                template="/WEB-INF/templates/default.xhtml">
-
-    <ui:define name="sidebar">
-        <ui:include src="menu.xhtml"/>
-    </ui:define>
-
-    <ui:define name="content">
-
-        <h3>Manage Permissions</h3>
-
-        <h:form>
-            <h:selectOneMenu id="entityType" value="#{permissionSearch.entityType}" onchange="this.form.submit();">
-              <f:selectItems value="#{permissionSearch.entityTypes}"></f:selectItems>
-            </h:selectOneMenu>
-            
-            <ui:fragment rendered="#{permissionSearch.entityType == 'Customer'}">
-              <h:selectOneMenu id="selectedCustomer" value="#{permissionSearch.resource}" onchange="this.form.submit();">
-                <f:selectItems value="#{permissionSearch.customers}"></f:selectItems>
-              </h:selectOneMenu>            
-            </ui:fragment>
-        
-            <ui:fragment rendered="#{permissionSearch.resource ne null}">
-              <h:dataTable
-                      id="threads"
-                      value="#{permissionSearch.permissions}"
-                      var="permission"
-                      styleClass="security"
-                      cellspacing="0"
-                      headerClass="header"
-                      rowClasses="odd,even"
-                      columnClasses=",,enabled,action">
-                  <h:column width="auto">
-                      <f:facet name="header">
-                          Recipient
-                      </f:facet>
-
-                  </h:column>
-                  <h:column id="enabled" width="auto">
-                      <!--f:facet name="header">
-                          Enabled
-                      </f:facet-->
-
-
-                  </h:column>
-                  <h:column id="action" width="auto">
-                      <!--f:facet name="header">
-                          Action
-                      </f:facet-->
-
-                      <!--ui:fragment rendered="#{identity.hasPermission('seam.identity', 'update')}">
-                          <h:commandLink id="edit" value="Edit" action="#{userAction.editUser(user.username)}"/>
-                          <span> | </span>
-                      </ui:fragment>
-                      <ui:fragment rendered="#{identity.hasPermission('seam.identity', 'delete')}">
-                          <h:commandLink id="delete" value="Delete" action="#{userAction.deleteUser(user.username)}"
-                                         onclick="return confirmDelete()"/>
-                      </ui:fragment-->
-                  </h:column>
-              </h:dataTable>
-            </ui:fragment>
-        </h:form>
-
-        <br style="clear:both"/>
-
-    </ui:define>
-</ui:composition>

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/webapp/manageroletypes.xhtml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/webapp/manageroletypes.xhtml b/deltaspike/examples/security-console/src/main/webapp/manageroletypes.xhtml
deleted file mode 100644
index b5ddd6d..0000000
--- a/deltaspike/examples/security-console/src/main/webapp/manageroletypes.xhtml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:f="http://java.sun.com/jsf/core"
-                xmlns:h="http://java.sun.com/jsf/html"
-                template="/WEB-INF/templates/default.xhtml">
-
-    <ui:define name="sidebar">
-        <ui:include src="menu.xhtml"/>
-    </ui:define>
-
-    <ui:define name="content">
-        <script type="text/javascript">
-            function confirmDelete() {
-                return confirm("Are you sure you wish to delete this role type? This action cannot be undone.");
-            }
-        </script>
-
-        <h3>Manage Role Types</h3>
-
-        <h:form>
-            <h:commandLink action="#{roleAction.createRoleType}" value="Create new role type"
-                           rendered="#{identity.hasPermission('seam.account', 'create')}"/>
-        </h:form>
-
-        <h:form>
-            <h:dataTable
-                    id="threads"
-                    value="#{roleSearch.roleTypes}"
-                    var="role"
-                    styleClass="security"
-                    cellspacing="0"
-                    headerClass="header"
-                    rowClasses="odd,even"
-                    columnClasses=",,enabled,action">
-                <h:column width="auto">
-                    <f:facet name="header">
-                        Role type
-                    </f:facet>
-                    #{role}
-                </h:column>
-                <h:column id="action" width="auto">
-                    <f:facet name="header">
-                        Action
-                    </f:facet>
-
-                    <ui:fragment rendered="#{identity.hasPermission('seam.identity', 'delete')}">
-                        <h:commandLink id="delete" value="Delete" action="#{roleAction.deleteRoleType(role)}"
-                                       onclick="return confirmDelete()"/>
-                    </ui:fragment>
-                </h:column>
-            </h:dataTable>
-        </h:form>
-
-        <br style="clear:both"/>
-
-    </ui:define>
-</ui:composition>

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/webapp/manageusers.xhtml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/webapp/manageusers.xhtml b/deltaspike/examples/security-console/src/main/webapp/manageusers.xhtml
deleted file mode 100644
index cf708c8..0000000
--- a/deltaspike/examples/security-console/src/main/webapp/manageusers.xhtml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:f="http://java.sun.com/jsf/core"
-                xmlns:h="http://java.sun.com/jsf/html"
-                template="/WEB-INF/templates/default.xhtml">
-
-    <ui:define name="sidebar">
-        <ui:include src="menu.xhtml"/>
-    </ui:define>
-
-    <ui:define name="content">
-        <script type="text/javascript">
-            function confirmDelete() {
-                return confirm("Are you sure you wish to delete this user? This action cannot be undone.");
-            }
-        </script>
-
-        <h3>Manage Users</h3>
-
-        <h:form>
-            <h:commandLink action="#{userAction.createUser}" value="Create New User"
-                           rendered="#{identity.hasPermission('seam.account', 'create')}"/>
-        </h:form>
-
-        <h:form>
-            <h:dataTable
-                    id="threads"
-                    value="#{userSearch.users}"
-                    var="user"
-                    styleClass="security"
-                    cellspacing="0"
-                    headerClass="header"
-                    rowClasses="odd,even"
-                    columnClasses=",,enabled,action">
-                <h:column width="auto">
-                    <f:facet name="header">
-                        User name
-                    </f:facet>
-                    #{user.username}
-                </h:column>
-                <h:column id="enabled" width="auto">
-                    <f:facet name="header">
-                        Enabled
-                    </f:facet>
-
-                    <div class="#{user.enabled ? 'checkmark' : 'cross'}"/>
-                </h:column>
-                <h:column id="action" width="auto">
-                    <f:facet name="header">
-                        Action
-                    </f:facet>
-
-                    <ui:fragment rendered="#{identity.hasPermission('seam.identity', 'update')}">
-                        <h:commandLink id="edit" value="Edit" action="#{userAction.editUser(user.username)}"/>
-                        <span> | </span>
-                    </ui:fragment>
-                    <ui:fragment rendered="#{identity.hasPermission('seam.identity', 'delete')}">
-                        <h:commandLink id="delete" value="Delete" action="#{userAction.deleteUser(user.username)}"
-                                       onclick="return confirmDelete()"/>
-                    </ui:fragment>
-                </h:column>
-            </h:dataTable>
-        </h:form>
-
-        <br style="clear:both"/>
-
-    </ui:define>
-</ui:composition>

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/webapp/menu.xhtml
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/webapp/menu.xhtml b/deltaspike/examples/security-console/src/main/webapp/menu.xhtml
deleted file mode 100644
index 9ad1b95..0000000
--- a/deltaspike/examples/security-console/src/main/webapp/menu.xhtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:ui="http://java.sun.com/jsf/facelets">
-
-<ui:composition>
-
-    <div class="menuitem">
-        <a href="home.jsf">Home</a>
-    </div>
-
-    <div class="menuitem">
-        <a href="manageusers.jsf">Manage users</a>
-    </div>
-
-    <div class="menuitem">
-        <a href="managegroups.jsf">Manage groups</a>
-    </div>
-
-    <div class="menuitem">
-        <a href="manageroletypes.jsf">Manage role types</a>
-    </div>
-    
-    <div class="menuitem">
-        <a href="managepermissions.jsf">Manage permissions</a>
-    </div>
-
-</ui:composition>
-
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/examples/security-console/src/main/webapp/style/default.css
----------------------------------------------------------------------
diff --git a/deltaspike/examples/security-console/src/main/webapp/style/default.css b/deltaspike/examples/security-console/src/main/webapp/style/default.css
deleted file mode 100644
index 653c97d..0000000
--- a/deltaspike/examples/security-console/src/main/webapp/style/default.css
+++ /dev/null
@@ -1,61 +0,0 @@
-body {
-    margin: 0;
-    padding: 0;
-    background-color: #5c6066;
-    font-family: Verdana, sans-serif;
-    font-size: 0.9em;
-}
-
-div#header {
-    height: 80px;
-    background-color: #eeeeee;
-}
-
-div#headerMenu {
-    float: right;
-}
-
-div#title {
-    padding-top: 22px;
-    font-size: 22px;
-    font-weight: bold;
-    margin-left: 180px;
-}
-
-div#container {
-    margin: 0px auto;
-    padding: 2px 2px 2px 4px;
-    border: 1px solid #666666;
-    width: 865px;
-    background: #FFFFFF;
-}
-
-div#sidebar {
-    font-size: 0.9em;
-    width: 160px;
-    float: left;
-    border: 1px solid #666666;
-    background: #EAECEE;
-    padding: 4px 4px 24px 4px;
-    margin-top: 8px;
-}
-
-div#content {
-    padding: 4px 4px 4px 4px;
-    margin-left: 180px;
-}
-
-div.menuitem a {
-    font-weight: bold;
-    text-decoration: none;
-}
-
-input.newuser {
-    background: url(btn_newuser.png) top left no-repeat;
-    height: 39px;
-    width: 113px;
-    margin: 4px 4px 4px 4px;
-    border: 0px;
-    cursor: pointer;
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/Identity.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/Identity.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/Identity.java
deleted file mode 100644
index 95c3ded..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/Identity.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.security.api;
-
-import java.io.Serializable;
-
-import org.apache.deltaspike.security.api.idm.User;
-
-/**
- * Represents the identity of the current user, and provides an API for authentication and authorization. 
- *
- */
-public interface Identity extends Serializable
-{
-    public enum AuthenticationResult
-    {
-        SUCCESS, FAILED
-    }
-    
-    /**
-     * Simple check that returns true if the user is logged in, without attempting to authenticate
-     *
-     * @return true if the user is logged in
-     */
-    boolean isLoggedIn();
-
-    User getUser();
-
-    /**
-     * Attempts to authenticate the user.  This method raises the following events in response 
-     * to whether authentication is successful or not.  The following events may be raised
-     * during the call to login():
-     * <p/>
-     * {@link org.apache.deltaspike.security.api.authentication.event.LoggedInEvent}
-     * - raised when authentication is successful
-     * {@link org.apache.deltaspike.security.api.authentication.event.LoginFailedEvent}
-     * - raised when authentication fails
-     * {@link org.apache.deltaspike.security.api.authentication.event.AlreadyLoggedInEvent}
-     * - raised if the user is already authenticated
-     *
-     * @return AuthenticationResult returns SUCCESS if user is authenticated,
-     * FAILED if authentication FAILED, or
-     * EXCEPTION if an EXCEPTION occurred during authentication. These response
-     * values may be used to control user navigation.  For deferred authentication methods, such as Open ID
-     * the login() method will return an immediate result of FAILED (and subsequently fire
-     * a LoginFailedEvent) however in these conditions it is the responsibility of the Authenticator
-     * implementation to take over the authentication process, for example by redirecting the user to
-     * a third party authentication service such as an OpenID provider.
-     */
-    AuthenticationResult login();
-
-    /**
-     * Logs out the currently authenticated user
-     */
-    void logout();
-    
-    /**
-     * Tests if the currently authenticated user has permission to perform the specified operation on
-     * the specified resource.  This method should be preferred over the overloaded hasPermission() method
-     * if a reference to the resource in question is already available.  
-     * 
-     * @param resource The resource for which the permission is required
-     * @param operation The operation that the user wishes to perform on the resource
-     * @return true if the current user has the permission.
-     */
-    boolean hasPermission(Object resource, String operation);
-    
-    /**
-     * As above, however this method should be used when a reference to the resource is not available, or
-     * is expensive to retrieve, for example looking up an entity from a relational database.
-     * 
-     * @param resourceClass The class of the resource
-     * @param identifier The identifier of the resource, for example may be a primary key value if an entity
-     * @param operation The operation that the user wishes to perform on the resource
-     * @return true if the current user has the permission.
-     */
-    boolean hasPermission(Class<?> resourceClass, Serializable identifier, String operation);
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/SecurityConfigurationException.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/SecurityConfigurationException.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/SecurityConfigurationException.java
deleted file mode 100644
index 854e0b2..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/SecurityConfigurationException.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.security.api;
-
-/**
- * This exception is thrown when a problem is found with the Security API configuration   
- *
- */
-public class SecurityConfigurationException extends SecurityException
-{
-    private static final long serialVersionUID = -8895836939958745981L;
-    
-    public SecurityConfigurationException() 
-    {
-        super();
-    }
-
-    public SecurityConfigurationException(String message, Throwable cause) 
-    {
-        super(message, cause);
-    }
-
-    public SecurityConfigurationException(String message) 
-    {
-        super(message);
-    }
-
-    public SecurityConfigurationException(Throwable cause) 
-    {
-        super(cause);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/AuthenticationException.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/AuthenticationException.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/AuthenticationException.java
deleted file mode 100644
index 0dac04b..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/AuthenticationException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.security.api.authentication;
-
-/**
- * Thrown if there is an error during the authentication process
- */
-public class AuthenticationException extends org.apache.deltaspike.security.api.SecurityException
-{
-    private static final long serialVersionUID = -7486433031372506270L;
-
-    public AuthenticationException(String message) 
-    {
-        super(message);
-    }
-
-    public AuthenticationException(String message, Throwable cause) 
-    {
-        super(message, cause);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/UnexpectedCredentialException.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/UnexpectedCredentialException.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/UnexpectedCredentialException.java
deleted file mode 100644
index 7ab7a98..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/UnexpectedCredentialException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.security.api.authentication;
-
-public class UnexpectedCredentialException extends AuthenticationException
-{
-    private static final long serialVersionUID = 4827200587997989123L;
-
-    public UnexpectedCredentialException(String message)
-    {
-        super(message);
-    }
-
-    @SuppressWarnings("UnusedDeclaration")
-    public UnexpectedCredentialException(String message, Throwable cause)
-    {
-        super(message, cause);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/AlreadyLoggedInEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/AlreadyLoggedInEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/AlreadyLoggedInEvent.java
deleted file mode 100644
index e2d962f..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/AlreadyLoggedInEvent.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.deltaspike.security.api.authentication.event;
-
-/**
- * This event is fired when an already authenticated user attempts to authenticate again
- */
-public class AlreadyLoggedInEvent 
-{
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/LoggedInEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/LoggedInEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/LoggedInEvent.java
deleted file mode 100644
index a80b7ba..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/LoggedInEvent.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.deltaspike.security.api.authentication.event;
-
-/**
- * This event is raised when user successfully logs in.
- */
-public class LoggedInEvent 
-{
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/LoginFailedEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/LoginFailedEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/LoginFailedEvent.java
deleted file mode 100644
index 9bb1e23..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/LoginFailedEvent.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.deltaspike.security.api.authentication.event;
-
-/**
- * This event is fired when an authentication attempt fails
- */
-public class LoginFailedEvent 
-{
-    private Exception loginException;
-
-    public LoginFailedEvent(Exception loginException) 
-    {
-        this.loginException = loginException;
-    }
-
-    public Exception getLoginException() 
-    {
-        return loginException;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PostAuthenticateEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PostAuthenticateEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PostAuthenticateEvent.java
deleted file mode 100644
index 90afebf..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PostAuthenticateEvent.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.deltaspike.security.api.authentication.event;
-
-/**
- * This event is raised just after authentication
- */
-public class PostAuthenticateEvent 
-{
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PostLoggedOutEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PostLoggedOutEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PostLoggedOutEvent.java
deleted file mode 100644
index 4f047bf..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PostLoggedOutEvent.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.security.api.authentication.event;
-
-import org.apache.deltaspike.security.api.idm.User;
-
-/**
- * This event is raised just after the user un-authenticates
- */
-public class PostLoggedOutEvent 
-{
-    private User user;
-
-    public PostLoggedOutEvent(User user)
-    {
-        this.user = user;
-    }
-
-    public User getUser()
-    {
-        return user;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PreAuthenticateEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PreAuthenticateEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PreAuthenticateEvent.java
deleted file mode 100644
index ae548f1..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PreAuthenticateEvent.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.security.api.authentication.event;
-
-/**
- * This event is raised just before authentication.
- */
-public class PreAuthenticateEvent 
-{
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PreLoggedOutEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PreLoggedOutEvent.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PreLoggedOutEvent.java
deleted file mode 100644
index 3fd7d9f..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authentication/event/PreLoggedOutEvent.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.security.api.authentication.event;
-
-import org.apache.deltaspike.security.api.idm.User;
-
-/**
- * This event is raised just before the user un-authenticates
- */
-public class PreLoggedOutEvent 
-{
-    private User user;
-
-    public PreLoggedOutEvent(User user)
-    {
-        this.user = user;
-    }
-
-    public User getUser()
-    {
-        return user;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/credential/Credential.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/credential/Credential.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/credential/Credential.java
deleted file mode 100644
index bfad55c..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/credential/Credential.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.security.api.credential;
-
-/**
- * Contains a single credential, such as a password
- */
-public interface Credential<T>
-{
-    T getValue();
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/credential/LoginCredentials.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/credential/LoginCredentials.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/credential/LoginCredentials.java
deleted file mode 100644
index bf0bf17..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/credential/LoginCredentials.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.security.api.credential;
-
-/**
- * Represents the credentials the current user will use to authenticate
- * Only valid during the authentication process
- */
-public interface LoginCredentials
-{
-    String getUserId();
-
-    void setUserId(String userId);
-    
-    Credential getCredential();
-
-    void setCredential(Credential credential);
-
-    void invalidate();
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/idm/AbstractIdentityType.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/idm/AbstractIdentityType.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/idm/AbstractIdentityType.java
deleted file mode 100644
index 236bbca..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/idm/AbstractIdentityType.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.security.api.idm;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * Abstract base class for IdentityType implementations 
- */
-public abstract class AbstractIdentityType implements IdentityType
-{
-    private String key;
-    private boolean enabled = true;
-    private Date creationDate = null;
-    private Date expirationDate = null;
-    private Map<String,String[]> attributes = new HashMap<String,String[]>();
-    
-    @Override
-    public String getKey()
-    {
-        return this.key;
-    }
-
-    @Override
-    public boolean isEnabled()
-    {
-        return this.enabled;
-    }
-
-    @Override
-    public Date getExpirationDate()
-    {
-        return this.expirationDate;
-    }
-
-    @Override
-    public Date getCreationDate()
-    {
-        return this.creationDate;
-    }
-
-    @Override
-    public void setAttribute(String name, String value)
-    {
-        attributes.put(name, new String[]{value});        
-    }
-
-    @Override
-    public void setAttribute(String name, String[] values)
-    {
-        attributes.put(name,  values);
-    }
-
-    @Override
-    public void removeAttribute(String name)
-    {
-        attributes.remove(name);
-    }
-
-    @Override
-    public String getAttribute(String name)
-    {
-        String[] vals = attributes.get(name);
-        return null == vals ? null : ((vals.length != 0) ? vals[0] : null);
-    }
-
-    @Override
-    public String[] getAttributeValues(String name)
-    {
-        return attributes.get(name);
-    }
-
-    @Override
-    public Map<String, String[]> getAttributes()
-    {
-        return java.util.Collections.unmodifiableMap(attributes);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/79b06715/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/idm/Group.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/idm/Group.java b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/idm/Group.java
deleted file mode 100644
index 6dc3361..0000000
--- a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/idm/Group.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.security.api.idm;
-
-
-/**
- * Group representation
- */
-public interface Group extends IdentityType
-{
-    //TODO: Javadocs
-    //TODO: Exceptions
-
-    //TODO: getId() -> getPath()? Should it stick to natural Id(path) or have non meaningful one
-
-    // Self related
-
-    /**
-     * Groups are stored in tree hierarchy and therefore ID represents a path. ID string always
-     * begins with "/" element that represents root of the tree
-     * <p/>
-     * Example: Valid IDs are "/acme/departments/marketing", "/security/administrator" or "/administrator".
-     * Where "acme", "departments", "marketing", "security" and "administrator" are group names.
-     *
-     * @return Group Id in String representation.
-     */
-    String getId();
-
-    /**
-     * Group name is unique identifier in specific group tree branch. For example
-     * group with id "/acme/departments/marketing" will have name "marketing" and
-     * parent group of id "/acme/departments"
-     *
-     * @return name
-     */
-    String getName();
-
-    // Sub groups
-
-    /**
-     * @return parent group or null if it refers to root ("/") in a group tree.
-     */
-    Group getParentGroup();
-
-}