[Commits] (bcm) add role to the object model,
a role data access object, and crud tests for
commits at osafoundation.org
commits at osafoundation.org
Tue Feb 8 17:39:28 PST 2005
Commit by: bcm
Modified files:
server/slam/.cvsignore 1.1 1.2
server/slam/build.xml 1.2 1.3
server/slam/etc/applicationContext.xml 1.1.1.1 1.2
server/slam/etc/webdav.properties 1.1.1.1 1.2
server/slam/src/org/osaf/slam/dao/RoleDAO.java None 1.1
server/slam/src/org/osaf/slam/dao/webdav/RoleDAOWebdav.java None 1.1
server/slam/src/org/osaf/slam/model/Role.java None 1.1
server/slam/test/org/osaf/slam/TestHelper.java 1.2 1.3
server/slam/test/org/osaf/slam/dao/RoleDAOTest.java None 1.1
Log message:
add role to the object model, a role data access object, and crud tests for
the dao. sync to new url and password. relocate a few jars.
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/server/slam/.cvsignore.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/slam/build.xml.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/server/slam/etc/applicationContext.xml.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/slam/etc/webdav.properties.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/slam/src/org/osaf/slam/dao/RoleDAO.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/slam/src/org/osaf/slam/dao/webdav/RoleDAOWebdav.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/slam/src/org/osaf/slam/model/Role.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/slam/test/org/osaf/slam/TestHelper.java.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/server/slam/test/org/osaf/slam/dao/RoleDAOTest.java?rev=1.1&content-type=text/vnd.viewcvs-markup
Index: server/slam/etc/webdav.properties
diff -u server/slam/etc/webdav.properties:1.1.1.1 server/slam/etc/webdav.properties:1.2
--- server/slam/etc/webdav.properties:1.1.1.1 Thu Feb 3 15:26:50 2005
+++ server/slam/etc/webdav.properties Tue Feb 8 17:39:25 2005
@@ -2,6 +2,6 @@
#
# the base URL and user credentials for the WebDAV server
#
-slam.webdav.base.url=http://localhost:8080/slide/
+slam.webdav.base.url=http://localhost:8080/share/
slam.webdav.base.username=root
-slam.webdav.base.password=root
+slam.webdav.base.password=chsrv
Index: server/slam/build.xml
diff -u server/slam/build.xml:1.2 server/slam/build.xml:1.3
--- server/slam/build.xml:1.2 Fri Feb 4 18:45:25 2005
+++ server/slam/build.xml Tue Feb 8 17:39:24 2005
@@ -17,7 +17,7 @@
<property name="slam.tag" value="1_0_0_1"/>
<property name="slam.home" value="${basedir}"/>
- <property name="slam.ext" value="${slam.home}/../ext"/>
+ <property name="slam.ext" value="${user.home}/ext"/>
<property name="slam.build" value="${slam.home}/build"/>
<property name="slam.src" value="${slam.home}/src"/>
<property name="slam.etc" value="${slam.home}/etc"/>
@@ -32,15 +32,15 @@
<property name="commons-httpclient.jar"
value="${slam.ext}/commons-httpclient-2.0.2.jar"/>
<property name="commons-lang.jar"
- value="${slam.ext}/commons-lang.jar"/>
+ value="${slam.ext}/commons-lang-2.0.jar"/>
<property name="commons-logging.jar"
value="${slam.ext}/commons-logging.jar"/>
<property name="jdom.jar"
- value="${slam.ext}/jdom-1.0.jar"/>
+ value="${slam.ext}/jdom.jar"/>
<property name="joda-time.jar"
value="${slam.ext}/joda-time-0.98.jar"/>
<property name="log4j.jar"
- value="${slam.ext}/log4j-1.2.9.jar"/>
+ value="${slam.ext}/log4j-1.2.8.jar"/>
<property name="slide-webdavlib.jar"
value="${slam.ext}/jakarta-slide-webdavlib-2.1.jar"/>
<property name="spring.jar"
Index: server/slam/.cvsignore
diff -u server/slam/.cvsignore:1.1 server/slam/.cvsignore:1.2
--- server/slam/.cvsignore:1.1 Thu Feb 3 15:31:06 2005
+++ server/slam/.cvsignore Tue Feb 8 17:39:24 2005
@@ -1 +1,2 @@
build
+diffs
Index: server/slam/test/org/osaf/slam/TestHelper.java
diff -u server/slam/test/org/osaf/slam/TestHelper.java:1.2 server/slam/test/org/osaf/slam/TestHelper.java:1.3
--- server/slam/test/org/osaf/slam/TestHelper.java:1.2 Mon Feb 7 12:05:19 2005
+++ server/slam/test/org/osaf/slam/TestHelper.java Tue Feb 8 17:39:26 2005
@@ -1,17 +1,30 @@
package org.osaf.slam;
+import org.osaf.slam.model.Role;
import org.osaf.slam.model.User;
/**
*/
public class TestHelper {
- static int useq = 0;
+ static int rseq = 1;
+ static int useq = 1;
private TestHelper() {
}
/**
*/
+ public static Role makeDummyRole() {
+ String serial = new Integer(++rseq).toString();
+
+ Role role = new Role();
+ role.setName("dummy " + serial);
+
+ return role;
+ }
+
+ /**
+ */
public static User makeDummyUser() {
String serial = new Integer(++useq).toString();
Index: server/slam/etc/applicationContext.xml
diff -u server/slam/etc/applicationContext.xml:1.1.1.1 server/slam/etc/applicationContext.xml:1.2
--- server/slam/etc/applicationContext.xml:1.1.1.1 Thu Feb 3 15:26:50 2005
+++ server/slam/etc/applicationContext.xml Tue Feb 8 17:39:25 2005
@@ -31,6 +31,12 @@
<!-- DAOs -->
+ <bean id="roleDAO" class="org.osaf.slam.dao.webdav.RoleDAOWebdav">
+ <property name="httpURL">
+ <ref local="webdavBaseURL"/>
+ </property>
+ </bean>
+
<bean id="userDAO" class="org.osaf.slam.dao.webdav.UserDAOWebdav">
<property name="httpURL">
<ref local="webdavBaseURL"/>
More information about the Commits
mailing list