[jboss-cvs] Picketlink SVN: r807 - in idm/branches/2.0.0: picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2011-03-10 13:49:55 -0500 (Thu, 10 Mar 2011)
New Revision: 807

Modified:
   idm/branches/2.0.0/assembly/scripts/assembly-distro.xml
   idm/branches/2.0.0/assembly/scripts/assembly-single-jar.xml
   idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStoreRepository.java
Log:
minor cleanup

Modified: idm/branches/2.0.0/assembly/scripts/assembly-distro.xml
===================================================================
--- idm/branches/2.0.0/assembly/scripts/assembly-distro.xml	2011-03-09 19:09:48 UTC (rev 806)
+++ idm/branches/2.0.0/assembly/scripts/assembly-distro.xml	2011-03-10 18:49:55 UTC (rev 807)
@@ -97,6 +97,10 @@
       <directory>../picketlink-idm-core/src/main/java</directory>
       <outputDirectory>src</outputDirectory>
     </fileSet>
+    <fileSet>
+      <directory>../picketlink-idm-memory/src/main/java</directory>
+      <outputDirectory>src</outputDirectory>
+    </fileSet>
 
   <!--
     <fileSet>

Modified: idm/branches/2.0.0/assembly/scripts/assembly-single-jar.xml
===================================================================
--- idm/branches/2.0.0/assembly/scripts/assembly-single-jar.xml	2011-03-09 19:09:48 UTC (rev 806)
+++ idm/branches/2.0.0/assembly/scripts/assembly-single-jar.xml	2011-03-10 18:49:55 UTC (rev 807)
@@ -21,6 +21,12 @@
       <outputDirectory>/</outputDirectory>
     </fileSet>
     <fileSet>
+      <directory>${basedir}/../picketlink-idm-memory/target/classes/</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+
+   <!--
+    <fileSet>
       <directory>${basedir}/../picketlink-idm-cache/target/classes/</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>
@@ -55,5 +61,8 @@
       </excludes>
       <outputDirectory>/</outputDirectory>
     </fileSet>
+    -->
+
+
   </fileSets>
 </assembly>

Modified: idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStoreRepository.java
===================================================================
--- idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStoreRepository.java	2011-03-09 19:09:48 UTC (rev 806)
+++ idm/branches/2.0.0/picketlink-idm-memory/src/main/java/org/picketlink/idm/impl/store/memory/MemoryIdentityStoreRepository.java	2011-03-10 18:49:55 UTC (rev 807)
@@ -22,13 +22,11 @@
 package org.picketlink.idm.impl.store.memory;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
 import org.picketlink.idm.common.exception.IdentityException;
-import org.picketlink.idm.core.factories.IdentityFactory;
 import org.picketlink.idm.spi.configuration.IdentityRepositoryConfigurationContext;
 import org.picketlink.idm.spi.configuration.IdentityStoreConfigurationContext;
 import org.picketlink.idm.spi.configuration.metadata.IdentityConfigurationMetaData;
@@ -231,9 +229,7 @@
 
    public void setRelationshipProperties(IdentityStoreInvocationContext ctx, IdentityObjectRelationship relationship,
          Map<String, String> properties) throws IdentityException, OperationNotSupportedException
-   {
-      
-
+   {  
    }
 
    public void removeRelationshipProperties(IdentityStoreInvocationContext ctx,
@@ -268,15 +264,13 @@
 
    public Set<String> getSupportedAttributeNames(IdentityStoreInvocationContext invocationContext,
          IdentityObjectType identityType) throws IdentityException
-   {   
-      
+   {    
       throw new RuntimeException( "NYI" );
    }
 
    public Map<String, IdentityObjectAttributeMetaData> getAttributesMetaData(
          IdentityStoreInvocationContext invocationContext, IdentityObjectType identityType)
-   {   
-      
+   {    
       throw new RuntimeException( "NYI" );
    }
 
@@ -288,8 +282,7 @@
 
    public IdentityObjectAttribute getAttribute(IdentityStoreInvocationContext invocationContext,
          IdentityObject identity, String name) throws IdentityException
-   {   
-      
+   {    
       throw new RuntimeException( "NYI" );
    }
 
@@ -332,6 +325,9 @@
    { 
       repoMD = configurationContext.getRepositoryConfigurationMetaData(); 
       storeMD =  configurationContext.getConfigurationMetaData().getIdentityStores().get(0);
+      
+      if( !storeMD.getClassName().contains( "MemoryIdentityStore"))
+         throw new IdentityException( "Memory Identity Store is not configured" );
    }
    
 
@@ -342,37 +338,31 @@
 
    public Set<IdentityStore> getConfiguredIdentityStores()
    {   
-      
       throw new RuntimeException( "NYI" );
    }
 
    public Set<AttributeStore> getConfiguredAttributeStores()
    {   
-      
       throw new RuntimeException( "NYI" );
    }
 
    public Map<String, IdentityStore> getIdentityStoreMappings()
    {   
-      
       throw new RuntimeException( "NYI" );
    }
 
    public Map<String, AttributeStore> getAttributeStoreMappings()
    {   
-      
       throw new RuntimeException( "NYI" );
    }
 
    public IdentityStore getIdentityStore(IdentityObjectType identityObjectType) throws IdentityException
    {   
-      
       throw new RuntimeException( "NYI" );
    }
 
    public AttributeStore getAttributeStore(IdentityObjectType identityObjectType) throws IdentityException
    {   
-      
       throw new RuntimeException( "NYI" );
    }
 }
\ No newline at end of file