Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:wstrange/smidm

Conflicts:
	src/main/scala/com/my2do/idm/objects/User.scala
	src/main/scala/com/my2do/idm/objects/UserView.scala
  • Loading branch information...
commit 47cc541ce660dc92d36895d60d4bd87ec390d1e2 2 parents b6a1b95 + 587a663
@wstrange authored
View
10 .classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/scala"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/scala"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
View
10 .gitignore
@@ -1,5 +1,5 @@
-/lib_managed
-/target
-/.settings
-/.scala_dependencies
-
+/lib_managed
+/target
+/.settings
+/.scala_dependencies
+
View
24 .project
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>smidm</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.scala-ide.sdt.core.scalabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.scala-ide.sdt.core.scalanature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
View
556 .scala_dependencies
480 additions, 76 deletions not shown
View
33 pom.xml
@@ -11,7 +11,7 @@
<maven-compiler-plugin.version>2.3.1</maven-compiler-plugin.version>
<maven-jetty-plugin.version>6.1.24</maven-jetty-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <scala.version>2.8.1</scala.version>
+ <scala.version>2.8.0</scala.version>
</properties>
<!-- A local Nexus repo is used to build - so there are some missing repos that are not declared here
@@ -62,16 +62,18 @@
<dependencies>
<dependency>
<groupId>com.novus</groupId>
- <artifactId>salat-core_2.8.1</artifactId>
+ <artifactId>salat-core_${scala.version}</artifactId>
<version>0.0.8-SNAPSHOT</version>
</dependency>
+<!-- See if salat picks this up...
<dependency>
<groupId>com.mongodb.casbah</groupId>
- <artifactId>casbah_2.8.1</artifactId>
+ <artifactId>casbah_${scala.version}</artifactId>
<version>2.1.2</version>
<type>pom</type>
</dependency>
+ -->
<!--Test dependencies -->
@@ -84,8 +86,8 @@
<dependency>
<groupId>org.scalatest</groupId>
- <artifactId>scalatest</artifactId>
- <version>1.3</version>
+ <artifactId>scalatest_${scala.version}</artifactId>
+ <version>1.4.1</version>
</dependency>
<dependency>
@@ -122,11 +124,6 @@
</dependency>
<dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>${scala.version}</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.1</version>
@@ -159,18 +156,28 @@
<version>${scala.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+
<dependency>
<groupId>net.liftweb</groupId>
- <artifactId>lift-common_2.8.1</artifactId>
- <version>2.2</version>
+ <artifactId>lift-common_${scala.version}.RC3</artifactId>
+ <version>2.4-SNAPSHOT</version>
</dependency>
+ <!--
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>
+
+ -->
</dependencies>
@@ -182,7 +189,7 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
- <version>2.14.3</version>
+ <version>2.15.2</version>
<configuration>
<charset>${project.build.sourceEncoding}</charset>
<jvmArgs>
View
25 smidm.iml
@@ -4,7 +4,7 @@
<facet type="scala" name="Scala">
<configuration>
<option name="compilerLibraryLevel" value="Project" />
- <option name="compilerLibraryName" value="Maven: org.scala-lang:scala-compiler-bundle:WrappedArray(2.8.1)" />
+ <option name="compilerLibraryName" value="Maven: org.scala-lang:scala-compiler-bundle:WrappedArray(2.8.0)" />
<option name="deprecationWarnings" value="true" />
<option name="maximumHeapSize" value="1024" />
<option name="vmOptions" value="-DpackageLinkDefs=file:///home/warren/src/smidm/target/packageLinkDefs.properties" />
@@ -22,33 +22,22 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.novus:salat-core_2.8.1:0.0.8-SNAPSHOT" level="project" />
- <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:2.5.3" 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.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-lang:scala-library:2.8.1" 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: 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: 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" name="Maven: com.novus:salat-core_2.8.0:0.0.8-SNAPSHOT" 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" />
+ <orderEntry type="library" name="Maven: org.scalatest:scalatest_2.8.0:1.4.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.8.4" level="project" />
<orderEntry type="library" name="Maven: org.identityconnectors:connector-framework-internal:1.1.5559" level="project" />
<orderEntry type="library" name="Maven: org.identityconnectors:connector-framework:1.1.5559" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.identityconnectors:org.identityconnectors.ldap:1.0.5754openidm" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.identityconnectors:org.identityconnectors.flatfile:1.0.2838" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:0.9.26" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:0.9.26" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1" level="project" />
- <orderEntry type="library" name="Maven: net.liftweb:lift-common_2.8.1:2.2" level="project" />
- <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.scala-lang:scala-compiler:2.8.0" level="project" />
+ <orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.8.0" level="project" />
+ <orderEntry type="library" name="Maven: net.liftweb:lift-common_2.8.0.RC3:2.4-SNAPSHOT" level="project" />
</component>
</module>
View
165 smidm.ipr
@@ -254,59 +254,15 @@
<root url="jar://$M2_REPO$/ch/qos/logback/logback-core/0.9.26/logback-core-0.9.26-sources.jar!/" />
</SOURCES>
</library>
- <library name="Maven: com.mongodb.casbah:casbah-commons_2.8.1:2.1.2">
+ <library name="Maven: com.novus:salat-core_2.8.0:0.0.8-SNAPSHOT">
<CLASSES>
- <root url="jar://$M2_REPO$/com/mongodb/casbah/casbah-commons_2.8.1/2.1.2/casbah-commons_2.8.1-2.1.2.jar!/" />
+ <root url="jar://$M2_REPO$/com/novus/salat-core_2.8.0/0.0.8-SNAPSHOT/salat-core_2.8.0-0.0.8-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
- <root url="jar://$M2_REPO$/com/mongodb/casbah/casbah-commons_2.8.1/2.1.2/casbah-commons_2.8.1-2.1.2-javadoc.jar!/" />
+ <root url="jar://$M2_REPO$/com/novus/salat-core_2.8.0/0.0.8-SNAPSHOT/salat-core_2.8.0-0.0.8-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
- <root url="jar://$M2_REPO$/com/mongodb/casbah/casbah-commons_2.8.1/2.1.2/casbah-commons_2.8.1-2.1.2-sources.jar!/" />
- </SOURCES>
- </library>
- <library name="Maven: com.mongodb.casbah:casbah-core_2.8.1:2.1.2">
- <CLASSES>
- <root url="jar://$M2_REPO$/com/mongodb/casbah/casbah-core_2.8.1/2.1.2/casbah-core_2.8.1-2.1.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$M2_REPO$/com/mongodb/casbah/casbah-core_2.8.1/2.1.2/casbah-core_2.8.1-2.1.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$M2_REPO$/com/mongodb/casbah/casbah-core_2.8.1/2.1.2/casbah-core_2.8.1-2.1.2-sources.jar!/" />
- </SOURCES>
- </library>
- <library name="Maven: com.mongodb.casbah:casbah-gridfs_2.8.1:2.1.2">
- <CLASSES>
- <root url="jar://$M2_REPO$/com/mongodb/casbah/casbah-gridfs_2.8.1/2.1.2/casbah-gridfs_2.8.1-2.1.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$M2_REPO$/com/mongodb/casbah/casbah-gridfs_2.8.1/2.1.2/casbah-gridfs_2.8.1-2.1.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$M2_REPO$/com/mongodb/casbah/casbah-gridfs_2.8.1/2.1.2/casbah-gridfs_2.8.1-2.1.2-sources.jar!/" />
- </SOURCES>
- </library>
- <library name="Maven: com.mongodb.casbah:casbah-query_2.8.1:2.1.2">
- <CLASSES>
- <root url="jar://$M2_REPO$/com/mongodb/casbah/casbah-query_2.8.1/2.1.2/casbah-query_2.8.1-2.1.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$M2_REPO$/com/mongodb/casbah/casbah-query_2.8.1/2.1.2/casbah-query_2.8.1-2.1.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$M2_REPO$/com/mongodb/casbah/casbah-query_2.8.1/2.1.2/casbah-query_2.8.1-2.1.2-sources.jar!/" />
- </SOURCES>
- </library>
- <library name="Maven: com.novus:salat-core_2.8.1:0.0.8-SNAPSHOT">
- <CLASSES>
- <root url="jar://$M2_REPO$/com/novus/salat-core_2.8.1/0.0.8-SNAPSHOT/salat-core_2.8.1-0.0.8-SNAPSHOT.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$M2_REPO$/com/novus/salat-core_2.8.1/0.0.8-SNAPSHOT/salat-core_2.8.1-0.0.8-SNAPSHOT-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$M2_REPO$/com/novus/salat-core_2.8.1/0.0.8-SNAPSHOT/salat-core_2.8.1-0.0.8-SNAPSHOT-sources.jar!/" />
+ <root url="jar://$M2_REPO$/com/novus/salat-core_2.8.0/0.0.8-SNAPSHOT/salat-core_2.8.0-0.0.8-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
<library name="Maven: commons-logging:commons-logging:1.1.1">
@@ -320,39 +276,6 @@
<root url="jar://$M2_REPO$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar!/" />
</SOURCES>
</library>
- <library name="Maven: commons-pool:commons-pool:1.5.5">
- <CLASSES>
- <root url="jar://$M2_REPO$/commons-pool/commons-pool/1.5.5/commons-pool-1.5.5.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$M2_REPO$/commons-pool/commons-pool/1.5.5/commons-pool-1.5.5-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$M2_REPO$/commons-pool/commons-pool/1.5.5/commons-pool-1.5.5-sources.jar!/" />
- </SOURCES>
- </library>
- <library name="Maven: javax.inject:javax.inject:1">
- <CLASSES>
- <root url="jar://$M2_REPO$/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$M2_REPO$/javax/inject/javax.inject/1/javax.inject-1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$M2_REPO$/javax/inject/javax.inject/1/javax.inject-1-sources.jar!/" />
- </SOURCES>
- </library>
- <library name="Maven: joda-time:joda-time:1.6">
- <CLASSES>
- <root url="jar://$M2_REPO$/joda-time/joda-time/1.6/joda-time-1.6.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$M2_REPO$/joda-time/joda-time/1.6/joda-time-1.6-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$M2_REPO$/joda-time/joda-time/1.6/joda-time-1.6-sources.jar!/" />
- </SOURCES>
- </library>
<library name="Maven: junit:junit:4.8.1">
<CLASSES>
<root url="jar://$M2_REPO$/junit/junit/4.8.1/junit-4.8.1.jar!/" />
@@ -364,15 +287,15 @@
<root url="jar://$M2_REPO$/junit/junit/4.8.1/junit-4.8.1-sources.jar!/" />
</SOURCES>
</library>
- <library name="Maven: net.liftweb:lift-common_2.8.1:2.2">
+ <library name="Maven: net.liftweb:lift-common_2.8.0.RC3:2.4-SNAPSHOT">
<CLASSES>
- <root url="jar://$M2_REPO$/net/liftweb/lift-common_2.8.1/2.2/lift-common_2.8.1-2.2.jar!/" />
+ <root url="jar://$M2_REPO$/net/liftweb/lift-common_2.8.0.RC3/2.4-SNAPSHOT/lift-common_2.8.0.RC3-2.4-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
- <root url="jar://$M2_REPO$/net/liftweb/lift-common_2.8.1/2.2/lift-common_2.8.1-2.2-javadoc.jar!/" />
+ <root url="jar://$M2_REPO$/net/liftweb/lift-common_2.8.0.RC3/2.4-SNAPSHOT/lift-common_2.8.0.RC3-2.4-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
- <root url="jar://$M2_REPO$/net/liftweb/lift-common_2.8.1/2.2/lift-common_2.8.1-2.2-sources.jar!/" />
+ <root url="jar://$M2_REPO$/net/liftweb/lift-common_2.8.0.RC3/2.4-SNAPSHOT/lift-common_2.8.0.RC3-2.4-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
<library name="Maven: org.identityconnectors:connector-framework-internal:1.1.5559">
@@ -430,16 +353,13 @@
<root url="jar://$M2_REPO$/org/mockito/mockito-all/1.8.4/mockito-all-1.8.4-sources.jar!/" />
</SOURCES>
</library>
- <library name="Maven: org.mongodb:mongo-java-driver:2.5.3">
+ <library name="Maven: org.scala-lang:scala-compiler-bundle:WrappedArray(2.8.0)">
<CLASSES>
- <root url="jar://$M2_REPO$/org/mongodb/mongo-java-driver/2.5.3/mongo-java-driver-2.5.3.jar!/" />
+ <root url="jar://$M2_REPO$/org/scala-lang/scala-compiler/2.8.0/scala-compiler-2.8.0.jar!/" />
+ <root url="jar://$M2_REPO$/org/scala-lang/scala-library/2.8.0/scala-library-2.8.0.jar!/" />
</CLASSES>
- <JAVADOC>
- <root url="jar://$M2_REPO$/org/mongodb/mongo-java-driver/2.5.3/mongo-java-driver-2.5.3-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$M2_REPO$/org/mongodb/mongo-java-driver/2.5.3/mongo-java-driver-2.5.3-sources.jar!/" />
- </SOURCES>
+ <JAVADOC />
+ <SOURCES />
</library>
<library name="Maven: org.scala-lang:scala-compiler-bundle:WrappedArray(2.8.1)">
<CLASSES>
@@ -449,70 +369,45 @@
<JAVADOC />
<SOURCES />
</library>
- <library name="Maven: org.scala-lang:scala-compiler:2.8.1">
- <CLASSES>
- <root url="jar://$M2_REPO$/org/scala-lang/scala-compiler/2.8.1/scala-compiler-2.8.1.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$M2_REPO$/org/scala-lang/scala-compiler/2.8.1/scala-compiler-2.8.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$M2_REPO$/org/scala-lang/scala-compiler/2.8.1/scala-compiler-2.8.1-sources.jar!/" />
- </SOURCES>
- </library>
- <library name="Maven: org.scala-lang:scala-library:2.8.1">
+ <library name="Maven: org.scala-lang:scala-compiler-bundle:WrappedArray(2.9.0)">
<CLASSES>
- <root url="jar://$M2_REPO$/org/scala-lang/scala-library/2.8.1/scala-library-2.8.1.jar!/" />
+ <root url="jar://$M2_REPO$/org/scala-lang/scala-compiler/2.9.0/scala-compiler-2.9.0.jar!/" />
+ <root url="jar://$M2_REPO$/org/scala-lang/scala-library/2.9.0/scala-library-2.9.0.jar!/" />
</CLASSES>
- <JAVADOC>
- <root url="jar://$M2_REPO$/org/scala-lang/scala-library/2.8.1/scala-library-2.8.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$M2_REPO$/org/scala-lang/scala-library/2.8.1/scala-library-2.8.1-sources.jar!/" />
- </SOURCES>
- </library>
- <library name="Maven: org.scala-lang:scalap:2.8.1">
- <CLASSES>
- <root url="jar://$M2_REPO$/org/scala-lang/scalap/2.8.1/scalap-2.8.1.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$M2_REPO$/org/scala-lang/scalap/2.8.1/scalap-2.8.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$M2_REPO$/org/scala-lang/scalap/2.8.1/scalap-2.8.1-sources.jar!/" />
- </SOURCES>
+ <JAVADOC />
+ <SOURCES />
</library>
- <library name="Maven: org.scala-tools.time:time_2.8.0:0.2">
+ <library name="Maven: org.scala-lang:scala-compiler:2.8.0">
<CLASSES>
- <root url="jar://$M2_REPO$/org/scala-tools/time/time_2.8.0/0.2/time_2.8.0-0.2.jar!/" />
+ <root url="jar://$M2_REPO$/org/scala-lang/scala-compiler/2.8.0/scala-compiler-2.8.0.jar!/" />
</CLASSES>
<JAVADOC>
- <root url="jar://$M2_REPO$/org/scala-tools/time/time_2.8.0/0.2/time_2.8.0-0.2-javadoc.jar!/" />
+ <root url="jar://$M2_REPO$/org/scala-lang/scala-compiler/2.8.0/scala-compiler-2.8.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
- <root url="jar://$M2_REPO$/org/scala-tools/time/time_2.8.0/0.2/time_2.8.0-0.2-sources.jar!/" />
+ <root url="jar://$M2_REPO$/org/scala-lang/scala-compiler/2.8.0/scala-compiler-2.8.0-sources.jar!/" />
</SOURCES>
</library>
- <library name="Maven: org.scalaj:scalaj-collection_2.8.0:1.0">
+ <library name="Maven: org.scala-lang:scala-library:2.8.0">
<CLASSES>
- <root url="jar://$M2_REPO$/org/scalaj/scalaj-collection_2.8.0/1.0/scalaj-collection_2.8.0-1.0.jar!/" />
+ <root url="jar://$M2_REPO$/org/scala-lang/scala-library/2.8.0/scala-library-2.8.0.jar!/" />
</CLASSES>
<JAVADOC>
- <root url="jar://$M2_REPO$/org/scalaj/scalaj-collection_2.8.0/1.0/scalaj-collection_2.8.0-1.0-javadoc.jar!/" />
+ <root url="jar://$M2_REPO$/org/scala-lang/scala-library/2.8.0/scala-library-2.8.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
- <root url="jar://$M2_REPO$/org/scalaj/scalaj-collection_2.8.0/1.0/scalaj-collection_2.8.0-1.0-sources.jar!/" />
+ <root url="jar://$M2_REPO$/org/scala-lang/scala-library/2.8.0/scala-library-2.8.0-sources.jar!/" />
</SOURCES>
</library>
- <library name="Maven: org.scalatest:scalatest:1.3">
+ <library name="Maven: org.scalatest:scalatest_2.8.0:1.4.1">
<CLASSES>
- <root url="jar://$M2_REPO$/org/scalatest/scalatest/1.3/scalatest-1.3.jar!/" />
+ <root url="jar://$M2_REPO$/org/scalatest/scalatest_2.8.0/1.4.1/scalatest_2.8.0-1.4.1.jar!/" />
</CLASSES>
<JAVADOC>
- <root url="jar://$M2_REPO$/org/scalatest/scalatest/1.3/scalatest-1.3-javadoc.jar!/" />
+ <root url="jar://$M2_REPO$/org/scalatest/scalatest_2.8.0/1.4.1/scalatest_2.8.0-1.4.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
- <root url="jar://$M2_REPO$/org/scalatest/scalatest/1.3/scalatest-1.3-sources.jar!/" />
+ <root url="jar://$M2_REPO$/org/scalatest/scalatest_2.8.0/1.4.1/scalatest_2.8.0-1.4.1-sources.jar!/" />
</SOURCES>
</library>
<library name="Maven: org.slf4j:jcl-over-slf4j:1.6.1">
View
68 smidm.iws
@@ -2,10 +2,19 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="c59bc522-cabd-4580-8af5-85186051837a" name="Default" comment="">
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.classpath" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.project" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.scala_dependencies" afterPath="$PROJECT_DIR$/.scala_dependencies" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/smidm.iml" afterPath="$PROJECT_DIR$/smidm.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/smidm.ipr" afterPath="$PROJECT_DIR$/smidm.ipr" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/smidm.iws" afterPath="$PROJECT_DIR$/smidm.iws" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/scala/com/my2do/idm/objects/User.scala" afterPath="$PROJECT_DIR$/src/main/scala/com/my2do/idm/objects/User.scala" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/scala/com/my2do/idm/objects/UserView.scala" afterPath="$PROJECT_DIR$/src/main/scala/com/my2do/idm/objects/UserView.scala" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/scala/com/my2do/idm/test/MongoTest.scala" afterPath="$PROJECT_DIR$/src/test/scala/com/my2do/idm/test/MongoTest.scala" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/scala/com/my2do/idm/test/RoleTest.scala" afterPath="$PROJECT_DIR$/src/test/scala/com/my2do/idm/test/RoleTest.scala" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/scala/com/my2do/idm/test/SyncTest.scala" afterPath="$PROJECT_DIR$/src/test/scala/com/my2do/idm/test/SyncTest.scala" />
</list>
<ignored path="smidm.iws" />
<ignored path=".idea/workspace.xml" />
@@ -72,7 +81,7 @@
<file leaf-file-name="SyncTest.scala" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/scala/com/my2do/idm/test/SyncTest.scala">
<provider selected="true" editor-type-id="text-editor">
- <state line="112" column="26" selection-start="3785" selection-end="3785" vertical-scroll-proportion="0.0">
+ <state line="117" column="26" selection-start="3925" selection-end="3925" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -96,37 +105,37 @@
</provider>
</entry>
</file>
- <file leaf-file-name="README.md" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/README.md">
+ <file leaf-file-name="TODO" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/test/resources/TODO">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="60" selection-start="497" selection-end="497" vertical-scroll-proportion="0.0">
+ <state line="5" column="16" selection-start="47" selection-end="47" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="TODO" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/resources/TODO">
+ <file leaf-file-name="User.scala" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/scala/com/my2do/idm/objects/User.scala">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="16" selection-start="47" selection-end="47" vertical-scroll-proportion="0.0">
+ <state line="59" column="36" selection-start="1712" selection-end="1712" vertical-scroll-proportion="1.9666667">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="User.scala" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/scala/com/my2do/idm/objects/User.scala">
+ <file leaf-file-name="UserView.scala" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/scala/com/my2do/idm/objects/UserView.scala">
<provider selected="true" editor-type-id="text-editor">
- <state line="62" column="36" selection-start="2027" selection-end="2027" vertical-scroll-proportion="0.0">
+ <state line="227" column="34" selection-start="7178" selection-end="7178" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="UserView.scala" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/scala/com/my2do/idm/objects/UserView.scala">
+ <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="224" column="36" selection-start="7079" selection-end="7079" vertical-scroll-proportion="0.773913">
+ <state line="15" column="32" selection-start="818" selection-end="818" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -177,7 +186,6 @@
<option value="$PROJECT_DIR$/src/main/scala/com/my2do/idm/dao/UserDAO.scala" />
<option value="$PROJECT_DIR$/src/main/scala/com/my2do/idm/objects/Entitlement.scala" />
<option value="$PROJECT_DIR$/src/main/scala/com/my2do/idm/objects/ResourceRef.scala" />
- <option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/scala/com/my2do/idm/dao/ResourceDAO.scala" />
<option value="$PROJECT_DIR$/src/main/scala/com/my2do/idm/sync/SyncManager.scala" />
<option value="$PROJECT_DIR$/src/test/scala/com/my2do/idm/test/TestData.scala" />
@@ -189,6 +197,7 @@
<option value="$PROJECT_DIR$/src/main/scala/com/my2do/idm/objects/ResourceObject.scala" />
<option value="$PROJECT_DIR$/src/main/scala/com/my2do/idm/objects/User.scala" />
<option value="$PROJECT_DIR$/src/main/scala/com/my2do/idm/objects/UserView.scala" />
+ <option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
</component>
@@ -1045,15 +1054,15 @@
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.28157896" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39923468" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32894737" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.30131578" sideWeight="0.9928109" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
- <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1675054" sideWeight="0.56578946" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1675054" sideWeight="0.67105263" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39683682" sideWeight="0.54557824" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27390367" sideWeight="0.56578946" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27390367" sideWeight="0.67105263" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.43421054" sideWeight="0.64917326" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.43421054" sideWeight="0.64917326" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="SBT Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -1086,7 +1095,7 @@
<option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
<option name="DEFAULT_PATCH_EXTENSION" value="patch" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="added group operations" />
+ <option name="LAST_COMMIT_MESSAGE" value="changed to Map" />
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -1104,6 +1113,7 @@
<MESSAGE value="README" />
<MESSAGE value="refactor - moving objectclass into resourceobject" />
<MESSAGE value="added group operations" />
+ <MESSAGE value="changed to Map" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
@@ -1113,11 +1123,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/scala/com/my2do/idm/objects/Entitlement.scala">
- <provider selected="true" editor-type-id="text-editor">
- <state line="65" column="58" selection-start="1938" selection-end="1938" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
<entry file="jar://$M2_REPO$/com/novus/salat-core_2.8.1/0.0.8-SNAPSHOT/salat-core_2.8.1-0.0.8-SNAPSHOT.jar!/com/novus/salat/annotations/raw/Ignore.class">
<provider selected="true" editor-type-id="text-editor">
<state line="7" column="18" selection-start="324" selection-end="324" vertical-scroll-proportion="0.0" />
@@ -1176,7 +1181,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/test/scala/com/my2do/idm/test/SyncTest.scala">
<provider selected="true" editor-type-id="text-editor">
- <state line="112" column="26" selection-start="3785" selection-end="3785" vertical-scroll-proportion="0.0">
+ <state line="117" column="26" selection-start="3925" selection-end="3925" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -1195,16 +1200,23 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/scala/com/my2do/idm/objects/User.scala">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="62" column="36" selection-start="2027" selection-end="2027" vertical-scroll-proportion="0.0">
+ <state line="15" column="32" selection-start="818" selection-end="818" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/scala/com/my2do/idm/objects/UserView.scala">
<provider selected="true" editor-type-id="text-editor">
- <state line="224" column="36" selection-start="7079" selection-end="7079" vertical-scroll-proportion="0.773913">
+ <state line="227" column="34" selection-start="7178" selection-end="7178" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/scala/com/my2do/idm/objects/User.scala">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="59" column="36" selection-start="1712" selection-end="1712" vertical-scroll-proportion="1.9666667">
<folding />
</state>
</provider>
View
3  src/main/scala/com/my2do/idm/objects/User.scala
@@ -57,9 +57,6 @@ case class User(var accountName: String,
var department: String = "",
var email: String = "",
var managerId:String = "", // managers employee Id
- //var attributes:mutable.Map[String,AnyRef] = new HashMap[String,AnyRef](),
- // Scala mutable Maps dont serialize/deserialze nicely to mongo - until then we use a Java HashMap
- //val attributes:java.util.HashMap[String,AnyRef] = new java.util.HashMap[String,AnyRef](),
val attributes:mutable.Map[String,AnyRef] = new mutable.HashMap[String,AnyRef] (),
var directlyAssignedResources:List[String] = Nil,
var roleAssignedResources:List[String] = Nil,
View
8 src/main/scala/com/my2do/idm/objects/UserView.scala
@@ -24,6 +24,7 @@ import com.my2do.idm.resource.Resource
import com.my2do.idm.mongo.MongoUtil
import net.liftweb.common.Logger
import com.my2do.idm.dao.{ResourceDAO, UserDAO, SyncIndexDAO}
+
/**
*
* Companion UserView - factory methods
@@ -222,6 +223,13 @@ class UserView(var user:User,
accountMap.foreach{case (ai,ro) =>
// if the linked resource object is dirty flag it for recon
+ // todo: Test
+ val rx = ResourceRef(ai.resourceKey,ro.accountName,ro.objectClass,null)
+
+ ResourceRefDAO.save(rx)
+
+ val l = ResourceRefDAO.childObjects.findByParentId(rx.id).toList
+ debug("Child list=" + l)
if( ro.isDirty) {
ai.needsSync = true
View
12 src/test/scala/com/my2do/idm/test/MongoTest.scala
@@ -21,6 +21,9 @@ package com.my2do.idm.test
import com.my2do.idm.mongo.MongoUtil
import com.my2do.idm.objects._
import com.my2do.idm.dao._
+import org.junit.runner.RunWith
+import org.scalatest.junit.JUnitRunner
+
/**
*
@@ -30,13 +33,20 @@ import com.my2do.idm.dao._
*
*/
+@RunWith(classOf[JUnitRunner])
class MongoTest extends FunTest {
val db = MongoUtil.db
+
+ test("Simple Test") {
+
+ val u = User("test1", "test", "tester")
+ UserDAO.save(u)
+ }
- test("SalatDAO test") {
+ ignore("SalatDAO test") {
MongoUtil.dropAndCreateDB
View
6 src/test/scala/com/my2do/idm/test/RoleTest.scala
@@ -26,16 +26,16 @@ package com.my2do.idm.test
*/
import com.my2do.idm.objects._
-
import com.my2do.idm.sync.SyncManager
import com.my2do.idm.mongo.MongoUtil
-
import com.my2do.idm.ComponentRegistry
import com.my2do.idm.resource.Resource
import com.my2do.idm.dao.RoleDAO
import com.my2do.idmsvc.test.TestData
+import org.junit.runner.RunWith
+import org.scalatest.junit.JUnitRunner
-
+@RunWith(classOf[JUnitRunner])
class RoleTest extends FunTest {
val syncManager: SyncManager = ComponentRegistry.syncManager
View
6 src/test/scala/com/my2do/idm/test/SyncTest.scala
@@ -33,9 +33,13 @@ import com.my2do.idm.resource.Resource
import com.my2do.idm.rules.{correlateByLDAPUid, correlateByAccountName}
import com.my2do.idmsvc.test.TestData
import com.my2do.idm.sync.{ReconManager, SyncManager}
-import com.my2do.idm.objects._
+import com.my2do.idm.objects._
import com.my2do.idm.dao.{ResourceDAO, UserDAO, RoleDAO}
+import org.scalatest.junit.JUnitRunner
+import org.junit.runner.RunWith
+
+@RunWith(classOf[JUnitRunner])
class SyncTest extends FunTest {
val syncManager: SyncManager = ComponentRegistry.syncManager
Please sign in to comment.
Something went wrong with that request. Please try again.