Permalink
Browse files

refactor ResourceObject

  • Loading branch information...
1 parent ca6ba6d commit f0058f9bbe2373b1fc56b97e7fc0e2bbb359d154 @wstrange committed Apr 21, 2011
Showing with 1,021 additions and 384 deletions.
  1. +2 −2 smidm.iml
  2. +14 −44 smidm.ipr
  3. +538 −31 smidm.iws
  4. +9 −1 src/main/scala/com/my2do/idm/connector/util/ConnectorObjectWrapper.scala
  5. +3 −4 src/main/scala/com/my2do/idm/dao/AccountIndexDAO.scala
  6. +1 −5 src/main/scala/com/my2do/idm/dao/DAO.scala
  7. +22 −62 src/main/scala/com/my2do/idm/dao/ResourceDAO.scala
  8. +37 −43 src/main/scala/com/my2do/idm/mongo/ICFacade.scala
  9. +1 −1 src/main/scala/com/my2do/idm/objects/AccountIndex.scala
  10. +10 −7 src/main/scala/com/my2do/idm/objects/Entitlement.scala
  11. +91 −0 src/main/scala/com/my2do/idm/objects/ResourceObject.scala
  12. +3 −0 src/main/scala/com/my2do/idm/objects/User.scala
  13. +2 −2 src/main/scala/com/my2do/idm/objects/UserRoleView.scala
  14. +41 −34 src/main/scala/com/my2do/idm/objects/UserView.scala
  15. +2 −15 src/main/scala/com/my2do/idm/rules/AccountRules.scala
  16. +81 −0 src/main/scala/com/my2do/idm/rules/CorrelationRule.scala
  17. +4 −8 src/main/scala/com/my2do/idm/rules/FFRules.scala
  18. +15 −21 src/main/scala/com/my2do/idm/rules/LDAPRules.scala
  19. +16 −16 src/main/scala/com/my2do/idm/sync/ReconManager.scala
  20. +27 −22 src/main/scala/com/my2do/idm/sync/SyncManager.scala
  21. +29 −33 src/main/scala/config/FlatFileConnectorDefaultConfig.scala
  22. +1 −1 src/main/scala/config/FlatFile_TestFile.scala
  23. +3 −4 src/test/resources/test1.csv
  24. +1 −1 src/test/scala/com/my2do/idm/test/DataGenerator.scala
  25. +5 −13 src/test/scala/com/my2do/idm/test/FunTest.scala
  26. +39 −0 src/test/scala/com/my2do/idm/test/ResourceDAOTest.scala
  27. +5 −5 src/test/scala/com/my2do/idm/test/RoleTest.scala
  28. +19 −9 src/test/scala/com/my2do/idm/test/SyncTest.scala
View
@@ -23,18 +23,18 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.novus:salat-core_2.8.1:0.0.7-SNAPSHOT" level="project" />
+ <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:2.5.3" level="project" />
<orderEntry type="library" name="Maven: org.scala-lang:scalap:2.8.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-compiler:2.8.1" level="project" />
<orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.8.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.5.5" level="project" />
<orderEntry type="library" name="Maven: com.mongodb.casbah:casbah-core_2.8.1:2.1.2" level="project" />
<orderEntry type="library" name="Maven: com.mongodb.casbah:casbah-commons_2.8.1:2.1.2" level="project" />
- <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:2.5.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
<orderEntry type="library" name="Maven: org.scalaj:scalaj-collection_2.8.0:1.0" level="project" />
<orderEntry type="library" name="Maven: org.scala-tools.time:time_2.8.0:0.2" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:1.6" level="project" />
<orderEntry type="library" name="Maven: com.mongodb.casbah:casbah-query_2.8.1:2.1.2" level="project" />
- <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.5.5" level="project" />
<orderEntry type="library" name="Maven: com.mongodb.casbah:casbah-gridfs_2.8.1:2.1.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.1" level="project" />
<orderEntry type="library" name="Maven: org.scalatest:scalatest:1.3" level="project" />
View
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
+ <component name="AntConfiguration">
+ <defaultAnt bundledAnt="true" />
+ </component>
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
<resourceExtensions />
@@ -17,8 +20,17 @@
</wildcardResourcePatterns>
<annotationProcessing enabled="false" useClasspath="true" />
</component>
- <component name="CopyrightManager" default="">
- <module2copyright />
+ <component name="CopyrightManager" default="gpl">
+ <copyright>
+ <option name="notice" value="Copyright (c) &amp;#36;today.year Warren Strange&#10;&#10;This program is free software: you can redistribute it and/or modify&#10;it under the terms of the GNU General Public License as published by&#10;the Free Software Foundation, either version 3 of the License, or&#10;(at your option) any later version.&#10;&#10;This program is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the&#10;GNU General Public License for more details.&#10;&#10;You should have received a copy of the GNU General Public License&#10;along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;." />
+ <option name="keyword" value="Copyright" />
+ <option name="allowReplaceKeyword" value="" />
+ <option name="myName" value="gpl" />
+ <option name="myLocal" value="true" />
+ </copyright>
+ <module2copyright>
+ <element module="All" copyright="gpl" />
+ </module2copyright>
</component>
<component name="DependencyValidationManager">
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
@@ -502,47 +514,5 @@
</SOURCES>
</library>
</component>
- <component name="masterDetails">
- <states>
- <state key="ArtifactsStructureConfigurable.UI">
- <settings>
- <artifact-editor />
- <splitter-proportions />
- </settings>
- </state>
- <state key="FacetStructureConfigurable.UI">
- <settings>
- <splitter-proportions />
- </settings>
- </state>
- <state key="GlobalLibrariesConfigurable.UI">
- <settings>
- <splitter-proportions />
- </settings>
- </state>
- <state key="ModuleStructureConfigurable.UI">
- <settings>
- <splitter-proportions />
- </settings>
- </state>
- <state key="ProjectJDKs.UI">
- <settings>
- <last-edited>1.6</last-edited>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="ProjectLibrariesConfigurable.UI">
- <settings>
- <splitter-proportions />
- </settings>
- </state>
- </states>
- </component>
</project>
Oops, something went wrong.

0 comments on commit f0058f9

Please sign in to comment.