Permalink
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...
2 parents b6a1b95 + 587a663 commit 47cc541ce660dc92d36895d60d4bd87ec390d1e2 @wstrange committed May 16, 2011
View
@@ -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
@@ -1,5 +1,5 @@
-/lib_managed
-/target
-/.settings
-/.scala_dependencies
-
+/lib_managed
+/target
+/.settings
+/.scala_dependencies
+
View
@@ -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
Oops, something went wrong.
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
@@ -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>
Oops, something went wrong.

0 comments on commit 47cc541

Please sign in to comment.