[seam-commits] Seam SVN: r13089 - in modules/security/trunk/examples/idmconsole: src/main/java/org/jboss/seam/security/examples/idmconsole/model and 2 other directories.

[seam-commits at lists.jboss.org]

Author: shane.bryzak at jboss.com
Date: 2010-06-09 04:43:31 -0400 (Wed, 09 Jun 2010)
New Revision: 13089

Modified:
   modules/security/trunk/examples/idmconsole/pom.xml
   modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model/IdentityObject.java
   modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model/IdentityObjectCredential.java
   modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/beans.xml
   modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/classes/seam-beans.xml
Log:
misc


Modified: modules/security/trunk/examples/idmconsole/pom.xml
===================================================================
--- modules/security/trunk/examples/idmconsole/pom.xml	2010-06-09 02:01:11 UTC (rev 13088)
+++ modules/security/trunk/examples/idmconsole/pom.xml	2010-06-09 08:43:31 UTC (rev 13089)
@@ -90,19 +90,6 @@
          <scope>provided</scope>
       </dependency>
 
-      <dependency>
-         <groupId>org.glassfish.web</groupId>
-         <artifactId>el-impl</artifactId>
-         <scope>runtime</scope>
-         <version>2.1.2-b04</version>
-         <exclusions>
-            <exclusion>
-               <groupId>javax.el</groupId>
-               <artifactId>el-api</artifactId>
-            </exclusion>
-         </exclusions>
-      </dependency> 
-
    </dependencies>
    
    <build>    

Modified: modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model/IdentityObject.java
===================================================================
--- modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model/IdentityObject.java	2010-06-09 02:01:11 UTC (rev 13088)
+++ modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model/IdentityObject.java	2010-06-09 08:43:31 UTC (rev 13089)
@@ -7,11 +7,8 @@
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 
-import org.jboss.seam.security.annotations.management.IdentityEntityName;
-import org.jboss.seam.security.annotations.management.IdentityEntityType;
 import org.jboss.seam.security.annotations.management.IdentityProperty;
 import org.jboss.seam.security.annotations.management.PropertyType;
-import org.picketlink.idm.spi.model.IdentityObjectType;
 
 /**
  * 
@@ -54,7 +51,7 @@
       return type;
    }
    
-   public void setIdentityObjectType(IdentityObjectType type)
+   public void setType(IdentityObjectType type)
    {
       this.type = type;
    }

Modified: modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model/IdentityObjectCredential.java
===================================================================
--- modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model/IdentityObjectCredential.java	2010-06-09 02:01:11 UTC (rev 13088)
+++ modules/security/trunk/examples/idmconsole/src/main/java/org/jboss/seam/security/examples/idmconsole/model/IdentityObjectCredential.java	2010-06-09 08:43:31 UTC (rev 13089)
@@ -7,8 +7,6 @@
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 
-import org.jboss.seam.security.annotations.management.IdentityEntityType;
-import org.jboss.seam.security.annotations.management.IdentityEntityValue;
 import org.jboss.seam.security.annotations.management.IdentityProperty;
 import org.jboss.seam.security.annotations.management.PropertyType;
 

Modified: modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/beans.xml
===================================================================
--- modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/beans.xml	2010-06-09 02:01:11 UTC (rev 13088)
+++ modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/beans.xml	2010-06-09 08:43:31 UTC (rev 13089)
@@ -16,8 +16,4 @@
       </idm:identityStore>
    </idm:IdentityManager-->
    
-   <interceptors>
-      <class>org.jboss.seam.transaction.JtaTxInterceptor</class>
-   </interceptors>
-   
-</beans>
\ No newline at end of file
+</beans>

Modified: modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/classes/seam-beans.xml
===================================================================
--- modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/classes/seam-beans.xml	2010-06-09 02:01:11 UTC (rev 13088)
+++ modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/classes/seam-beans.xml	2010-06-09 08:43:31 UTC (rev 13089)
@@ -33,7 +33,7 @@
       <permission:userPermissionClass>org.jboss.seam.security.examples.seamspace.model.AccountPermission</permission:userPermissionClass>
    </permission:JpaPermissionStore-->
    
-   <drools-config:KnowledgeBaseConfig>
+   <!--drools-config:KnowledgeBaseConfig>
    		<s:overrides/>
    		<drools-qualifier:KBaseConfig value="security-rules-config"/>
    		<drools-config:knowledgeBuilderConfig>kbuilderconfig.properties</drools-config:knowledgeBuilderConfig>
@@ -44,9 +44,9 @@
    		<drools-config:eventListeners>
    			<s:value>org.drools.event.knowledgebase.DefaultKnowledgeBaseEventListener</s:value>
    		</drools-config:eventListeners>
-   </drools-config:KnowledgeBaseConfig>
+   </drools-config:KnowledgeBaseConfig-->
    
-   <drools:KnowledgeBaseProducer>
+   <!--drools:KnowledgeBaseProducer>
    		<s:specializes/>
    		<drools:produceKBase>
    		   <drools-qualifier:KBase value="permission-rules"/>
@@ -57,7 +57,7 @@
    		 	    </drools-config:KnowledgeBaseConfig>
    		 	 </s:parameters>
       </drools:produceKBase>
-   </drools:KnowledgeBaseProducer>
+   </drools:KnowledgeBaseProducer-->
    
    <!--permission:RuleBasedPermissionResolver>
       <s:specializes/>
@@ -67,4 +67,4 @@
       </permission:securityRules>
    </permission:RuleBasedPermissionResolver-->
        
-</beans>
\ No newline at end of file
+</beans>