Menu
▾
▴
cobricks-cvscommit — Information about commits to the CVS repository
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
(11) |
Mar
(106) |
Apr
(146) |
May
(79) |
Jun
(233) |
Jul
(218) |
Aug
(160) |
Sep
(155) |
Oct
(80) |
Nov
(176) |
Dec
(115) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(77) |
Feb
(106) |
Mar
(10) |
Apr
(54) |
May
(29) |
Jun
(29) |
Jul
(65) |
Aug
(80) |
Sep
|
Oct
(42) |
Nov
(45) |
Dec
(33) |
| 2006 |
Jan
(49) |
Feb
(52) |
Mar
(8) |
Apr
(3) |
May
(108) |
Jun
(43) |
Jul
(13) |
Aug
(1) |
Sep
(58) |
Oct
(66) |
Nov
(70) |
Dec
(115) |
| 2007 |
Jan
(26) |
Feb
(3) |
Mar
(17) |
Apr
(1) |
May
(4) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
(1) |
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(10) |
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
(1) |
| 2009 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Michael K. <ko...@us...> - 2006-05-30 14:32:07
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/core/db In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19207/src/org/cobricks/core/db Modified Files: DBAccessImpl.java Log Message: Index: DBAccessImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/core/db/DBAccessImpl.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- DBAccessImpl.java 24 May 2006 09:02:55 -0000 1.26 +++ DBAccessImpl.java 30 May 2006 14:32:00 -0000 1.27 @@ -13,6 +13,7 @@ package org.cobricks.core.db; import java.io.*; +import java.math.BigDecimal; import java.util.*; import java.sql.*; @@ -394,26 +395,43 @@ String aname = (String)i.next(); String type = td.getColumnType(aname); Object o = attrs.get(aname); - if (o == null) { - logger.debug("setPrepared "+count+" "+aname+": NULL"); - } else { + if (o != null) { if (type.equals("timestamp") && (o instanceof String)) { // some converting is needed ... - o = DateUtil.string2Date((String)o); - } else - if (type.equals("int") && (o instanceof String)) { + if (((String)o).length()<1) o = null; + else + o = DateUtil.string2Date((String)o); + } + else if (type.equals("int") && (o instanceof String)) { // some converting is needed ... - o = new Integer((String)o); + if (((String)o).length()<1) o = null; + else + o = new Integer((String)o); + } + else if (type.startsWith("float") && (o instanceof String)) { + // some converting is needed ... + if (((String)o).length()<1) o = null; + else + o = new Float((String)o); } + else if (type.startsWith("float") && + (o instanceof BigDecimal)) { + // some converting is needed ... + o = new Float(o.toString()); + } + } + if (o!=null) logger.debug("setPrepared "+count+" "+type+" "+aname+": " +o.getClass().getName()); - } + else + logger.debug("setPrepared "+count+" "+aname+": NULL"); + // is the parameter a Set? - then convert it to a String // tbd ... not perfect yet if (o instanceof Set) { o = setToString((Set)o); } - count = count + setPreparedObject(pstmt, o, count); + count = count + setPreparedObject(pstmt, o, count, type); } } @@ -479,6 +497,24 @@ int position) throws SQLException { + return setPreparedObject(pstmt, o, position, null); + } + + private static int setPreparedObject(PreparedStatement pstmt, Object o, + int position, String type) + throws SQLException + { + if (o == null) { + int sqltype = java.sql.Types.VARCHAR; + if (type!=null) { + if (type.startsWith("float")) sqltype = java.sql.Types.FLOAT; + if (type.equals("int")) sqltype = java.sql.Types.INTEGER; + if (type.equals("timestamp")) + sqltype = java.sql.Types.TIMESTAMP; + } + pstmt.setNull(position, sqltype); + return 1; + } if (o instanceof java.sql.Timestamp) { pstmt.setTimestamp(position, (java.sql.Timestamp)o); } @@ -517,8 +553,7 @@ else { if (o == null) { pstmt.setString(position, ""); - } - else { + } else { pstmt.setString(position, o.toString().trim()); } } |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:32:07
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/item/sqlsearch/java_cup/runtime In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19207/src/org/cobricks/item/sqlsearch/java_cup/runtime Modified Files: lr_parser.java Log Message: Index: lr_parser.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/sqlsearch/java_cup/runtime/lr_parser.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- lr_parser.java 18 Feb 2005 20:54:55 -0000 1.1 +++ lr_parser.java 30 May 2006 14:32:00 -0000 1.2 @@ -633,7 +633,7 @@ * @param mess the text of the debugging message. */ public void debug_message(String mess) { - System.err.println(mess); + // System.err.println(mess); } /*. . . . . . . . . . . . . . . . . . . . . . . . . . . . . .*/ |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:32:07
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/category In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19207/src/org/cobricks/category Modified Files: CategoryManagerImpl.java Log Message: Index: CategoryManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/category/CategoryManagerImpl.java,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- CategoryManagerImpl.java 2 May 2006 11:55:41 -0000 1.27 +++ CategoryManagerImpl.java 30 May 2006 14:32:00 -0000 1.28 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 Cobricks Group. All rights reserved. + * Copyright (c) 2004-2006 Cobricks Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted under the terms of the Cobricks Software @@ -175,6 +175,7 @@ if (res == -1) { dbAccess.createTable(tablename); } else if (res == -2) { + logger.info("Found need to update table "+tablename); if (!dbAccess.updateTable(tablename)) { logger.error("Updating table "+tablename+" failed."); } @@ -573,7 +574,11 @@ o = new Integer(((DataObject)o).getId()); attrsMain.put("updaterid", o); } else { - attrsMain.put(aname, attrs.get(aname).toString()); + Object o = attrs.get(aname); + if (o instanceof Date) + attrsMain.put(aname, o); + else + attrsMain.put(aname, o.toString()); } } else if (aname.startsWith("title_")) { String lang = aname.substring(6); |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:32:07
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19207/src/org/cobricks/user Modified Files: UserManagerImpl.java UserPresenter.java Log Message: Index: UserPresenter.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserPresenter.java,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- UserPresenter.java 29 May 2006 15:57:12 -0000 1.34 +++ UserPresenter.java 30 May 2006 14:32:01 -0000 1.35 @@ -299,7 +299,7 @@ int count = 0; Map conditions = new HashMap(); - conditions.put("1", "~"); + conditions.put("1", "="); conditions.put("2", "~"); conditions.put("3", ">"); conditions.put("4", "<"); Index: UserManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserManagerImpl.java,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- UserManagerImpl.java 29 May 2006 15:57:12 -0000 1.62 +++ UserManagerImpl.java 30 May 2006 14:32:00 -0000 1.63 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2005 Cobricks Group. All rights reserved. + * Copyright (c) 2003-2006 Cobricks Group. All rights reserved. * * This file is part of a free software package; you can redistribute * it and/or modify it under the terms of the Cobricks Software Licence; @@ -700,7 +700,9 @@ /** * get Vector of String-UserIds for all locally stored user profiles */ - public List getUserIdList() throws Exception { + public List getUserIdList() + throws Exception + { return this.getUserIdList(new HashMap()); } @@ -712,7 +714,9 @@ * * @return DOCUMENT_ME! */ - public List getUserIdList(Map query) throws Exception { + public List getUserIdList(Map query) + throws Exception + { return this.getUserIdList(query, false); } @@ -726,7 +730,9 @@ * * @return DOCUMENT_ME! */ - public List getUserIdList(Map query, boolean orflag) throws Exception { + public List getUserIdList(Map query, boolean orflag) + throws Exception + { return this.getUserIdList(query, orflag, "userlogin", -1, "user"); } @@ -737,7 +743,9 @@ * @return */ public List getUserIdList(Map query, boolean orFlag, String sortBy, - int numberOfResults, String userclass) throws Exception { + int numberOfResults, String userclass) + throws Exception + { List endResult = new ArrayList(); UserJoin userJoin = new UserJoin(dbAccess); Map conditions = new HashMap(); @@ -755,30 +763,24 @@ attrDesc = getAttributeDescriptorManager(userclass) .getAttributeDescriptorFor( key.substring(0, key.length() - 1)); - if (logger.isDebugEnabled()) { logger.debug("key = " + key.substring(0, key.length() - 1) + " table = " + attrDesc.getTableName()); } - break; case '=': - switch (key.charAt(key.length() - 2)) { case '<': case '>': attrDesc = getAttributeDescriptorManager(userclass) .getAttributeDescriptorFor( key.substring(0, key.length() - 2)); - break; - default: attrDesc = getAttributeDescriptorManager(userclass) .getAttributeDescriptorFor( key.substring(0, key.length() - 1)); - break; } @@ -786,21 +788,18 @@ attrDesc = getAttributeDescriptorManager(userclass) .getAttributeDescriptorFor( key.substring(0, key.length() - 1)); - break; } String table = attrDesc.getTableName(); - if (logger.isDebugEnabled()) { - logger - .debug("table in UserManagerImpl in getUserIdList for attr " - + key + " is " + table); + logger.debug("table in UserManagerImpl in " + +"getUserIdList for attr " + + key + " is " + table); } - if (conditions.containsKey(table)) { - ((Map) conditions.get(table)).put(attribute.getKey(), attribute - .getValue()); + ((Map) conditions.get(table)). + put(attribute.getKey(), attribute.getValue()); } else { attrs.put(attribute.getKey(), attribute.getValue()); conditions.put(table, attrs); @@ -1413,7 +1412,8 @@ * * @return List of user */ - public List searchUsers(Map attrs) { + public List searchUsers(Map attrs) + { List result = new ArrayList(); result = searchUsers(attrs, User.USERLOGIN, false, -1, "user"); return result; @@ -1425,7 +1425,8 @@ * * @return List of user */ - public List searchUsers(Map attrs, String userclass) { + public List searchUsers(Map attrs, String userclass) + { List result = new ArrayList(); result = searchUsers(attrs, User.USERLOGIN, false, -1, userclass); return result; @@ -1442,9 +1443,10 @@ * @return DOCUMENT_ME! */ public List searchUsers(Map attrs, String sortby, boolean orFlag, - int numberOfResults, String userclass) { + int numberOfResults, String userclass) + { logger.info("searchUsers(" + attrs.toString() + "," + sortby + "," - + orFlag + "," + numberOfResults + "," + userclass + ")"); + + orFlag + "," + numberOfResults + "," + userclass + ")"); List result = new ArrayList(); List idResult = new ArrayList(); @@ -1471,7 +1473,8 @@ * with all it's attributes an delete attributes that are not * longer defined */ - public void updateUser(User user) { + public void updateUser(User user) + { Map attrsNew = new HashMap(); Map attrsOld = new HashMap(); List toDelete = new ArrayList(); @@ -2506,8 +2509,9 @@ * Floyd-Warshall-Matrix with it * */ - private void initializeFloydWarshallMatrix() throws Exception { - + private void initializeFloydWarshallMatrix() + throws Exception + { /* Get the ids of all users known to the system */ List userList = getUserIdList(); |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:32:04
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/core/util In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19207/src/org/cobricks/core/util Modified Files: MailUtil.java Log Message: Index: MailUtil.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/core/util/MailUtil.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- MailUtil.java 5 Aug 2005 11:25:46 -0000 1.4 +++ MailUtil.java 30 May 2006 14:32:00 -0000 1.5 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2005 Cobricks Group. All rights reserved. + * Copyright (c) 2003-2006 Cobricks Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted under the terms of the Cobricks Software @@ -98,7 +98,7 @@ new MailDistributionThread(mailhost, toaddr, fromaddr, replyto, subject, content); t.setDaemon(true); - t.start(); + t.start(); } } @@ -116,7 +116,8 @@ MailDistributionThread(String mailhost, String toaddr, String fromaddr, String replyto, - String subject, String content) { + String subject, String content) + { this.mailhost = mailhost; this.subject = subject; this.content = content; @@ -142,6 +143,7 @@ InternetAddress(replyto)}); msg.setSubject(subject); Transport.send(msg); + logger.debug("sent email to "+toaddr); } catch (Exception e) { logger.warn("failed sending email to "+toaddr); } |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:32:04
|
Update of /cvsroot/cobricks/cobricks2/src/de/tum/cobricks/univis In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19207/src/de/tum/cobricks/univis Modified Files: UnivIS.java UnivISParser.java Log Message: Index: UnivISParser.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/de/tum/cobricks/univis/UnivISParser.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- UnivISParser.java 8 Dec 2004 21:33:18 -0000 1.15 +++ UnivISParser.java 30 May 2006 14:32:00 -0000 1.16 @@ -71,10 +71,10 @@ } else { - // check if the version = 1.3 + // check if the version = 1.5 String version = ((Element)univISNode).getAttribute("version"); - if(!version.equals("1.3")) { - logger.error("univIS version conflict, version not equal 1.3"); + if(!version.equals("1.5")) { + logger.error("univIS version conflict, version not equal 1.5"); } else { Node node = univISNode.getFirstChild(); Index: UnivIS.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/de/tum/cobricks/univis/UnivIS.java,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- UnivIS.java 22 Aug 2005 13:52:06 -0000 1.54 +++ UnivIS.java 30 May 2006 14:32:00 -0000 1.55 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 Cobricks Group. All rights reserved. + * Copyright (c) 2004-2006 Cobricks Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted under the terms of the Cobricks Software @@ -146,15 +146,15 @@ logger.info("Deleting course from Cobricks ..."); int cid = c.getId(); - CourseModule ctp = c.getCourseModule(); - int ctplid = ctp.getId(); + CourseModule cm = c.getCourseModule(); + int cmid = cm.getId(); if(univISSync.shouldLog("change")){ univISSync.log("Deleting course \""+c.getName()+"" + "\" from Cobricks..."); } courseManager.deleteCourse(cid, new User()); courseManager.deleteLecturersFromCourse(cid, new User()); - courseManager.deleteCoursePrograms(ctplid); + courseManager.deleteCourseProgramsForModule(cmid); } } } @@ -323,15 +323,15 @@ logger.info("Deleting lecture from Cobricks ..."); int cid = c1.getId(); - CourseModule ctp = c1.getCourseModule(); - int ctplid = ctp.getId(); + CourseModule cm = c1.getCourseModule(); + int cmid = cm.getId(); if(univISSync.shouldLog("change")){ univISSync.log("Deleting course \""+c1.getName()+"" + "\" from Cobricks..."); } courseManager.deleteCourse(cid, new User()); courseManager.deleteLecturersFromCourse(cid, new User()); - courseManager.deleteCoursePrograms(ctplid); + courseManager.deleteCourseProgramsForModule(cmid); }else if (ul != null && cextlastrep != null && (cextlastrep.before(cextastupdate))){ // course has been changed after the last replication, // so update UnivIS @@ -539,11 +539,11 @@ * @return int cid : the id for the cobricks lecture */ public int insertLectureIntoCobricks(UnivISLecture ul, String term, - UnivISSyncParameters univISSync) + UnivISSyncParameters univISSync) { logger.info("inserting lecture into Cobricks ..."); int cid = 0; - int ctplid = 0; + int cmid = 0; int cparentid = 0; Map attrs = new HashMap(); // get course template for imported course @@ -554,11 +554,10 @@ else if (cname.indexOf(" - ")>0) ctname = ctname.substring(0, ctname.indexOf(" - ")); ctname = ctname.trim(); - CourseModule ctp = courseManager.getCourseModuleForName(ctname); - if(ctp != null){ - ctplid = ctp.getId(); - cparentid = ctp.getParentId(); - }else { + CourseModule cm = courseManager.getCourseModuleForName(ctname); + if (cm != null){ + cmid = cm.getId(); + } else { // create new course template Map ctAttrs = new HashMap(); //get parent extid @@ -588,7 +587,7 @@ ctAttrs.put("ctprerequ", ul.getOrganizational()); if(ul.getEctsOrganizational() != null) ctAttrs.put("ctprerequ_en", ul.getEctsOrganizational()); - ctplid = courseManager.createCourseModule(ctAttrs, new User()); + cmid = courseManager.createCourseModule(ctAttrs, new User()); }catch(Exception e){ logger.error(LogUtil.ex("Failed creating courseModule.",e)); if(univISSync.shouldLog("error")){ @@ -599,7 +598,7 @@ } // and now prepare the course attrs - attrs.put("ctplid", new Integer(ctplid)); + attrs.put("cmid", new Integer(cmid)); attrs.put("cparentid", new Integer(cparentid)); String cterm; if(term.length()== 5){ @@ -619,8 +618,8 @@ attrs.put("curl", ul.getURL()); // get the integer value form the teilno String if(ul.getParticipants() != null){ - int cparticipants = Integer.parseInt(ul.getParticipants()); - attrs.put("cparticipants", new Integer(cparticipants)); + int ccapacity = Integer.parseInt(ul.getParticipants()); + attrs.put("ccapacity", new Integer(ccapacity)); } // get the big decimal value from the ects string if(ul.getEctsCred() != null){ @@ -1106,7 +1105,7 @@ attrs.put("cpendsem", new Integer(cpendsem)); } // and now add program to course - courseManager.addProgramToCourse(attrs); + courseManager.addProgramToModule(attrs); }catch(Exception e){ e.printStackTrace(); @@ -1138,8 +1137,8 @@ map.put("curl", ul.getURL()); // get the integer value form the teilno String if(ul.getParticipants()!= null){ - int cparticipants = Integer.parseInt(ul.getParticipants()); - map.put("cparticipants", new Integer(cparticipants)); + int ccapacity = Integer.parseInt(ul.getParticipants()); + map.put("ccapacity", new Integer(ccapacity)); } // get the big decimal value from the ects string if(ul.getEctsCred()!= null){ @@ -1267,9 +1266,9 @@ { try { Course c = courseManager.getCourse(cid); - CourseModule ctp = c.getCourseModule(); - int ctplid = ctp.getId(); - courseManager.deleteCoursePrograms(ctplid); + CourseModule cm = c.getCourseModule(); + int cmid = cm.getId(); + courseManager.deleteCourseProgramsForModule(cmid); insertProgramsIntoCobricks(programs, cid, univISSync); }catch (Exception e) { logger.error(LogUtil.ex("Failed updating course programs.",e)); @@ -1295,7 +1294,7 @@ post1.addParameter("__s", "1"); post1.addParameter("donedef", "1"); post1.addParameter("lcreate" , "1"); - post1.addParameter("dir", course.getChair()); + post1.addParameter("dir", getChair(course)); post1.addParameter("sem", course.getTerm()); post1.addParameter("showhow", "short"); long time = (new Date()).getTime(); @@ -1328,10 +1327,11 @@ post2.addParameter("__s", "1"); post2.addParameter("dsc", "lecture/edit"); post2.addParameter("donedef", "1"); - post2.addParameter("done-lecture/edit:ignore", " Warnung ignorieren "); + post2.addParameter("done-lecture/edit:ignore", + " Warnung ignorieren "); post2.addParameter("lcreate", "1"); - post2.addParameter("dir", course.getChair()); + post2.addParameter("dir", getChair(course)); post2.addParameter("sem", course.getTerm()); addCourseParameters(course, post2); @@ -1387,7 +1387,7 @@ post3.addParameter("done-doit", " Einordnen "); post3.addParameter("lv", lv); - post3.addParameter("dir", course.getChair()); + post3.addParameter("dir", getChair(course)); post3.addParameter("sem", course.getTerm()); post3.addParameter("__e", Integer.toString(evalue)); logger.info("univisid = "+lv); @@ -1429,18 +1429,18 @@ { logger.info("getUnivISEinordnung ...."); String title = "in/_lehrv"; - CourseModule ctp = course.getCourseModule(); - int ctplid = ctp.getId(); - String ctype = ctp.getType(); - String cname = ctp.getName(); - List list = courseManager.getProgramsForCourse(ctplid); + CourseModule cm = course.getCourseModule(); + int cmid = cm.getId(); + String ctype = cm.getType(); + String cname = cm.getName(); + List list = courseManager.getProgramsForModule(cmid); if(list != null){ Iterator it = list.listIterator(); while(it.hasNext()){ CourseProgram cp = (CourseProgram)it.next(); String label = cp.getLabel(); int cpid = cp.getId(); - int startsem = courseManager.getStartSemForCourse(cpid, ctplid); + int startsem = courseManager.getStartSemForModule(cpid, cmid); if(label == null || label.length()<1){ continue; }else if(!(label.startsWith("INF")) || !(label.endsWith("INF"))){ @@ -1479,8 +1479,8 @@ { logger.info("addCourseParameters ..."); - CourseModule ctp = course.getCourseModule(); - String ctname = ctp.getName(); + CourseModule cm = course.getCourseModule(); + String cmname = cm.getName(); String cname = course.getName(); post.addParameter("lname", cname); @@ -1489,13 +1489,13 @@ } else{ post.addParameter("ects_lname", ""); } - if(ctp.getShortName() != null){ - post.addParameter("short", ctp.getShortName()); + if(cm.getShortName() != null){ + post.addParameter("short", cm.getShortName()); }else{ post.addParameter("short", ""); } // get teilno - int teilnoval = course.getParticipants(); + int teilnoval = course.getCapacity(); Integer val = new Integer(teilnoval); String teilno = val.toString(); if(teilno != null && teilnoval != 0){ @@ -1504,7 +1504,7 @@ post.addParameter("teilno", ""); } // get type - String ctype = ctp.getType(); + String ctype = cm.getType(); String univIStype = ""; if(ctype == null || ctype.length()< 1 ||ctype.equalsIgnoreCase("Vorlesung")){ @@ -1614,7 +1614,7 @@ post.addParameter("url_description", ""); } // get studs - List programs = courseManager.getProgramsForCourse(ctp.getId()); + List programs = courseManager.getProgramsForModule(cm.getId()); if(programs != null){ Iterator it1 = programs.listIterator(); int counter1 = 0; @@ -1622,9 +1622,9 @@ CourseProgram cp = (CourseProgram)it1.next(); String richt = cp.getLabel(); int cpid = cp.getId(); - String pflicht = courseManager.getProgramType(cpid, ctp.getId()); - int startsem = courseManager.getStartSemForCourse(cpid, ctp.getId()); - int endsem = courseManager.getEndSemForCourse(cpid, ctp.getId()); + String pflicht = courseManager.getProgramType(cpid, cm.getId()); + int startsem = courseManager.getStartSemForModule(cpid, cm.getId()); + int endsem = courseManager.getEndSemForModule(cpid, cm.getId()); if(pflicht != null && pflicht.length() > 0){ post.addParameter("stud"+counter1+"::pflicht", pflicht); } @@ -1908,7 +1908,7 @@ post1.addParameter("lvs", lv); post1.addParameter("lv", lv); - post1.addParameter("dir", course.getChair()); + post1.addParameter("dir", getChair(course)); post1.addParameter("sem", course.getTerm()); long time = (new Date()).getTime(); int evalue = (int)((time - 1007506796106L)/86400000L)+661; @@ -1942,7 +1942,7 @@ post2.addParameter("classification", getUnivISEinordnung(course)); post2.addParameter("reedit", "1"); post2.addParameter("rtag", "save"); - post2.addParameter("dir", course.getChair()); + post2.addParameter("dir", getChair(course)); post2.addParameter("sem", course.getTerm()); time = (new Date()).getTime(); evalue = (int)((time - 1007506796106L)/86400000L)+661; @@ -2023,16 +2023,31 @@ } } -} - - - - - - - - - + /** + * @return String chair e.g in/infor/infor11 + */ + public String getChair(Course course) + { + String chair = ""; + String cextid = course.getExtId(); + // e.g cextid = Lecture/in/infor/infor11/vean + if (cextid == null) return "in/infor/infor11"; + else { + int pos = cextid.indexOf("/"); + cextid = cextid.substring(pos+1);// cextid = in/infor/infor11/vean + for(int i=0; i<3; i++){ + pos = cextid.indexOf("/"); + String tmp = ""; + if(i == 2){ + tmp = cextid.substring(0, pos);// tmp = in + }else{ + tmp = cextid.substring(0, pos+1);// tmp = in/ + } + cextid = cextid.substring(pos+1); + chair = chair+tmp; + } + } + return chair.trim(); + } - - +} |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:22:51
|
Update of /cvsroot/cobricks/cobricks2/web In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14738 Removed Files: pagefooter.html pageheader.html Log Message: --- pagefooter.html DELETED --- --- pageheader.html DELETED --- |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:20:55
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13752 Modified Files: INSTALL.txt build.xml changelog.txt todo.txt Log Message: Index: changelog.txt =================================================================== RCS file: /cvsroot/cobricks/cobricks2/changelog.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- changelog.txt 16 Feb 2006 15:18:18 -0000 1.8 +++ changelog.txt 30 May 2006 14:20:49 -0000 1.9 @@ -1,3 +1,6 @@ +Cobricks2 v0.37 + + Cobricks2 v0.36 - Support for Tomcat 5.5 added to development environment Index: todo.txt =================================================================== RCS file: /cvsroot/cobricks/cobricks2/todo.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- todo.txt 11 Aug 2004 15:12:26 -0000 1.9 +++ todo.txt 30 May 2006 14:20:49 -0000 1.10 @@ -1,4 +1,7 @@ +update fileupload to version 1.1 + + docu: user always "." as separator in attribute names - except in web-templates there "_" if used as variable name, "." if used in parameters ... Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- build.xml 26 Feb 2006 15:51:14 -0000 1.54 +++ build.xml 30 May 2006 14:20:49 -0000 1.55 @@ -17,14 +17,13 @@ <property name="app.path" value=""/> <property name="app.version" value="0.9"/> <property name="build.home" value="${basedir}/build"/> -<property name="java.home.dir" value="C:\Sun\AppServer\jdk"/> -<property name="catalina.home" value="C:\Programme\tomcat5.0.28\jakarta-tomcat-5.0.28"/> -<!-- we currently support tomcat version 5.0 and 5.5 --> -<property name="catalina.version" value="5.0"/> -<property name="axis.home" value="C:\Programme\axis13\axis-1_3"/> +<property name="java.home.dir" value=""/> +<property name="catalina.home" value=""/> +<property name="catalina.version" value="5.5"/> +<property name="axis.home" value=""/> <property name="dist.home" value="${basedir}/dist"/> -<property name="distbin" value="${basedir}/dist/cobricks2-v0.36"/> -<property name="distsrc" value="${basedir}/dist/cobricks2-v0.36-src"/> +<property name="distbin" value="${basedir}/dist/cobricks2-v0.37"/> +<property name="distsrc" value="${basedir}/dist/cobricks2-v0.37-src"/> <property name="docs.home" value="${basedir}/docs"/> <property name="src.home" value="${basedir}/src"/> <property name="conf.home" value="${basedir}/conf"/> Index: INSTALL.txt =================================================================== RCS file: /cvsroot/cobricks/cobricks2/INSTALL.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- INSTALL.txt 31 Mar 2004 12:05:35 -0000 1.2 +++ INSTALL.txt 30 May 2006 14:20:49 -0000 1.3 @@ -2,10 +2,10 @@ ============ In this file we describe the short way to install and run a Cobricks -platform. For this description we assume that you already have JDK -1.4, Tomcat 5, Axis 1.1 and Ant installed, and that you have a -database created on a relational database server (e.g. MySQL or -Postgres). +platform. For this description we assume that you already have JDK 1.4 +or higher, Tomcat 5.0.x or 5.5.x, Axis 1.1 and Ant installed, and that +you have a database created on a relational database server +(e.g. MySQL or Postgres). Please refer to the "Development Environment Document" in the project distribution or in the Cobricks file release area on the Sourceforge @@ -15,9 +15,9 @@ Unpacking the distribution file ------------------------------- -Both, the binary and the source code distribution come as JAR -file. As first thing you have to unpack the downloaded file in any -directory. Unpacking will create a new directory "cobricks2-vXX" or +Both, the binary and the source code distribution come as JAR file. As +first thing you have to unpack the downloaded file in any directory. +Unpacking will create a new directory "cobricks2-vXX" or "cobricks2-vXX-src" that can be renamed or removed to a convenient place. The final location of this directory shall henceforward be called COBRICKS_DIR. @@ -56,11 +56,6 @@ db.jdbc.user=cobricks db.jdbc.pw=cobricks -- If you want to use the full functionality of the Item Component you also - have to make a reference to a Xindice XML database server available in - this configuration file. See the Development Environment Documentation - for more information on this. - - Copy the appropriate JDBC driver library for your database system (JAR file) into the common/lib directory of your Tomcat installation @@ -81,8 +76,7 @@ locally. If you are working from a source code distribution this Ant target -will first compile the sources and construct the build -directory. +will first compile the sources and construct the build directory. If this "quick start" did not work for you, you will have to install |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:19:39
|
Update of /cvsroot/cobricks/cobricks2/conf/org.cobricks.message/templates In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13253/templates Log Message: Directory /cvsroot/cobricks/cobricks2/conf/org.cobricks.message/templates added to the repository |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:18:56
|
Update of /cvsroot/cobricks/cobricks2/web/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12680/user Modified Files: forgot_password.html.en register-direct.html.en register.html.en search.html.en user-roles.html user.html.en Added Files: forgot_password.txt.en registeremail.txt.en Removed Files: register-success.html.de register.html.de search.html.de Log Message: Index: search.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/user/search.html.en,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- search.html.en 12 Mar 2006 22:58:34 -0000 1.9 +++ search.html.en 30 May 2006 14:18:30 -0000 1.10 @@ -1,5 +1,6 @@ -#parse ( "pageheader.html" ) +$portalPresenter.parse("$!contextPath/pageheader.html.en",$portalRequest) + <em><a href="index.html">User Component</a> <a href="search.html">User search</a></em> @@ -12,11 +13,7 @@ #set ( $tmp = "$!auserlogin$!firstname$!lastname" ) #if ( $tmp != "") #set ($attrsInit = true) -Search for users with search criteria -#else - #set ($attrsInit = false) - All users (no search criteria): -#end + Search for users with search criteria <ul> #if ("$!auserlogin" != "") <li>Login name: @@ -25,7 +22,6 @@ #else is equal '$!auserlogin' #end - </td> #end #if ($firstname.length() > 0) <li>Firstname: @@ -34,7 +30,6 @@ #else is equal '$!firstname' #end - </td> #end #if ($lastname.length() > 0) <li>Lastname: @@ -43,9 +38,12 @@ #else is equal '$!lastname' #end - </td> #end </ul> +#else + #set ($attrsInit = false) + All users (no search criteria): +#end #set ($localCount = 0) @@ -73,8 +71,7 @@ #if ($attrsInit == true) <p> has $result.size() results. - </p> - + </p> #end #else <p> @@ -95,7 +92,7 @@ <b>E-Mail</b> </td> </tr> - #set( $number = 0 ) +#set( $number = 0 ) #foreach ($i in $result) #set ($uId = $i.getUserId()) <tr bgcolor = "#dfdfdf"> @@ -126,7 +123,7 @@ Please enter search criteria into the form below. <br> It is possible to enter several values in comma-separated form into one field. </p> -##<input type="hidden" name="first" value="$!first" /> + <table border="0"> <tr> <TD>Login Name:</TD> @@ -185,4 +182,4 @@ <p><input type="submit" value="Search"></p> </form> -#parse ( "pagefooter.html" ) +$portalPresenter.parse("$!contextPath/pagefooter.html.en",$portalRequest) Index: forgot_password.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/user/forgot_password.html.en,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- forgot_password.html.en 29 Apr 2004 19:53:53 -0000 1.3 +++ forgot_password.html.en 30 May 2006 14:18:30 -0000 1.4 @@ -92,13 +92,13 @@ </p> #set ($login = "$!auserlogin") <p><input type=submit value="Submit"/></p> - <p> - If your inputproves to be correct, your cridentials will be sent to your email address. - </p> +<p> +If your input proves to be correct, your cridentials will be sent to your +email address. +</p> #end - <input type="hidden" name="email_subject" value="Cobricks Password" /> - <input type=hidden name="email_text" value="This are your cridentials for the Cobricks Platform. Your user login is " /> - <input type=hidden name="email_text_1" value =". Your Password is " /> +<input type="hidden" name="email_subject" value="Cobricks Password" /> +<input type=hidden name="email_textsource" value="/user/forgot_password.txt.en" /> </form> Index: register.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/user/register.html.en,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- register.html.en 21 Jun 2004 17:19:21 -0000 1.4 +++ register.html.en 30 May 2006 14:18:30 -0000 1.5 @@ -1,5 +1,5 @@ -#parse ( "pageheader.html" ) +$portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) <em><a href="index.html">User Component</a> - <a href="register.html">Registration</a></em> @@ -65,7 +65,7 @@ <INPUT TYPE=hidden NAME=cmd VALUE=register /> <input type="hidden" name="attrrequ" value="basic_personal_firstname,basic_personal_lastname,basic_university_status,basic_personal_title" /> -<input type="hidden" name="attrnames" value="basic_contact_online_email" /> +<input type="hidden" name="attrnames" value="basic_contact-priv_online_email" /> <input type="hidden" name="userclass" value="universityuser" /> <input type="hidden" name="cmd.success" value="/user/register-success.html" /> @@ -83,7 +83,7 @@ <TD>Lastname*:</TD><TD><input name="basic_personal_lastname" size=20 value="$!basic_personal_lastname"></td> </tr> <tr> - <TD>Email*:</TD><TD><input name="basic_contact_online_email" size=20 value="$!basic_contact_online_email"></td> + <TD>Email*:</TD><TD><input name="basic_contact-priv_online_email" size=20 value="$!basic_contact_online_email"></td> </tr> <tr> <TD>Status:</TD><TD> @@ -111,9 +111,8 @@ </p> #set ($login = "$!auserlogin") <p><input type=submit value="Registrieren"></p> - <input type="hidden" name="email_subject" value="Cobricks Registration" /> - <input type=hidden name="email_text" value="You have registered on the Cobricks Test Platform. Your user name is $auserlogin. Your initial password is $passwd." /> +<input type="hidden" name="email_subject" value="Cobricks Registration" /> +<input type=hidden name="email_text" value="/user/registeremail.txt.en" /> </form> - -#parse ( "pagefooter.html" ) +$portalPresenter.parse("$contextPath/pagefooter.html.en",$portalRequest) --- register-success.html.de DELETED --- --- NEW FILE: forgot_password.txt.en --- Reset password On your request, the password for your account $!auserlogin has been changed. The new password is: $!passwd Index: user-roles.html =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/user/user-roles.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- user-roles.html 5 Jul 2005 05:35:35 -0000 1.4 +++ user-roles.html 30 May 2006 14:18:30 -0000 1.5 @@ -1,7 +1,5 @@ -#parse ( "pageheader.html" ) -<em><a href="index.html">User Component</a> - -<a href="user.html">User Profile</a> - -<a href="user-roles.html">Access Roles</a></em> + +$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) #set ( $auserlogin = "$!auserlogin" ) #if ( $auserlogin == "" ) @@ -11,7 +9,7 @@ #set ($auser = $userManager.getUser($auserid)) #set ($auserclass = $auser.getUserClass() ) -<h1>User Profile - Access Roles</h1> +<h1>Benutzerprofil - Zugriffsrechte</h1> #set ( $auth = $userPresenter.checkPermission($userId, "user", "read", "userid=$auserid") ) #if ( "$auth" != "true" ) @@ -21,47 +19,48 @@ #end #if ( $auth != "true" ) -<div class="error">You do not have the access permission to read user -information of user "$auserlogin".</div> -<p> -Please log in as user with the specified permission or ask the platform -administrator to assign the permission to your account. +<div class="error">Sie haben keine ausreichenden Zugriffsrechte um das +Benutzerprofil von "$auserlogin" zu lesen.</div> + +<p>Bitte melden Sie sich als Benutzer mit den entsprechenden Rechten +an oder kontaktieren Sie den Plattformadministrator um die notwendigen +Rechte zugewiesen zu bekommen.</p> #else #if ($auserid == 0) - <p><div class="error">User with user login <b>$auserlogin</b> does not exist!</div></p> + <p><div class="error">Loginname <b>$auserlogin</b> existiert nicht!</div></p> #else #if ( "$!cmd" == "addrole" ) #if ( "$!roleid" != "" ) $userPresenter.addRole($auserid, $roleid) -<p><div class="success">Role added to user</div></p> +<p><div class="success">Rolle erfolgreich hinzugefügt.</div></p> #end #end #if ( "$!cmd" == "removerole" ) #if ( "$!roleid" != "" ) $userPresenter.removeRole($auserid, $roleid) -<p><div class="success">Role removed from user</div></p> +<p><div class="success">Rolle erfolgreich entfernt.</div></p> #end #end -<p>User Login: $auserlogin</p> +<p>Loginname: $auserlogin</p> <p> <table border="1pt" width="100%" cellspacing="0pt" cellpadding="0pt"> <tr bgcolor="#eeeeee"> <td> <table border="0" cellpadding="5pt"><tr><td> -<em><a href="user.html?auserlogin=$auserlogin">basic</a> - -<a href="user-interests.html?auserlogin=$auserlogin">interests</a> - -<a href="user-buddylist.html?auserlogin=$auserlogin">buddylist</a> - -<a href="user-roles.html?auserlogin=$auserlogin">access roles</a><em></td> +<em><a href="user.html?auserlogin=$auserlogin">Basisdaten</a> - +<a href="user-interests.html?auserlogin=$auserlogin">Interessen</a> - +<a href="user-buddylist.html?auserlogin=$auserlogin">Freundesliste</a> - +<a href="user-roles.html?auserlogin=$auserlogin">Zugriffsrechte</a><em></td> </td></tr></table></td> <td align="right"> <table border="0" cellpadding="5pt"><tr><td> -<em><a href="change_password.html?auserlogin=$auserlogin">change password</a></em> +<em><a href="change_password.html?auserlogin=$auserlogin">Passwort ändern</a></em> </td></tr></table> </td></tr> <tr><td colspan="2"> @@ -69,15 +68,15 @@ <table border="0" cellpadding="8pt"> <tr><td> -<b>Access roles and permissions of user <i>$userManager.getUser($auserid).getName()</i></b> +<b>Zugriffsrollen und -rechte des Benutzers</b> <ul> #foreach( $i in $userManager.getAccessControl().getAccessRolesByUser($auserid) ) -<li>$i.getName() - <a href="user-roles.html?cmd=removerole&auserlogin=$auserlogin&roleid=$i.getId()">remove access role</a> +<li>$i.getName() - <a href="user-roles.html?cmd=removerole&auserlogin=$auserlogin&roleid=$i.getId()">entfernen</a> #end </ul> -<h3>Add access role</h3> +<h3>Rolle hinzufügen</h3> <form action="user-roles.html" method="post"> <input type="hidden" name="cmd" value="addrole"/> @@ -87,7 +86,7 @@ #foreach( $i in $userManager.getAccessControl().getAccessRoles() ) <option value="$i.getId()">$i.getName() #end -</select> <input type="submit" name="submit" value="Add access role"/> +</select> <input type="submit" name="submit" value="Hinzufügen"/> </form> </p> Index: register-direct.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/user/register-direct.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- register-direct.html.en 11 Jun 2004 11:41:54 -0000 1.1 +++ register-direct.html.en 30 May 2006 14:18:30 -0000 1.2 @@ -82,7 +82,7 @@ <TD>Lastname*:</TD><TD><input name="basic_personal_lastname" size=20 value="$!basic_personal_lastname"></td> </tr> <tr> - <TD>Email:</TD><TD><input name="basic_contact_online_email" size=20 value="$!basic_contact_online_email"></td> + <TD>Email:</TD><TD><input name="basic_contact-priv_online_email" size=20 value="$!basic_contact-priv_online_email"></td> </tr> <tr> <TD>Password:</TD><TD><input name="passwd" type="password"></td> Index: user.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/user/user.html.en,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- user.html.en 12 Mar 2006 22:58:34 -0000 1.22 +++ user.html.en 30 May 2006 14:18:30 -0000 1.23 @@ -1,4 +1,6 @@ -#parse ( "pageheader.html" ) + +$portalPresenter.parse("$contextPath/pageheader.html.en",$portalRequest) + <em><a href="index.html">User Component</a> - <a href="user.html">User Profile</a></em> @@ -188,4 +190,4 @@ #end -#parse ( "pagefooter.html" ) +$portalPresenter.parse("$contextPath/pagefooter.html.en",$portalRequest) --- search.html.de DELETED --- --- NEW FILE: registeremail.txt.en --- User Registration You have successfully registered! Your user name: "$!auserlogin" Your password: "$!passwd" --- register.html.de DELETED --- |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:18:44
|
Update of /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.portal In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12680/ADMIN/org.cobricks.portal Modified Files: index.html Log Message: Index: index.html =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/ADMIN/org.cobricks.portal/index.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.html 11 Feb 2004 14:39:29 -0000 1.1 +++ index.html 30 May 2006 14:18:29 -0000 1.2 @@ -9,6 +9,7 @@ <h3>Session Handler</h3> +Active Sessions:<br> <table border="0"> #foreach ( $i in $portalManager.getSessionHandler().getSessionIds() ) #set ( $s = $portalManager.getSession($i) ) @@ -69,11 +70,12 @@ <h3>Velocity Context</h3> -The Velocity Context contains the following keys: +The Velocity Context contains the following keys and values: <p> <table border="1"> #foreach ( $i in $portalPresenter.getContextKeys($velocityContext) ) <tr><td>$i</td> +<td>$portalPresenter.getContextObject("$!i",$velocityContext)</td></tr> #end </table> |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:18:43
|
Update of /cvsroot/cobricks/cobricks2/web In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12680 Added Files: pagefooter.html.en pageheader.html.en pagelogin.html.en Log Message: --- NEW FILE: pageheader.html.en --- <html> <head> <meta http-equiv="Content-Type" content="text/html"> <meta name="Author" content="mic...@co..."> $portalPresenter.printHeader($portalRequest) <META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE"> <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE"> <meta http-equiv="expires" content="0"> <META NAME="GOOGLEBOT" CONTENT="NOARCHIVE"> <META NAME="ROBOTS" CONTENT="NONE"> <link rel="stylesheet" type="text/css" href="$contextPath/style.css"> <link rel="shortcut icon" href="http://www.cobricks.de/c2.png" type="image/png"> </head> <body bgcolor="#ffffff" topmargin="1" leftmargin="3" marginwidth="3" marginheight="1"> #set ( $print = "$!print" ) #if ( $print != "true" ) <table border="0" width="100%" cellpadding="4" cellspacing="0"> <tr bgcolor="#dfdfdf"> <td rowspan="2" align="left" valign="bottom" width="160"> <br> <a href="http://www.cobricks.org/"> <img border="0" src="$contextPath/images/cobricks2-logo.png" alt="Cobricks-2"></a> </td> <td colspan="2" align="right" valign="top"> <a href="$contextPath/index.html">Home</a> | <a href="$contextPath/ADMIN/index.html">Admin</a> | <a href="$contextPath/info.html">Help</a> <br><div style="margin:2px;">$portalPresenter.printLang($portalRequest)</div> </td> </tr> <tr bgcolor="#dfdfdf"> <td align="left" valign="bottom" width="95%"> <font size="+1"> <a href="$contextPath/index.html">HOME</a> | <a href="$contextPath/user/index.html">USER</a> | <a href="$contextPath/item/index.html">ITEM</a> | <a href="$contextPath/category/index.html">CATEGORY</a> | <a href="$contextPath/context/index.html">CONTEXT</a> | <a href="$contextPath/message/index.html">MESSAGE</a> | <a href="$contextPath/course/index.html">COURSE</a> | <a href="$contextPath/portal/index.html">PORTAL</a> | <a href="$contextPath/agent/index.html">AGENT</a> #if ($discussionManager) | <a href="$contextPath/discussion/index.html">DISCUSSION</a> #end </font> </td> </tr> </table> <table border="0" width="100%" cellpadding="4" cellspacing="4"> <tr> <td width="160" valign="top" bgcolor="#ffffff"> <!-- navigation column --> <table width="158" height="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="156" valign="top"> <table width="155" border="0" cellpadding="1" cellspacing="0"> <tr><td> <br> <div class="box"><div class="header"><div class="title"> Search</div></div> <div class="body"><div class="content last"> <span class="boxNavHeadline"> <div> <form action="$contextPath/search.html" method="post"> <input type="text" name="t" size="'+w+'" title="Please enter the search term in this field"><br> <table border="0"><tr><td valign="middle"> <select name="m" title="Please select the search domain from this list"> <option value="item" selected>Items</option> <option value="user">Users</option> </select> </td><td valign="middle"> <input type="submit" class="submit" value="Ok" title="Start Search"> </td></tr> </table> </form> <p> <img src="$contextPath/images/arrow.png"><a href="$contextPath/search.html">Extended Search</a> </div> </span> </div></div> <p> </p> <div class="box"><div class="header"><div class="title"> Login</div></div> <div class="body2"><div class="content last"> <span class="boxNavHeadline"> <div> #if ($!userLogin != "anonymous") You are logged in as<br> "<b>$!userLogin</b>" <p> <a href="$contextPath/user/user.html?auserlogin=$!userLogin"><img src="$contextPath/images/arrow.png" width="10" height="9" border="0">Your Profile</a><br> <a href="$contextPath/PORTAL?cmd=logout"><img src="$contextPath/images/arrow.png" width="10" height="9" border="0">Logout</a> #else <form name="loginForm" action="$contextPath/PORTAL" method="post"> <INPUT TYPE="hidden" NAME="cmd" VALUE="login"> <INPUT TYPE="hidden" NAME="cmd.success" VALUE="$contextPath/homepage.html"> <INPUT TYPE="hidden" NAME="cmd.error" VALUE="$contextPath/homepage.html"> Login<br> <input title="Please enter your login name" size="20" name="luserlogin" type="text"><br> Password<br> <input title="Please enter your password" size="16" name="luserpw" type="password"> <input class="submit" title="Login" value="Login" type="submit"><br> <input type=checkbox name="autologin" value="auto"> remember login </form> <p> <img src="$contextPath/images/arrow.png"> <a title="Send the password in an email" href="$contextPath/user/forgot_password.html">Forgot Password</a><br> <img src="$contextPath/images/arrow.png"> <a title="Register as new user" href="$contextPath/user/register.html">Register</a> #end </div> </span> </div></div> </td></tr> </table> </td></tr> </table> <!-- end of navigation column --> </td> <td> </td> <td valign="top" width="95%"> <font size="-1" color="red"> $portalPresenter.displayNotifications($sessionId) </font> <p> #end --- NEW FILE: pagelogin.html.en --- <p>You have to <a href="/user-register.html">create an account</a> and <a href="/login.html">log in</a> to access this functionality.</p> <p>If you already have logged in and get this message, please check if your Web browser accepts cookies for this web site - otherwise it does not remember your login.</p> --- NEW FILE: pagefooter.html.en --- #if ( $print != "true" ) <div align="right"> #if ($pitemid != "") <a href="$contextPath/portal/edit.html?itemid=$!pitemid&plang=$!pageLang">Edit Page</a> - #end <a href="$portalPresenter.getPrintLink($portalRequest)"> <font color="#808080"><img border="0" src="$contextPath/images/print_icon.gif"> Print Page</font></a> </div> </td> <td valign="top" width="100" class="right"> <br> <div class="box"> <div class="header"> <div class="title"> News </div> </div> <div class="body"> #set ($iresult = $!itemPresenter.searchItemsByCreationtime()) #if (($iresult)) #foreach ($i in $iresult) <div class="content notlast"> <span class="boxNavHeadline"> <img alt="" width="16" height="16" src="$contextPath/images/item_icon.gif"> <a href="$contextPath/item/item.html?itemid=$!i.getId()">$!i.getTitle()</a> </span> <div class="boxDetails">$!i.getAttributeAsString("creationtime")</div> </div> #end #end </div> </div> <br> <div class="box"> <div class="header"> <div class="title"> New Users </div> </div> <div class="body"> #foreach ($i in $!userPresenter.searchUsers([], [], [], false, "history.org.cobricks.regtime desc", 10, "")) <div class="content notlast"> <span class="boxNavHeadline"> <img alt="" width="16" height="16" src="$contextPath/images/user_icon.gif"> <a href="$contextPath/user/card.html?auserlogin=$i.getUserLogin()">$!i.getUserLogin()</a> </span> </div> #end </div> </div> </td> </tr> </table> <div align="right"><a href="$contextPath/privacypolicy.html">Privacy Policy</a> | <a href="$contextPath/info.html">Impressum</a> | <a href="$contextPath/info.html">About</a></div> #end </body> </html> |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:18:42
|
Update of /cvsroot/cobricks/cobricks2/web/item In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12680/item Modified Files: item.html.en Log Message: Index: item.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/item/item.html.en,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- item.html.en 16 Feb 2006 15:16:49 -0000 1.4 +++ item.html.en 30 May 2006 14:18:30 -0000 1.5 @@ -176,7 +176,7 @@ <hr/><h3>Attachments:</h3> <ul> #foreach ($ia in $item.getAttachments()) -<li>$!ia.getTitle() ($ia.getMimeType()): $!ia.getComment() by user +<li>$!ia.getTitle() (<a href="/ITEM?cmd=geta&aid=$!ia.getId()">$!ia.getMimeType()</a>): $!ia.getComment() by user $ia.getPublisherId() - <a href="$contextPath/ITEM?cmd=removeattachment&cmd.success=$contextPath/item/item.html&cmd.error=$contextPath/item/item.html&itemid=$itemid&itemaid=$ia.getId()">delete</a> #end </ul> |
Update of /cvsroot/cobricks/cobricks2/web/course In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12680/course Modified Files: ccreate.html.en ccreatepreselect.html.en cdelete.html.en clcreate.html.en cldelete.html.en clsearch.html.en clupdate.html.en cmcreate.html.en cmdelete.html.en cmsearch.html.en cmupdate.html.en cpcreate.html.en cpdelete.html.en cpsearch.html.en cpupdate.html.en crcreate.html.en crdelete.html.en crsearch.html.en crupdate.html.en csearch.html.en cupdate.html.en index.html.en timetable.html.en timetablem.html.en timetablew.html.en Added Files: c.html.en cm.html.en Removed Files: clresult.html.en cmresult.html.en cpresult.html.en cresult.html.en crresult.html.en cview.html.en Log Message: Index: clupdate.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/course/clupdate.html.en,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- clupdate.html.en 13 Dec 2005 09:05:54 -0000 1.5 +++ clupdate.html.en 30 May 2006 14:18:30 -0000 1.6 @@ -1,9 +1,11 @@ -#parse ( "pageheader.html" ) + +$portalPresenter.parse("$!contextPath/pageheader.html.en",$portalRequest) <em><a href="index.html">Course Component</a> - -<a href="clcreate.html">Create Courselecturer</a></em> +<a href="clcreate.html">Create Course lecturer</a></em> + #if ( $returnCode > 1999 ) -<br /><font color="red">Failed updating Courselecturer object.</font><p> +<br /><font color="red">Failed updating Course lecturer object.</font><p> #end #set ( $courseLecturer = $coursePresenter.getCourseLecturer($lid) ) @@ -13,12 +15,12 @@ <table border="0"> <form action="/COURSE" method="post"> <input type="hidden" name="cmd" value="updatecourselecturer"> -<input type="hidden" name="cmd.success" value="/course/clresult.html" /> +<input type="hidden" name="cmd.success" value="/course/index.html" /> <input type="hidden" name="cmd.error" value="/course/clupdate.html" /> <input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="lid" value="$lid" /> -<input type="hidden" name="globalid" value="$courseLecturer.getUniqueId()" /> +<input type="hidden" name="uid" value="$courseLecturer.getUniqueId()" /> <tr> <td>Firstname</td> <td><input name="lfirstname" size="50" value="$!courseLecturer.getFirstName()"></td> @@ -40,20 +42,6 @@ <td><input name="lextid" size="50" value="$!courseLecturer.getExtId()"></td> </tr> <tr> - <td>Group</td> - <td> - <select name="lgroup" size="1"> - #foreach ( $cg in $coursePresenter.getCourseGroups() ) - #set ($sel = "") - #if ("$cg.getId()" == "$!courseLecturer.getGroup()") - #set ($sel = 'selected="1"') - #end - <option value="$!cg.getId()" $!sel>$!cg.getTitle()</option> - #end - </select> - </td> -</tr> -<tr> <td>Type</td> <td> <select name=ltyp> @@ -92,10 +80,9 @@ <td><textarea rows="6" cols="50" readonly >$!courseLecturer.toXML()</textarea></td> </tr--> <tr> - <td colspan="2"><br /><input type="submit" class="submit" value="Update Courselecturer"/></td> + <td colspan="2"><br /><input type="submit" class="submit" value="Update Course lecturer"/></td> </tr> </form> </table> - -#parse ( "pagefooter.html" ) +$portalPresenter.parse("$!contextPath/pagefooter.html.en",$portalRequest) Index: crupdate.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/course/crupdate.html.en,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- crupdate.html.en 11 Sep 2004 13:22:43 -0000 1.3 +++ crupdate.html.en 30 May 2006 14:18:30 -0000 1.4 @@ -1,9 +1,11 @@ -#parse ( "pageheader.html" ) + +$portalPresenter.parse("$!contextPath/pageheader.html.en",$portalRequest) <em><a href="index.html">Course Component</a> - <a href="crcreate.html">Create Courseroom</a></em> + #if ( $returnCode > 1999 ) -<br /><font color="red">Failed updating Courseroom object.</font><p> +<br /><font color="red">Failed updating Course room.</font><p> #end #set ( $courseRoom = $coursePresenter.getCourseRoom($crid) ) @@ -13,7 +15,7 @@ <table border="0"> <form action="/COURSE" method="post"> <input type="hidden" name="cmd" value="updatecourseroom"> -<input type="hidden" name="cmd.success" value="/course/crresult.html" /> +<input type="hidden" name="cmd.success" value="/course/index.html" /> <input type="hidden" name="cmd.error" value="/course/crupdate.html" /> <input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> @@ -36,20 +38,6 @@ <td><input name="crextid" size="50" value="$!courseRoom.getExtId()"></td> </tr> <tr> - <td>Group</td> - <td> - <select name="crgroup" size="1"> - #foreach ( $cg in $coursePresenter.getCourseGroups() ) - #set ($sel = "") - #if ("$cg.getId()" == "$!courseRoom.getGroup()") - #set ($sel = 'selected="1"') - #end - <option value="$!cg.getId()" $!sel>$!cg.getTitle()</option> - #end - </select> - </td> -</tr> -<tr> <td>Hidden</td> <td> <select name="crhidden" size="1"> @@ -69,8 +57,9 @@ <td><textarea rows="6" cols="50" readonly >$!courseRoom.toXML()</textarea></td> </tr--> <tr> - <td colspan="2"><br /><input type="submit" class="submit" value="Update Courseroom"/></td> + <td colspan="2"><br /><input type="submit" class="submit" value="Update Course room"/></td> </tr> </form> </table> -#parse ( "pagefooter.html" ) \ No newline at end of file + +$portalPresenter.parse("$!contextPath/pagefooter.html.en",$portalRequest) Index: cmupdate.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/course/cmupdate.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cmupdate.html.en 22 Aug 2005 13:54:29 -0000 1.1 +++ cmupdate.html.en 30 May 2006 14:18:30 -0000 1.2 @@ -1,20 +1,25 @@ -#parse ( "pageheader.html" ) +$portalPresenter.parse("$!contextPath/pageheader.html.en",$portalRequest) <em><a href="index.html">Course Component</a> - <a href="cmcreate.html">Create Course Module</a></em> -#if ( $returnCode > 1999 ) -<font color="red">Failed updating CourseModule object.</font><p> -#end -#set( $courseModule = $coursePresenter.getCourseModule($cmid) ) +<h1>Update Course Module</h1> -<h1>Update Course Module with ID: $!cmid</h1> +#set ( $auserid = $userManager.getUserIdForUserLogin($userLogin) ) +#if ( $auserid == 0 ) +$portalPresenter.parse("$!contextPath/pagelogin.html.en",$portalRequest) +#else +#set( $cm = $coursePresenter.getCourseModule($cmid) ) + +#if ( $returnCode > 1999 ) +<font color="red">Failed updating Course Module.</font><p> +#end <form action="/COURSE" method="post"> <input type="hidden" name="cmd" value="updatecoursemodule"> -<input type="hidden" name="cmd.success" value="/course/cmresult.html"> +<input type="hidden" name="cmd.success" value="/course/index.html"> <input type="hidden" name="cmd.error" value="/course/cmupdate.html"> <input type="hidden" name="cmd.noaccess" value="/noaccess.html"> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> @@ -24,121 +29,100 @@ <table border="0"> <tr> <td>Name (de)</td> -<td><input name="cmname" size="70" value="$!courseModule.getName()"></td> +<td><input name="cmname" size="70" value="$!cm.getName()"></td> </tr> <tr> <td>Name (en)</td> -<td><input name="cmname_en" size="70" value="$!courseModule.getName('en')"></td> +<td><input name="cmname_en" size="70" value="$!cm.getName('en')"></td> </tr> <tr> <td>Shortname</td> -<td><input name="cmshortname" size="30" value="$!courseModule.getShortName()"></td> +<td><input name="cmshortname" size="30" value="$!cm.getShortName()"></td> </tr> <tr> <td>Type</td> -<td><select name="cmtype" size="1"> -#set ($seloption = $courseModule.getType()) -#if ( $seloption == "0" ) -#set ($op10 = 'selected="1"') -#elseif ( $seloption == "1" ) -#set ($op11 = 'selected="1"') -#elseif ( $seloption == "2" ) -#set ($op12 = 'selected="1"') -#end -<option value="0" $!op10 >Vorlesung</option> -<option value="1" $!op11 >Praktikum</option> -<option value="2" $!op12 >Seminar</option> -</select></td> +<td>$portalPresenter.printSelect("cmtype","Lecture,Laboratory Course,Seminar","Lecture,Laboratory Course,Seminar","$!cm.getType()") +</td> </tr> <tr> <td>Visibility</td> <td> -<select name="cmhidden" size="1"> -#set ($seloption = "$courseModule.getHidden()") -#if ( $seloption == "0" ) -#set ($op20 = 'selected="1"') -#elseif ( $seloption == "1" ) -#set ($op21 = 'selected="1"') -#elseif ( $seloption == "2" ) -#set ($op22 = 'selected="1"') -#end -<option value="0" $!op20 >confirmed/show</option> -<option value="1" $!op21 >outdated/hidden</option> -<option value="2" $!op22 >not confirmed/hidden</option> -</select> +$portalPresenter.printSelect("cmhidden","confirmed/show,archived/hidden,not confirmed/hidden","0,1,2","$cm.getHidden()") </td> </tr> <tr> <td>ECTS Credits</td> -<td><input name="cmectscredits" size="5" value="$!courseModule.getEctsCredits()"> <i>example: 12<strong>.</strong>5</i></td> +<td><input name="cmectscredits" size="5" value="$!cm.getEctsCredits()"> <i>example: 12<strong>.</strong>5</i></td> </tr> <tr> <td>Hours per Term</td> <td> - lecture: <input name="cmhours_lec" size="2" value="$!courseModule.getHoursLecture()"> - exercises: <input name="cmhours_ex" size="2" value="$!courseModule.getHoursExercises()"> - seminar: <input name="cmhours_sem" size="2" value="$!courseModule.getHoursSeminar()"> - lab: <input name="cmhours_lab" size="2" value="$!courseModule.getHoursLab()"> + lecture: <input name="cmhours_lec" size="2" value="$!cm.getHoursLecture()"> + exercises: <input name="cmhours_ex" size="2" value="$!cm.getHoursExercises()"> + seminar: <input name="cmhours_sem" size="2" value="$!cm.getHoursSeminar()"> + lab: <input name="cmhours_lab" size="2" value="$!cm.getHoursLab()"> </td> </tr> <tr> +<td>Capacity</td> +<td><input name="cmcapacity" size="5" value="$!cm.getCapacity()"></td> +</tr> +<tr> <td>Content (de)</td> -<td><textarea name="cmcontent" rows="3" cols="70">$!courseModule.getContent()</textarea></td> +<td><textarea name="cmcontent" rows="3" cols="70">$!cm.getContent()</textarea></td> </tr> <tr> <td>Content (en)</td> -<td><textarea name="cmcontent_en" rows="3" cols="70">$!courseModule.getContent('en')</textarea></td> +<td><textarea name="cmcontent_en" rows="3" cols="70">$!cm.getContent('en')</textarea></td> +</tr> +<tr> +<td>Learning Target (de)</td> +<td><textarea name="cmtarget" rows="3" cols="70">$!cm.getTarget()</textarea></td> +</tr> +<tr> +<td>Learning Target (en)</td> +<td><textarea name="cmtarget_en" rows="3" cols="70">$!cm.getTarget('en')</textarea></td> </tr> <tr> <td>Prerequesits (de)</td> -<td><textarea name="cmprerequ" rows="3" cols="70">$!courseModule.getPrerequ()</textarea></td> +<td><textarea name="cmprerequ" rows="3" cols="70">$!cm.getPrerequ()</textarea></td> </tr> <tr> <td>Prerequesits (en)</td> -<td><textarea name="cmprerequ_en" rows="3" cols="70">$!courseModule.getPrerequ('en')</textarea></td> +<td><textarea name="cmprerequ_en" rows="3" cols="70">$!cm.getPrerequ('en')</textarea></td> </tr> <tr> -<td>Prerequesits for Certificate (de)</td> -<td><textarea name="cmprerequcert" rows="3" cols="70">$!courseModule.getPrerequCert()</textarea></td> +<td>Certificate (de)</td> +<td><textarea name="cmcert" rows="3" cols="70">$!cm.getCert()</textarea></td> </tr> <tr> -<td>Prerequesits for Certificate (en)</td> -<td><textarea name="cmprerequcert_en" rows="3" cols="70">$!courseModule.getPrerequCert('en')</textarea></td> +<td>Certificate (en)</td> +<td><textarea name="cmcert_en" rows="3" cols="70">$!cm.getCert('en')</textarea></td> +</tr> +<tr> +<td>Didactics (de)</td> +<td><textarea name="cmdidactics" rows="3" cols="70">$!cm.getDidactics()</textarea></td> +</tr> +<tr> +<td>Didactics (en)</td> +<td><textarea name="cmdidactics_en" rows="3" cols="70">$!cm.getDidactics('en')</textarea></td> </tr> <tr> <td>Cycle</td> -<td><select name="cmcycle" size="1"> -#set ($seloption = "$courseModule.getCycle()") -#if ( $seloption == "0" ) -#set ($op30 = 'selected="1"') -#elseif ( $seloption == "1" ) -#set ($op31 = 'selected="1"') -#elseif ( $seloption == "2" ) -#set ($op32 = 'selected="1"') -#elseif ( $seloption == "3" ) -#set ($op33 = 'selected="1"') -#end -<option value="0" $!op30 >once</option> -<option value="1" $!op31 >every winter term</option> -<option value="2" $!op32 >every summer term</option> -<option value="3" $!op33 >every term</option> -</select></td> - - - +<td><input name="cmcycle" siez="10" value="$cm.getCycle()"></td> </tr> <tr> -<td>Applicant</td> -<td><input name="cmapplicant" size="70" value="$!courseModule.getApplicant()"></td> +<td>Responsible</td> +<td><input name="cmresponsible" size="70" value="$!cm.getResponsible()"></td> </tr> <tr> -<td>Examiner</td> -<td><input name="cmexaminer" size="70" value="$!courseModule.getExaminer()"></td> +<td>Comment</td> +<td><textarea name="cmcomment" rows="3" cols="70">$!cm.getComment()</textarea></td> </tr> <tr> <td>Imported</td> <td> -#if ( $courseModule.getImport() == "1" ) +#if ( $cm.getImport() == "1" ) <b>yes</b> #else <b>no</b> @@ -146,7 +130,7 @@ </td> </tr> </table> -<h3>Programrelation</h3> +<h3>Relation to course programs</h3> <table border="0"> <tr> <td>Program</td> @@ -154,7 +138,7 @@ <td>Startsemester</td> <td>Endsemester</td> </tr> -#set ( $courseTempProgRel = $courseModule.getProgramRel() ) +#set ( $courseTempProgRel = $cm.getProgramRel() ) #set ($j = 0) #foreach ( $cmpr in $courseTempProgRel ) #set ($j = $j + 1) @@ -172,40 +156,13 @@ </select> </td> <td> - <select name="type$j"> - <option value="">----</option> - #foreach( $i in ["pf","wp","wa","ko","vt","er","gr","ke"] ) - #set ($sel = "") - #if ($i == $cmpr.getType()) - #set ($sel = 'selected="1"') - #end - <option value="$i" $!sel>$i</option> - #end - </select> +$portalPresenter.printSelect("type$j","--,pf,wp,wa,ko,vt,er,gr,ke"," ,pf,wp,wa,ko,vt,er,gr,ke",$cmpr.getType()) </td> <td> - <select name="startsem$j"> - <option value="">----</option> - #foreach( $i in [1..9] ) - #set ($sel = "") - #if ($i == $cmpr.getStartSem()) - #set ($sel = 'selected="1"') - #end - <option value="$i" $!sel>$i</option> - #end - </select> +$portalPresenter.printSelect("startsem$j","--,1,2,3,4,5,6,7,8,9"," 0,1,2,3,4,5,6,7,8,9","$!cmpr.getStartSem()") </td> <td> - <select name="endsem$j"> - <option value="">----</option> - #foreach( $i in [1..9] ) - #set ($sel = "") - #if ($i == $cmpr.getEndSem()) - #set ($sel = 'selected="1"') - #end - <option value="$i" $!sel>$i</option> - #end - </select> +$portalPresenter.printSelect("endsem$j","--,1,2,3,4,5,6,7,8,9"," 0,1,2,3,4,5,6,7,8,9","$!cmpr.getEndSem()") </td> </tr> #end @@ -224,15 +181,15 @@ </td> <td> <select name="type$i"> - <option value="">----</option> - #foreach( $i in ["pf","wp","wa","ko","vt","er","gr","ke"] ) + <option value="">--</option> + #foreach( $i in ["pf","wp","wa","ko","vt","er","gr","ke"] ) <option value="$i">$i</option> #end </select> </td> <td> <select name="startsem$i"> - <option value="">----</option> + <option value="">--</option> #foreach( $i in [1..9] ) <option value="$i">$i</option> #end @@ -240,7 +197,7 @@ </td> <td> <select name="endsem$i"> - <option value="">----</option> + <option value="">--</option> #foreach( $i in [1..9] ) <option value="$i">$i</option> #end @@ -251,8 +208,10 @@ </table> <p> <input type="hidden" name="cmprogcnt" value="$j"/> -<input type="submit" class="submit" value="Update Course"/> +<input type="submit" class="submit" value="Update Course Module"/> </form> -#parse ( "pagefooter.html" ) \ No newline at end of file +#end + +$portalPresenter.parse("$!contextPath/pagefooter.html.en",$portalRequest) Index: clsearch.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/course/clsearch.html.en,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- clsearch.html.en 27 Oct 2004 15:45:51 -0000 1.4 +++ clsearch.html.en 30 May 2006 14:18:30 -0000 1.5 @@ -1,41 +1,34 @@ -#parse ( "pageheader.html" ) + +$portalPresenter.parse("$!contextPath/pageheader.html.en",$portalRequest) + #set ($query = "lfirstname=$!{lfirstname}&llastname=$!{llastname}<yp=$!{ltyp}&lgroup=$!{lgroup}") + <em><a href="index.html">Course Component</a> - -<a href="clcreate.html">Create Courselecturer</a></em> +<a href="clcreate.html">Create Lecturer</a></em> -<h1>Search Course Lecturer</h1> +<h1>Search Lecturer</h1> <table border="0"> <form action="clsearch.html" method="post"> <tr> - <td>Firstname / Lastname</td> + <td>Lastname / Firstname</td> <td> - <input name="lfirstname" size="20" value="$!lfirstname"> - <input name="llastname" size="20" value="$!llastname"> + <input name="llastname" size="20" value="$!llastname"> + <input name="lfirstname" size="20" value="$!lfirstname"> </td> </tr> <tr> - <td>Type / Group</td> + <td>Type</td> <td> <select name="ltyp"> <option value="" selected="1">all types</option> <option value="p">professors</option> <option value="e">external Lecturers</option> <option value="a">assistents</option> - </select> - <select name="lgroup" size="1"> - <option value="">all groups</option> - #foreach ( $cg in $coursePresenter.getCourseGroups() ) - #set ($sel = "") - #if ("$cg.getId()" == "$!lgroup") - #set ($sel = 'selected="1"') - #end - <option value="$!cg.getId()" $!sel>$!cg.getTitle()</option> - #end - </select> + </select> </td> </tr> <tr> - <td colspan="2"><br /><input type="submit" class="submit" value="Search Courselecturer"/></td> + <td colspan="2"><br /><input type="submit" class="submit" value="Search Lecturers"/></td> </tr> </form> </table> @@ -46,7 +39,7 @@ <td>Lastname</td> <td>Firstname</td> <td>Type</td> - <td>Operation</td> + <td> </td> </tr> #foreach ( $c in $coursePresenter.searchCourseLecturers($query) ) <tr> @@ -71,4 +64,5 @@ #end </table> <br /> -#parse ( "pagefooter.html" ) + +$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) --- cview.html.en DELETED --- Index: crsearch.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/course/crsearch.html.en,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- crsearch.html.en 16 Oct 2004 18:09:39 -0000 1.3 +++ crsearch.html.en 30 May 2006 14:18:30 -0000 1.4 @@ -3,7 +3,7 @@ #set ($query = "crname=$!{crname}") <em><a href="index.html">Course Component</a> - -<a href="crcreate.html">Create Courseroom</a></em> +<a href="crcreate.html">Create Course room</a></em> <h1>Search Course Room</h1> <table border="0"> @@ -14,7 +14,7 @@ </tr> <tr> - <td colspan="2"><br /><input type="submit" class="submit" value="Search Courseroom"/></td> + <td colspan="2"><br /><input type="submit" class="submit" value="Search Course room"/></td> </tr> </form> </table> Index: ccreatepreselect.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/course/ccreatepreselect.html.en,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ccreatepreselect.html.en 10 Sep 2004 09:00:29 -0000 1.3 +++ ccreatepreselect.html.en 30 May 2006 14:18:30 -0000 1.4 @@ -1,32 +1,34 @@ -#parse ( "pageheader.html" ) + +$portalPresenter.parse("$contextPath/pageheader.html.en",$portalRequest) <em><a href="index.html">Course Component</a> - <a href="csearch.html">Search Course</a></em> -<h1>Create Course</h1> +<h1>Create Course (Step 1)</h1> #if ( $returnCode > 1999 ) -<font color="red">Failed creating Course object.</font><p> +<font color="red">Failed creating course.</font><p> #end -First preselect a course template by a substring of the course -template name. +<p>First select a module for the course from the list or search for +matching modules by specifying a substring for the module title.</p> + <p> <form action="ccreatepreselect.html" method="post"> - <input name="ctname" size="50"> - <input type="submit" class="submit" value="Preselect Coursetemplates"/> + <input name="cmname" size="50"> + <input type="submit" class="submit" value="Search Modules"/> </form> </p> -<p>Course Templates<br /> +<p>Modules<br /> <form action="ccreate.html" method="post"> - <!-- TODO Validation against empty selection--> - <select name="ctplid" size="20"> - #foreach ( $ct in $coursePresenter.getCourseTemplates("$!ctplid", "$!ctname") ) - <option value="$!ct.getId()">$!ct.getName()</option> - #end - </select> - <br /> - <input type="submit" class="submit" value="Create Course"/> +<select name="cmid" size="20"> +#foreach ( $cm in $coursePresenter.getCourseModules("$!cmid", "$!cmname") ) + <option value="$!cm.getId()">$!cm.getName()</option> +#end +</select> +<br /> +<input type="submit" class="submit" value="Create Course"/> </form> </p> -#parse ( "pagefooter.html" ) \ No newline at end of file + +$portalPresenter.parse("$contextPath/pagefooter.html.en",$portalRequest) Index: cmdelete.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/course/cmdelete.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cmdelete.html.en 22 Aug 2005 13:54:29 -0000 1.1 +++ cmdelete.html.en 30 May 2006 14:18:30 -0000 1.2 @@ -1,11 +1,13 @@ -#parse ( "pageheader.html" ) + +$portalPresenter.parse("$!contextPath/pageheader.html.en",$portalRequest) <em><a href="index.html">Course Component</a> - <a href="cmsearch.html">Search Course Modules</a></em> + #if ( $returnCode > 1999 ) <font color="red">Failed deleting CourseModule object.</font><p> #end -<h1>Delete Course with ID: $cmid</h1> +<h1>Delete Course module with ID: $cmid</h1> #set ($query = "cmid=$!{cmid}&") ##set $courseSR = $coursePresenter.searchCourses($query); @@ -22,7 +24,7 @@ </tr> #foreach ( $c in $coursePresenter.searchCourses($query) ) <tr> - <td><a href="cview.html?cid=$c.getId()">$!c.getName()</a></td> + <td><a href="c.html?cid=$c.getId()">$!c.getName()</a></td> <td>$!c.getComment()</td> <td align="center"> <a href="cupdate.html?cid=$c.getId()">edit</a> | @@ -34,7 +36,7 @@ <br /><br /> <form action="/COURSE" method="post"> <input type="hidden" name="cmd" value="deletecoursemodule" /> -<input type="hidden" name="cmd.success" value="/course/cmresult.html" /> +<input type="hidden" name="cmd.success" value="/course/index.html" /> <input type="hidden" name="cmd.error" value="/course/cmdelete.html" /> <input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> @@ -45,4 +47,4 @@ <input type="submit" class="submit" value="Delete Course Module"/> </form> -#parse ( "pagefooter.html" ) +$portalPresenter.parse("$!contextPath/pagefooter.html.en",$portalRequest) --- NEW FILE: c.html.en --- $portalPresenter.parse("$!contextPath/pageheader.html.en",$portalRequest) <em><a href="index.html">Course Component</a> - <a href="cview.html">Show Course</a></em> #set ($cid = $!cid) #set( $course = $coursePresenter.getCourse($cid) ) #set( $cm = $course.getCourseModule() ) <h1>$!cm.getName()</h1> <table border="0"> <tr> <td>Type</td> <td> $cm.getType() </td> </tr> <tr> <td>Term</td> <td> $!coursePresenter.getTermName("$course.getTerm()") </td> </tr> <tr> <td>Name (de)</td> <td>$!course.getName()</td> </tr> <tr> <td>Name (en)</td> <td>$!course.getName("en")</td> </tr> <tr> <td>Comment</td> <td>$!course.getComment()</td> </tr> <tr> <td>Language</td> <td> #set ($seloption = "$course.getLang()") #if ( $seloption == "de") German #elseif ( $seloption == "en" ) English #end </td> </tr> <tr> <td>URL</td> <td>$!course.getUrl()</td> </tr> <tr> <td>Capacity</td> <td>$!course.getCapacity()</td> </tr> <tr> <td>ECTS Credits</td> <td>$!course.getEctsCredits()</td> </tr> <tr> <td>Hours per Term</td> <td>$coursePresenter.printSWS($course)</td> </tr> <tr> <td valign="top">Content (de)</td> <td>$!course.getContent()</td> </tr> <tr> <td valign="top">Content (en)</td> <td>$!course.getContent('en')</td> </tr> <tr> <td valign="top">Learing Target (de)</td> <td>$!course.getTarget()</td> </tr> <tr> <td valign="top">Learning Target (en)</td> <td>$!course.getTarget('en')</td> </tr> <tr> <td valign="top">Prerequesits (de)</td> <td>$!course.getPrerequ()</td> </tr> <tr> <td valign="top">Prerequesits (en)</td> <td>$!course.getPrerequ('en')</td> </tr> <tr> <td valign="top">Certificate (de)</td> <td>$!course.getCert()</td> </tr> <tr> <td valign="top">Certificate (en)</td> <td>$!course.getCert('en')</td> </tr> <tr> <td valign="top">Didactics (de)</td> <td>$!course.getDidactics()</td> </tr> <tr> <td valign="top">Didactics (en)</td> <td>$!course.getDidactics('en')</td> </tr> </table> <h3>Lecturers</h3> <table border="0"> #foreach ( $c in $coursePresenter.getLecturersForCourse($cid) ) <tr> <td>$!c.getFirstName()</td> <td>$!c.getLastName()</td> </tr> #end </table> <h3>Dates</h3> <table border="1"> <tr> <td>Weekday</td> <td colspan=3>Begin</td> <td> </td> <td colspan=3>End</td> <td>Room</td> <td>Startdate</td> <td>Enddate</td> <td>Cycle</td> <td>Type</td> </tr> #set ( $courseDates = $coursePresenter.getCourseDates($cid) ) #foreach ( $cDate in $courseDates ) <tr> <td> #set ($seloption = "$cDate.getWeekday()") #if ( $seloption == $coursePresenter.MONDAY ) Mo #elseif ( $seloption == $coursePresenter.TUESDAY ) Tu #elseif ( $seloption == $coursePresenter.WEDNESDAY ) We #elseif ( $seloption == $coursePresenter.THURSDAY ) Th #elseif ( $seloption == $coursePresenter.FRIDAY ) Fr #elseif ( $seloption == $coursePresenter.SATURDAY ) Sa #elseif ( $seloption == $coursePresenter.SUNDAY ) Su #end </td> <td>$!cDate.getStartHour()</td><td>:</td> <td>$!cDate.getStartMin()</td><td>-</td> <td>$!cDate.getEndHour()</td><td>:</td> <td>$!cDate.getEndMin()</td> <td> #foreach ( $cr in $coursePresenter.searchCourseRooms("") ) #set ($sel = "") #if ($cr.getId() == $cDate.getRoomId()) $!cr.getName() #end #end </td> <td>$!cDate.getStartDate()</td> <td>$!cDate.getEndDate()</td> <td> #set ($seloption = "$cDate.getCycle()") #if ( $seloption == "0" ) dayly/once #elseif ( $seloption == "1" ) weekly #elseif ( $seloption == "2" ) biweekly #end </td> <td> #set ($seloption = "$cDate.getType()") #if ( $seloption == "0" ) standart #elseif ( $seloption == "1" ) exercise #elseif ( $seloption == "2" ) central exercise #end </td> </tr> #end </table> <p> $portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) Index: cpupdate.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/course/cpupdate.html.en,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- cpupdate.html.en 11 Sep 2004 13:22:43 -0000 1.4 +++ cpupdate.html.en 30 May 2006 14:18:30 -0000 1.5 @@ -1,19 +1,21 @@ -#parse ( "pageheader.html" ) + +$portalPresenter.parse("$!contextPath/pageheader.html.en",$portalRequest) <em><a href="index.html">Course Component</a> - -<a href="cpcreate.html">Create Courseprogram</a></em> +<a href="cpcreate.html">Create Course program</a></em> + #if ( $returnCode > 1999 ) -<br /><font color="red">Failed updating Courseprogram object.</font><p> +<br /><font color="red">Failed updating Course program object.</font><p> #end #set ( $courseProgram = $coursePresenter.getCourseProgram($cpid) ) -<h1>Update Courseprogram with ID: $courseProgram.getId()</h1> +<h1>Update Course program with ID: $courseProgram.getId()</h1> <table border="0"> <form action="/COURSE" method="post"> <input type="hidden" name="cmd" value="updatecourseprogram"> -<input type="hidden" name="cmd.success" value="/course/cpresult.html" /> +<input type="hidden" name="cmd.success" value="/course/index.html" /> <input type="hidden" name="cmd.error" value="/course/cpupdate.html" /> <input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> @@ -44,10 +46,10 @@ <td><textarea rows="6" cols="50" readonly >$!courseProgram.toXML()</textarea></td> </tr> <tr--> - <td colspan="2"><br /><input type="submit" class="submit" value="Update Courseprogram"/></td> + <td colspan="2"><br /><input type="submit" class="submit" value="Update Course program"/></td> </tr> </form> </table> -#parse ( "pagefooter.html" ) +$portalPresenter.parse("$!contextPath/pagefooter.html.en",$portalRequest) Index: cdelete.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/course/cdelete.html.en,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cdelete.html.en 19 Jul 2004 21:31:26 -0000 1.2 +++ cdelete.html.en 30 May 2006 14:18:30 -0000 1.3 @@ -1,8 +1,10 @@ -#parse ( "pageheader.html" ) + +$portalPresenter.parse("$!contextPath/pageheader.html.en",$portalRequest) <em><a href="index.html">Course Component</a> - <a href="ccreatepreselect.html">Create Courses</a> - <a href="csearch.html">Search Courses</a></em> + #if ( $returnCode > 1999 ) <font color="red">Failed deleting Course object.</font><p> #end @@ -10,7 +12,7 @@ <h1>Delete Course with ID: $cid</h1> <form action="/COURSE" method="post"> <input type="hidden" name="cmd" value="deletecourse" /> -<input type="hidden" name="cmd.success" value="/course/cresult.html" /> +<input type="hidden" name="cmd.success" value="/course/index.html" /> <input type="hidden" name="cmd.error" value="/course/cdelete.html" /> <input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> @@ -21,4 +23,4 @@ <input type="submit" class="submit" value="Delete Course"/> </form> -#parse ( "pagefooter.html" ) +$portalPresenter.parse("$!contextPath/pagefooter.html.en",$portalRequest) Index: csearch.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/course/csearch.html.en,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- csearch.html.en 10 Nov 2004 23:56:14 -0000 1.10 +++ csearch.html.en 30 May 2006 14:18:30 -0000 1.11 @@ -1,10 +1,16 @@ -#parse ( "pageheader.html" ) +$portalPresenter.parse("$!contextPath/pageheader.html.en",$portalRequest) + +#set ($tmps = "$!cname$!cname_en$!cmtype$!cterm$!clang$!cmid$!lecturername$!crid$!cmhidden$!weekday$!startdate$!enddate$!cycle$!cpid$!coursetype$!starthour$!endhour$endmin$!startmin") +#if ("$!tmps" == "") +#set ($query = "cid=0") +#else #set ($query = "cname=$!{cname}&cname_en=$!{cname_en}&cttype=$!{cttype}&cterm=$!{cterm}&clang=$!{clang}&cgroup=$!{cgroup}&") #set ($query = "${query}lecturername=$!{lecturername}&crid=$!{crid}&cthidden=$!{cthidden}&weekday=$!{weekday}&") #set ($query = "${query}startdate=$!{startdate}&enddate=$!{enddate}&cycle=$!{cycle}&eventtype=$!{eventtype}&") #set ($query = "${query}cpid=$!{cpid}&coursetype=$!{coursetype}&") #set ($query = "${query}starthour=$!{starthour}&startmin=$!{startmin}&endhour=$!{endhour}&endmin=$!{endmin}&") +#end #set ( $auserlogin = "$!auserlogin" ) #if ( $auserlogin == "" ) @@ -16,6 +22,41 @@ <a href="ccreatepreselect.html">Create Courses</a></em> <h1>Search Courses</h1> + +#set ( $results = $coursePresenter.searchCourses($query) ) +#set ( $rcount = $results.size() ) +<p> +#if ( "$!rcount" == "0" ) +#if ( "$!query" != "cid=0" ) +The search has found no results. +<p> + +#end +#else +The search has found $rcount results:<p> +<table id="result" width="90%" align="center"> +#foreach ( $c in $results ) +<tr> +<td><a href="c.html?cid=$c.getId()">$!c.getName()</a></td> +<td>$!c.getTerm()</td> +<td> +#set( $courseModule = $c.getCourseModule()) +$courseModule.getType() +</td> +<td align="center"> +<a href="/COURSE?cmd=addcoursett&cid=$c.getId()&uid=$auserid&cmd.success=/course/timetable.html&cmd.error=/course/timetable.html">add to timetable</a> | +<a href="cupdate.html?cid=$c.getId()">edit</a> | +<a href="cdelete.html?cid=$c.getId()">delete</a> +</td> +</tr> +#end +</table> +<p> + +#end + +<p> + <table border="0"> <form action="csearch.html" method="post"> <tr> @@ -26,105 +67,28 @@ <td>Name (en)</td> <td><input name="cname_en" size="50" value="$!cname_en"></td> </tr> -<!--tr> +<tr> <td>Type</td> <td> - <select name="cttype" size="1"> - #set ($seloption = $cttype) - #if ( $seloption == "0" ) - #set ($op10 = 'selected="1"') - #elseif ( $seloption == "1" ) - #set ($op11 = 'selected="1"') - #elseif ( $seloption == "2" ) - #set ($op12 = 'selected="1"') - #end - <option value="" >all</option> - <option value="0" $!op10 >Vorlesung</option> - <option value="1" $!op11 >Praktikum</option> - <option value="2" $!op12 >Seminar</option> - </select> +$portalPresenter.printSelect("cmtype","all,Lecture,Laboratory Course,Seminar"," ,Lecture,Laboratory Course,Seminar","$!cmtype") </td> -</tr--> +</tr> <tr> <td>Term</td> <td> <select name="cterm" size="1"> <option value="" >all</option> - $!coursePresenter.getTerms("notemptystring") - </select> - </td> -</tr> -<tr> - <td>Language</td> - <td> - <select name="clang" size="1"> - #set ($seloption = "$!clang") - #if ( $seloption == "de") - #set ($op31 = 'selected="1"') - #elseif ( $seloption == "en" ) - #set ($op32 = 'selected="1"') - #end - <option value="" >all</option> - <option value="de" $!op31>German</option> - <option value="en" $!op32>English</option> +$!coursePresenter.getTerms("notemptystring") </select> </td> </tr> <tr> - <td>Visibility</td> - <td> - <select name="cthidden" size="1"> - #set ($seloption = "$!cthidden") - #if ( $seloption == "0" ) - #set ($op20 = 'selected="1"') - #elseif ( $seloption == "1" ) - #set ($op21 = 'selected="1"') - #elseif ( $seloption == "2" ) - #set ($op22 = 'selected="1"') - #end - <option value="" >all</option> - <option value="0" $!op20 >confirmed/show</option> - <option value="1" $!op21 >outdated/hidden</option> - <option value="2" $!op22 >not confirmed/hidden</option> - </select> - </td> -</tr> -<tr> - <td>Cycle</td> - <td> - <select name="cycle" size="1"> - #set ($seloption = "$!cycle") - #if ( $seloption == "0" ) - #set ($op30 = 'selected="1"') - #elseif ( $seloption == "1" ) - #set ($op31 = 'selected="1"') - #elseif ( $seloption == "2" ) - #set ($op32 = 'selected="1"') - #elseif ( $seloption == "3" ) - #set ($op33 = 'selected="1"') - #end - <option value="">all</option> - <option value="0" $!op30 >once</option> - <option value="1" $!op31 >every winter term</option> - <option value="2" $!op32 >every summer term</option> - <option value="3" $!op33 >every term</option> - </select> - </td> +<td>Language</td> +<td>$portalPresenter.printSelect("clang","all,German,English"," ,de,en","$!clang")</td> </tr> <tr> - <td>Group</td> - <td> - <select name="cgroup" size="1"> - <option value="" >all</option> - #foreach ( $cg in $coursePresenter.getCourseGroups() ) - #set ($sel = "") - #if ("$cg.getId()" == "$cgroup") - #set ($sel = 'selected="1"') - #end - <option value="$!cg.getId()" $!sel>$!cg.getTitle()</option> - #end - </select> - </td> +<td>Visibility</td> +<td>$portalPresenter.printSelect("cthidden","all,confirmed/show,archived/hidden,not confirmed/hidden"," ,0,1,2","$!cthidden")</td> </tr> <tr> <td>Lecturer</td> @@ -146,42 +110,9 @@ </td> </tr> <tr> - <td>Weekday</td> - <td> - <select name="weekday"> - <option value="">all</option> - #set ($op91 = '') - #set ($op92 = '') - #set ($op93 = '') - #set ($op94 = '') - #set ($op95 = '') - #set ($op96 = '') - #set ($op97 = '') - #set ($seloption = "$!weekday") - #if ( $seloption == "1" ) - #set ($op91 = 'selected="1"') - #elseif ( $seloption == "2" ) - #set ($op92 = 'selected="1"') - #elseif ( $seloption == "3" ) - #set ($op93 = 'selected="1"') - #elseif ( $seloption == "4" ) - #set ($op94 = 'selected="1"') - #elseif ( $seloption == "5" ) - #set ($op95 = 'selected="1"') - #elseif ( $seloption == "6" ) - #set ($op96 = 'selected="1"') - #elseif ( $seloption == "7" ) - #set ($op97 = 'selected="1"') - #end - <option value="1" $!op91>Mo </option> - <option value="2" $!op92>Tu </option> - <option value="3" $!op93>We </option> - <option value="4" $!op94>Th </option> - <option value="5" $!op95>Fr </option> - <option value="6" $!op96>Sa </option> - <option value="7" $!op97>Su </option> - </select> - </td> +<td>Weekday</td> +<td> +$portalPresenter.printSelect("weekday","all,Mo,Tu,We,Th,Fr,Sa,Su"," ,1,2,3,4,5,6,7","$!weekday")</td> </tr> <tr> <td>Timeframe</td> @@ -204,26 +135,8 @@ </tr> <tr> <tr> - <td>Event type</td> - <td> - <select name="eventtype"> - #set ($op80 = '') - #set ($op81 = '') - #set ($op82 = '') - #set ($seloption = "$!eventtype") - #if ( $seloption == "0" ) - #set ($op80 = 'selected="1"') - #elseif ( $seloption == "1" ) - #set ($op81 = 'selected="1"') - #elseif ( $seloption == "2" ) - #set ($op82 = 'selected="1"') - #end - <option value="">all</option> - <option value="0" $!op80>standard</option> - <option value="1" $!op81>exercise</option> - <option value="2" $!op82>central exercise</option> - </select> - </td> +<td>Event type</td> +<td>$portalPresenter.printSelect("eventtype","all,standard,exercise,central exercise"," ,0,1,2","$!eventtype")</td> </tr> <tr> <td>Program</td> @@ -260,36 +173,5 @@ </tr> </form> </table> -<p> -<table id="result" width="90%" align="center"> - <tr class="resulttitle"> - <td>Name</td> - <td>Comment</td> - <!--td>Type</td--> - <td align="center" nowrap="yes">Operation</td> - </tr> - #foreach ( $c in $coursePresenter.searchCourses($query) ) - <tr> - <td><a href="cview.html?cid=$c.getId()">$!c.getName()</a></td> - <td>$!c.getComment()</td> - <!--td> - #set( $courseTemplate = $c.getCourseTemplate()) - #set ($seloption = $courseTemplate.getType()) - #if ( $seloption == "0" ) - Vorlesung - #elseif ( $seloption == "1" ) - Praktikum - #elseif ( $seloption == "2" ) - Seminar - #end - </td--> - <td align="center"> - <a href="/COURSE?cmd=addcoursett&cid=$c.getId()&uid=$auserid&cmd.success=/course/timetable.html&cmd.error=/course/timetable.html">add to timetable</a> | - <a href="cupdate.html?cid=$c.getId()">edit</a> | - <a href="cdelete.html?cid=$c.getId()">delete</a> - </td> - </tr> - #end -</table> -#parse ( "pagefooter.html" ) \ No newline at end of file +$portalPresenter.parse("$!contextPath/pagefooter.html.en",$portalRequest) Index: cupdate.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/course/cupdate.html.en,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- cupdate.html.en 10 Nov 2004 23:56:14 -0000 1.10 +++ cupdate.html.en 30 May 2006 14:18:30 -0000 1.11 @@ -1,43 +1,49 @@ -#parse ( "pageheader.html" ) + +$portalPresenter.parse("$!contextPath/pageheader.html.en",$portalRequest) <em><a href="index.html">Course Component</a> - -<a href="ccreatepreselect.html">Create Courses</a> - -<a href="csearch.html">Search Courses</a></em> +<a href="cupdaate.html">Update Course</a></em> + +<h1>Update Course</h1> + +#set ( $auserid = $userManager.getUserIdForUserLogin($userLogin) ) +#if ( $auserid == 0 ) + +<p>You have to <a href="/user-register.html">create an account</a> and +<a href="/login.html">log in</a> to access this functionality.</p> + +<p>If you already have logged in and get this message, please check if +your Web browser accepts cookies for this web site - otherwise it +does not remember your login.</p> + +#else + +#set ($cid = $!cid) +#set( $course = $coursePresenter.getCourse($cid) ) +#set( $courseModule = $course.getCourseModule() ) + #if ( $returnCode > 1999 ) <font color="red">Failed updating Course object.</font><p> #end -#set ($cid = $!cid) -#set( $course = $coursePresenter.getCourse($cid) ) -#set( $courseTemplate = $course.getCourseTemplate() ) -<h1>Update Course with ID: $cid</h1> -<script> - -</script> + <form action="/COURSE" method="post" name="courseform"> <input type="hidden" name="cmd" value="updatecourse"> -<input type="hidden" name="cmd.success" value="/course/cresult.html" /> +<input type="hidden" name="cmd.success" value="/course/index.html" /> <input type="hidden" name="cmd.error" value="/course/cupdate.html" /> <input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="cid" value="$cid" /> -<h2>$!courseTemplate.getName()</h2> +<h2>$!courseModule.getName()</h2> <table border="0"> <tr> - <td>Template ID</td> - <td><input name="ctplid" size="8" value="$!courseTemplate.getId()"></td> + <td>Course Module ID</td> + <td><input name="ctplid" size="8" value="$!courseModule.getId()"></td> </tr> <tr> <td>Type</td> <td><b> - #set ($seloption = $courseTemplate.getType()) - #if ( $seloption == "0" ) - Vorlesung - #elseif ( $seloption == "1" ) - Praktikum - #elseif ( $seloption == "2" ) - Seminar - #end +$courseModule.getType() </b> </td> </tr> @@ -64,30 +70,7 @@ <tr> <td>Language</td> <td> - <select name="clang" size="1"> - #set ($seloption = "$course.getLang()") - #if ( $seloption == "de") - #set ($op31 = 'selected="1"') - #elseif ( $seloption == "en" ) - #set ($op32 = 'selected="1"') - #end - <option value="de" $!op31>German</option> - <option value="en" $!op32>English</option> - </select> - </td> -</tr> -<tr> - <td>Group</td> - <td> - <select name="cgroup" size="1"> - #foreach ( $cg in $coursePresenter.getCourseGroups() ) - #set ($sel = "") - #if ($cg.getId() == $course.getGroup()) - #set ($sel = 'selected="1"') - #end - <option value="$!cg.getId()" $!sel>$!cg.getTitle()</option> - #end - </select> +$portalPresenter.printSelect("clang","German,English","de,en","$course.getLang()") </td> </tr> <tr> @@ -95,12 +78,12 @@ <td><input name="curl" size="70" value="$!course.getUrl()"></td> </tr> <tr> - <td>Participants</td> - <td><input name="cparticipants" size="5" value="$!course.getParticipants()"></td> + <td>Capacity</td> + <td><input name="ccapacity" size="5" value="$!course.getCapacity()"></td> </tr> <tr> <td>ECTS Credits</td> - <td><input name="cectscredits" size="5" value="$!course.getEctsCredits()"> <i>(13<b>.</b>5)</i></td> + <td><input name="cectscredits" size="5" value="$!course.getEctsCredits()"> <i>(e.g. 13<b>.</b>5)</i></td> </tr> <tr> <td>Hours per Term</td> @@ -124,13 +107,13 @@ </tr> #end <tr> - <td>New lecturer id</td> - <td><input name="lecturerid" size="10"> <a href="clsearch.html"><i>search lecturers</i></a></td> + <td>New lecturer name</td> + <td><input name="lecturername" size="30"> <a href="clsearch.html"><i>search lecturers</i></a><br> +lastname[, firstname]</td> </tr> <tr><td colspan="2"> -<input type="button" onclick="document.forms['courseform']['cmd.success'].value='/course/cupdate.html';document.forms['courseform'].submit();" class="submit" value="Apply Changes"/> +<input type="button" onclick="document.forms['courseform']['cmd.success'].value='/course/cupdate.html';document.forms['courseform'].submit();" class="submit" value="Update Course"/> <br /><br /> -<h2>Other content:</h2><br/> </td></tr> <tr> <td>Content (de)</td> @@ -141,6 +124,14 @@ <td><textarea name="ccontent_en" rows="3" cols="70">$!course.getContent('en')</textarea></td> </tr> <tr> + <td>Learning Target (de)</td> + <td><textarea name="ctarget" rows="3" cols="70">$!course.getTarget()</textarea></td> +</tr> +<tr> + <td>Learning Target (en)</td> + <td><textarea name="ctarget_en" rows="3" cols="70">$!course.getTarget('en')</textarea></td> +</tr> +<tr> <td>Prerequesits (de)</td> <td><textarea name="cprerequ" rows="3" cols="70">$!course.getPrerequ()</textarea></td> </tr> @@ -149,12 +140,12 @@ <td><textarea name="cprerequ_en" rows="3" cols="70">$!course.getPrerequ('en')</textarea></td> </tr> <tr> - <td>Prerequesits for Certificate (de)</td> - <td><textarea name="cprerequcert" rows="3" cols="70">$!course.getPrerequCert()</textarea></td> + <td>Certificate (de)</td> + <td><textarea name="ccert" rows="3" cols="70">$!course.getCert()</textarea></td> </tr> <tr> - <td>Prerequesits for Certificate (en)</td> - <td><textarea name="cprerequcert_en" rows="3" cols="70">$!course.getPrerequCert('en')</textarea></td> + <td>Certificate (en)</td> + <td><textarea name="ccert_en" rows="3" cols="70">$!course.getCert('en')</textarea></td> </tr> </table> <h3>Dates:</h3> @@ -284,4 +275,6 @@ <input type="submit" class="submit" value="Update Course"/> </form> -#parse ( "pagefooter.html" ) \ No newline at end of file +#end + +$portalPresenter.parse("$!contextPath/pagefooter.html.en",$portalRequest) --- crresult.html.en DELETED --- Index: cldelete.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/course/cldelete.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cldelete.html.en 12 Jul 2004 21:59:15 -0000 1.1 +++ cldelete.html.en 30 May 2006 14:18:30 -0000 1.2 @@ -1,18 +1,20 @@ -#parse ( "pageheader.html" ) + +$portalPresenter.parse("$!contextPath/pageheader.html.en",$portalRequest) <em><a href="index.html">Course Component</a> - -<a href="clsearch.html">Search Courselecturers</a></em> +<a href="clsearch.html">Search Lecturers</a></em> + #if ( $returnCode > 1999 ) -<font color="red">Failed deleting courselecturer object.</font><p> +<font color="red">Failed deleting lecturer object.</font><p> #end #set ( $courseLecturer = $coursePresenter.getCourseLecturer($lid) ) -<h1>Delete Courselecturer with Name: $courseLecturer.getLastName(), $courseLecturer.getFirstName() and ID: $lid</h1> +<h1>Delete lecturer with Name: $courseLecturer.getLastName(), $courseLecturer.getFirstName() and ID: $lid</h1> <form action="/COURSE" method="post"> <input type="hidden" name="cmd" value="deletecourselecturer" /> -<input type="hidden" name="cmd.success" value="/course/clresult.html" /> +<input type="hidden" name="cmd.success" value="/course/index.html" /> <input type="hidden" name="cmd.error" value="/course/cldelete.html" /> <input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> @@ -20,7 +22,7 @@ <input type="hidden" name="lid" value="$lid" /> <input type="button" class="submit" value="Back" onClick="javascript:history.go(-1)"/> -<input type="submit" class="submit" value="Delete Courselecturer"/> +<input type="submit" class="submit" value="Delete Lecturer"/> </form> -#parse ( "pagefooter.html" ) +$portalPresenter.parse("$!contextPath/pagefooter.html.en",$portalRequest) Index: clcreate.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/course/clcreate.html.en,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- clcreate.html.en 27 Oct 2004 15:45:51 -0000 1.3 +++ clcreate.html.en 30 May 2006 14:18:30 -0000 1.4 @@ -1,49 +1,41 @@ -#parse ( "pageheader.html" ) + +$portalPresenter.parse("$!contextPath/pageheader.html.en",$portalRequest) <em><a href="index.html">Course Component</a> - -<a href="clcreate.html">Create Courselecturer</a></em> +<a href="clcreate.html">Create lecturer</a></em> + +<h1>Create lecturer</h1> + #if ( $returnCode > 1999 ) -<br /><font color="red">Failed creating Courselecturer object.</font><p> +<br /><font color="red">Failed creating lecturer object.</font><p> #end -<h1>Create Courselecturer</h1> - <table border="0"> <form action="/COURSE" method="post"> <input type="hidden" name="cmd" value="createcourselecturer"> -<input type="hidden" name="cmd.success" value="/course/clresult.html" /> +<input type="hidden" name="cmd.success" value="/course/index.html" /> <input type="hidden" name="cmd.error" value="/course/clcreate.html" /> <input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <tr> <td>Firstname</td> - <td><input name="lfirstname" size="50" value=""></td> + <td><input name="lfirstname" size="50" value="$!lfirstname"></td> </tr> <tr> <td>Lastname</td> - <td><input name="llastname" size="50" value=""></td> + <td><input name="llastname" size="50" value="$!llastname"></td> </tr> <tr> <td>URL</td> - <td><input name="lurl" size="50" value=""></td> + <td><input name="lurl" size="50" value="$!lurl"></td> </tr> <tr> <td>Image URL</td> - <td><input name="limageurl" size="50" value=""></td> + <td><input name="limageurl" size="50" value="$!limageurl"></td> </tr> <tr> <td>External ID</td> - <td><input name="lextid" size="50" value=""></td> -</tr> -<tr> - <td>Group</td> - <td> - <select name="lgroup" size="1"> - #foreach ( $cg in $coursePresenter.getCourseGroups() ) - <option value="$!cg.getId()" $!sel>$!cg.getTitle()</option> - #end - </select> - </td> + <td><input name="lextid" size="50" value="$!lextid"></td> </tr> <tr> <td>Type</td> @@ -66,9 +58,9 @@ </td> </tr> <tr> - <td colspan="2"><br /><input type="submit" class="submit" value="Create Courselecturer"/></td> + <td colspan="2"><br /><input type="submit" class="submit" value="Create Course lecturer"/></td> </tr> </form> </table> -#parse ( "pagefooter.html" ) +$portalPresenter.parse("$!contextPath/pagefooter.html.en",$portalRequest) --- NEW FILE: cm.html.en --- $portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) <em><a href="index.html">Course Component</a> - <a href="cm.html">Show Course Module</a></em> <h1>Show Course Module</h1> #set( $cm = $coursePresenter.getCourseModule($cmid) ) <table border="0"> <tr> <td>Name (de)</td> <td>$!cm.getName()</td> </tr> <tr> <td>Name (en)</td> <td>$!cm.getName('en')</td> </tr> <tr> <td>Shortname</td> <td>$!cm.getShortName()"</td> </tr> <tr> <td>Type</td> <td>$cm.getType() </td> </tr> <tr> <td>Visibility</td> <td> #set ($seloption = "$cm.getHidden()") #if ( $seloption == "0" ) confirmed/show #elseif ( $seloption == "1" ) outdated/hidden #elseif ( $seloption == "2" ) not confirmed/hidden #end </select> </td> </tr> <tr> <td>ECTS Credits</td> <td>$!cm.getEctsCredits()</td> </tr> <tr> <td>Hours per Term</td> <td> lecture: $!cm.getHoursLecture(), exercises: $!cm.getHoursExercises(), seminar: $!cm.getHoursSeminar(), lab: $!cm.getHoursLab() </td> </tr> <tr> <td>Content (de)</td> <td>$!cm.getContent()</td> </tr> <tr> <td>Content (en)</td> <td>$!cm.getContent('en')</td> </tr> <tr> <td>Learning Target (de)</td> <td>$!cm.getTarget()</td> </tr> <tr> <td>Learning Target (en)</td> <td>$!cm.getTarget('en')</td> </tr> <tr> <td>Prerequesits (de)</td> <td>$!cm.getPrerequ()</td> </tr> <tr> <td>Prerequesits (en)</td> <td>$!cm.getPrerequ('en')</td> </tr> <tr> <td>Certificate (de)</td> <td>$!cm.getCert()</td> </tr> <tr> <td>Certificate (en)</td> <td>$!cm.getCert('en')</td> </tr> <tr> <td>Didactics (de)</td> <td>$!cm.getDidactics()</td> </tr> <tr> <td>Didactics (en)</td> <td>$!cm.getDidactics('en')</td> </tr> <tr> <td>Cycle</td> <td>$cm.getCycle()</td> </tr> <tr> <td>Responsible</td> <td>$!cm.getResponsible</td> </tr> <tr> <td>Comment</td> <td>$!cm.getComment</td> </tr> <tr> <td>Imported</td> <td> #if ( $cm.getImport() == "1" ) <b>yes</b> #else <b>no</b> #end </td> </tr> </table> <h3>Relation to course programs</h3> <table border="0"> <tr> <td>Program</td> <td>Type</td> <td>Startsemester</td> <td>Endsemester</td> </tr> #set ( $courseTempProgRel = $cm.getProgramRel() ) #set ($j = 0) #foreach ( $cmpr in $courseTempProgRel ) #set ($j = $j + 1) <tr> <td> $cmpr.getProgramId()) </td> <td> $cmpr.getType()) </td> <td> $cmpr.getStartSem()) </td> <td> $cmpr.getEndSem()) </td> </tr> #end </table> $portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) Index: cpdelete.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/course/cpdelete.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cpdelete.html.en 12 Jul 2004 21:59:15 -0000 1.1 +++ cpdelete.html.en 30 May 2006 14:18:30 -0000 1.2 @@ -1,18 +1,20 @@ -#parse ( "pageheader.html" ) + +$portalPresenter.parse("$!contextPath/pageheader.html.en",$portalRequest) <em><a href="index.html">Course Component</a> - -<a href="cpsearch.html">Search Courseprograms</a></em> +<a href="cpsearch.html">Search Course programs</a></em> + #if ( $returnCode > 1999 ) -<font color="red">Failed deleting courseroom object.</font><p> +<font color="red">Failed deleting course program object.</font><p> #end #set ( $courseProgram = $coursePresenter.getCourseProgram($cpid) ) -<h1>Delete Courseprogram with Name: $courseProgram.getName() and ID: $cpid</h1> +<h1>Delete Course program with Name: $courseProgram.getName() and ID: $cpid</h1> <form action="/COURSE" method="post"> <input type="hidden" name="cmd" value="deletecourseprogram" /> -<input type="hidden" name="cmd.success" value="/course/cpresult.html" /> +<input type="hidden" name="cmd.success" value="/course/index.html" /> <input type="hidden" name="cmd.error" value="/course/cpdelete.html" /> <input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> @@ -20,7 +22,7 @@ <input type="hidden" name="cpid" value="$cpid" /> <input type="button" class="submit" value="Back" onClick="javascript:history.go(-1)"/> -<input type="submit" class="submit" value="Delete Courseprogram"/> +<input type="submit" class="submit" value="Delete Course program"/> </form> -#parse ( "pagefooter.html" ) +$portalPresenter.parse("$!contextPath/pagefooter.html.en",$portalRequest) --- cresult.html.en DELETED --- --- cpresult.html.en DELETED --- Index: ccreate.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/course/ccreate.html.en,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ccreate.html.en 10 Nov 2004 23:56:14 -0000 1.8 +++ ccreate.html.en 30 May 2006 14:18:30 -0000 1.9 @@ -1,32 +1,42 @@ -#parse ( "pageheader.html" ) + +$portalPresenter.parse("$!contextPath/pageheader.html.en",$portalRequest) + <em><a href="index.html">Course Component</a> - -<a href="csearch.html">Search Course</a></em> -<h1>Create Course</h1> +<a href="ccreate.html">Create Course</a></em> + +<h1>Create Course (Step 2)</h1> + +#set ( $auserid = $userManager.getUserIdForUserLogin($userLogin) ) +#if ( $auserid == 0 ) + +<p>You have to <a href="/user-register.html">create an account</a> and +<a href="/login.html">log in</a> to access this functionality.</p> + +<p>If you already have logged in and get this message, please check if +your Web browser accepts cookies for this web site - otherwise it +does not remember your login.</p> + +#else + #if ( $returnCode > 1999 ) <font color="red">Failed creating Course object.</font><p> #end -#set( $courseTemplate = $coursePresenter.getCourseTemplate($ctplid) ) + +#set( $cm = $coursePresenter.getCourseModule($cmid) ) + <form action="/COURSE" method="post"> <input type="hidden" name="cmd" value="createcourse"> -<input type="hidden" name="cmd.success" value="/course/cresult.html"> +<input type="hidden" name="cmd.success" value="/course/index.html"> <input type="hidden" name="cmd.error" value="/course/ccreate.html"> <input type="hidden" name="cmd.noaccess" value="/noaccess.html"> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> -<input type="hidden" name="ctplid" value="$ctplid"/> -<input type="hidden" name="cparentid" value="$ctplid"/> -<h2>$courseTemplate.getName()</h2> +<input type="hidden" name="cmid" value="$cmid"/> +<h2>$cm.getName()</h2> <table border="0"> <tr> <td>Type</td> <td><b> - #set ($seloption = $courseTemplate.getType()) - #if ( $seloption == "0" ) - Vorlesung - #elseif ( $seloption == "1" ) - Praktikum - #elseif ( $seloption == "2" ) - Seminar - #end +$cm.getType() </b> </td> <tr><td> </td></tr> @@ -34,17 +44,17 @@ <td>Term</td> <td> <select name="cterm" size="1"> - $!coursePresenter.getTerms("") + $!coursePresenter.getTerms("") </select> </td> </tr> <tr> <td>Name (de)</td> - <td><input name="cname" size="50" value="$!courseTemplate.getName()"></td> + <td><input name="cname" size="50" value="$!cm.getName()"></td> </tr> <tr> <td>Name (en)</td> - <td><input name="cname_en" size="50" value="$!courseTemplate.getName('en')"></td> + <td><input name="cname_en" size="50" value="$!cm.getName('en')"></td> </tr> <tr> <td>Comment</td> @@ -60,67 +70,72 @@ </td> </tr> <tr> - <td>Group</td> - <td> - <select name="cgroup" size="1"> - #foreach ( $c... [truncated message content] |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:16:49
|
Update of /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/course In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10733/src/de/tum/cobricks/course Added Files: importModules.java Log Message: --- NEW FILE: importModules.java --- /* * Copyright (c) 2006 Cobricks Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted under the terms of the Cobricks Software * License, either version 1.0 of the License, or (at your option) any * later version (see www.cobricks.org). * * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. */ package de.tum.cobricks.course; import java.io.File; import java.io.FileInputStream; import java.io.FileReader; import java.io.IOException; import java.io.Reader; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.log4j.Logger; import org.apache.log4j.PropertyConfigurator; import org.apache.velocity.app.Velocity; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXParseException; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.cobricks.core.CobricksException; import org.cobricks.core.ComponentDirectory; import org.cobricks.core.CoreManager; import org.cobricks.core.db.DBAccess; import org.cobricks.core.util.LogUtil; import org.cobricks.core.util.PropertiesUtil; import org.cobricks.course.CourseManager; import org.cobricks.course.CourseModule; import org.cobricks.portal.velocity.PortalResourceLoader; /** * This class is used for importing XML based module data into * the Cobricks course module. The data is read from a file in * the current working directory which name is provided in the * command line parameters. * * @author mic...@co... * @version $Date: 2006/05/30 14:14:29 $ */ public class importModules implements ErrorHandler { static Logger logger = Logger.getLogger(importModules.class); private CoreManager coreManager = null; private CourseManager courseManager = null; Map dozenten; Map cprogs; /** * */ public static void main(String[] args) { String xmlfname = "modules.xml"; String confdir = "build/webapps/ROOT/WEB-INF/conf"; if (args.length > 0) confdir = args[0]; if (args.length > 1) xmlfname = args[1]; importModules o = new importModules(confdir); o.doImport(xmlfname); } public void doImport(String xmlfname) { // delete all data DBAccess dbAccess = coreManager.getDBAccess(); //dbAccess.sqlExecute("delete from course_date"); //dbAccess.sqlExecute("delete from course_lecturerrel"); //dbAccess.sqlExecute("delete from course_lecturer"); //dbAccess.sqlExecute("delete from course_notes"); dbAccess.sqlExecute("delete from course_progrel"); dbAccess.sqlExecute("delete from course_prog"); //dbAccess.sqlExecute("delete from course_room"); dbAccess.sqlExecute("delete from course_module"); //dbAccess.sqlExecute("delete from course_timetable"); //dbAccess.sqlExecute("delete from course"); // add data try { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilder builder = factory.newDocumentBuilder(); builder.setErrorHandler(this); Reader reader = new FileReader(xmlfname); InputSource in = new InputSource(reader); Document doc = builder.parse(in); parseForPrograms(doc.getFirstChild()); parseForLecturers(doc.getFirstChild()); parseForModules(doc.getFirstChild()); } catch (Exception e) { logger.error(LogUtil.ex("Failed parsing XML document", e)); } } private void parseForPrograms(Node node) { while (node != null) { if (node instanceof Element) { String tagName = ((Element)node).getTagName(); if (tagName.equals("Studiengang")) parseProgram(node); else { Node n2 = node.getFirstChild(); if (n2 != null) parseForPrograms(n2); } } node = node.getNextSibling(); } } private void parseForLecturers(Node node) { while (node != null) { if (node instanceof Element) { String tagName = ((Element)node).getTagName(); if (tagName.equals("Dozent")) parseDozent(node); else { Node n2 = node.getFirstChild(); if (n2 != null) parseForLecturers(n2); } } node = node.getNextSibling(); } } private void parseForModules(Node node) { while (node != null) { if (node instanceof Element) { String tagName = ((Element)node).getTagName(); if (tagName.equals("Modul")) parseModul(node); else { Node n2 = node.getFirstChild(); if (n2 != null) parseForModules(n2); } } node = node.getNextSibling(); } } private void parseModul(Node node) { List progs = new ArrayList(); String title = "<no title>"; Element elem = (Element)node; // get attributes Map attrs = new HashMap(); String id = elem.getAttribute("id"); attrs.put("cmsid", id); attrs.put("cmhidden", "0"); String todo = elem.getAttribute("todo"); if (todo!=null && todo.length()>1) { attrs.put("cmaddxml", "<todo>"+todo+"</todo>"); } // get information from children nodes node = node.getFirstChild(); while (node != null) { if (node instanceof Element) { elem = (Element)node; String tagName = elem.getTagName(); if (tagName.equals("KurzBez")) { String tmps = getLeafValue(node); attrs.put("cmshortname", tmps); } if (tagName.equals("Titel")) { String tmps = getLeafValue(node); attrs.put("cmname", tmps); title = tmps; } if (tagName.equals("Title")) { String tmps = getLeafValue(node); attrs.put("cmname_en", tmps); } if (tagName.equals("SWS")) { // attr: art=Vorlesung String tmps = getLeafValue(node); String art = elem.getAttribute("art"); if (art.equals("Vorlesung")) { attrs.put("cmhours_lec", tmps); attrs.put("cmtype","Vorlesung"); } if (art.equals("Uebung")) attrs.put("cmhours_ex", tmps); if (art.equals("Praktikum")) { attrs.put("cmhours_lab", tmps); attrs.put("cmtype","Praktikum"); } if (art.equals("Seminar")) { attrs.put("cmhours_sem", tmps); attrs.put("cmtype","Seminar"); } } if (tagName.equals("Credits")) { String tmps = getLeafValue(node); if (tmps.equals("keine")) tmps = "0"; attrs.put("cmectscredits", tmps); } if (tagName.equals("Turnus")) { // value="WS","SS","WS,SS" String tmps = getLeafValue(node); if (tmps.startsWith("unregel")) tmps = ""; if (tmps.startsWith("Unregel")) tmps = ""; attrs.put("cmcycle", tmps); } if (tagName.equals("RelevanterStudiengang")) { // kein content // attr: idref=BS-INF, pkz=PF, fachsemester=1 // kommentar Map pattrs = new HashMap(); String cpidtmp = elem.getAttribute("idref"); pattrs.put("cpid", cprogs.get(cpidtmp)); pattrs.put("cptype", elem.getAttribute("pkz").toLowerCase()); pattrs.put("cpstartsem", elem.getAttribute("fachsemester")); pattrs.put("cpcomment", elem.getAttribute("kommentar")); progs.add(pattrs); } if (tagName.equals("Kapazitaet")) { String tmps = getLeafValue(node); attrs.put("cmcapacity", tmps); } if (tagName.equals("ExportNotizen")) { String tmps = getLeafValue(node); String attr = (String)attrs.get("cmaddxml"); if (attr==null) attr = ""; else attr += "\n"; attr += "<ExportNotizen><![CDATA["+tmps+"]]</ExportNotizen>"; attrs.put("cmaddxml", attr); } if (tagName.equals("ModulVerantwortlicher")) { // kein content String tmps = elem.getAttribute("idref"); Map attrs2 = (Map)dozenten.get(tmps); tmps = (String)attrs2.get("nachname") +", "+(String)attrs2.get("vorname"); int lid = courseManager.getLecturerIdByName(tmps); if (lid > 0) attrs.put("cmresponsible", new Integer(lid)); } if (tagName.equals("Dozenten")) { // unterknoten: Dozent mit attr: idref String tmps = getDozenten(node); String attr = (String)attrs.get("cmaddxml"); if (attr==null) attr = tmps; else attr = attr+"\n"+tmps; attrs.put("cmaddxml", attr); } if (tagName.equals("Pruefung")) { // attr: art // unterknoten: Klausur, // Hausaufgaben (attr:art,bleibengueltig,kommentar) // WiederholunImFolgesemester String tmps = getPruefung(node); attrs.put("cmcert", tmps); attrs.put("cmcert_en", ""); } if (tagName.equals("Lernziele")) { // append to content String tmps = getLeafValue(node); attrs.put("cmtarget", tmps); } if (tagName.equals("Inhalte")) { String tmps = getLeafValue(node); attrs.put("cmcontent", tmps); } if (tagName.equals("Contents")) { String tmps = getLeafValue(node); attrs.put("cmcontent_en", tmps); } if (tagName.equals("Vorkenntnisse")) { // unterknoten: Vorkenntnis (attr: art,idref,kommentar) String tmps = getVorkenntnisse(node); if (tmps == null || tmps.trim().length()<1) tmps = ""; attrs.put("cmprerequ", tmps); } if (tagName.equals("Didaktik")) { String tmps = getLeafValue(node); attrs.put("cmdidactics", tmps); attrs.put("cmdidactics_en", ""); } if (tagName.equals("RelevanterModulTeilKatalog")) { // attr: idref, position/nummer String idref = elem.getAttribute("idref"); String pos = elem.getAttribute("position"); String attr = (String)attrs.get("cmaddxml"); if (attr==null) attr = ""; else attr += "\n"; attr += "<RelevanterModulTeilKatalog idref=\""+idref +"\" position=\""+pos+"\" />"; attrs.put("cmaddxml", attr); } } node = node.getNextSibling(); } try { if (attrs.get("cmtype")==null) { attrs.put("cmtype","Sonstige"); } int cmid = courseManager.createCourseModule(attrs, null); logger.info("module "+title+" created"); // add module program relationships Iterator i = progs.iterator(); while (i.hasNext()) { Map attrs2 = (Map)i.next(); attrs2.put("cmid", new Integer(cmid)); courseManager.addProgramToModule(attrs2); } } catch (Exception e) { logger.error(LogUtil.ex("Failed creating module", e)); } } private String getPruefung(Node node) { StringBuffer sb = new StringBuffer(""); Element elem = (Element)node; String art = elem.getAttribute("art"); sb.append("<Pruefung art=\""); sb.append(art).append("\">"); node = node.getFirstChild(); while (node != null) { if (node instanceof Element) { elem = (Element)node; String tagName = ((Element)node).getTagName(); if (tagName.equals("Klausur")) { String tmps = getLeafValue(node); sb.append("\n <Klausur>").append(tmps). append("</Klausur>"); } if (tagName.equals("MuendPruef")) { String tmps = getLeafValue(node); sb.append("\n <MuendPruef>").append(tmps). append("</MuendPruef>"); } if (tagName.equals("Hausaufgaben")) { String todo = elem.getAttribute("todo"); String art2 = elem.getAttribute("art"); String gueltig = elem.getAttribute("bleibengueltig"); String kommentar = elem.getAttribute("kommentar"); sb.append("\n <Hausaufgaben todo=\"") .append(todo).append("\" art=\"").append(art2) .append("\" bleibengueltig=\"").append(gueltig) .append("\" kommentar=\"").append(kommentar) .append("\" />"); } if (tagName.equals("WiederholungImFolgesemester")) { String tmps = getLeafValue(node); sb.append("\n <WiederholungImFolgesemester>") .append(tmps).append("</WiederholungImFolgesemester>"); } } node = node.getNextSibling(); } sb.append("\n</Pruefung>"); return sb.toString(); } private String getVorkenntnisse(Node node) { StringBuffer result = new StringBuffer("<Vorkenntnisse>"); Element elem = (Element)node; node = node.getFirstChild(); while (node != null) { if (node instanceof Element) { elem = (Element)node; String tagName = ((Element)node).getTagName(); if (tagName.equals("Vorkenntnis")) { String art = elem.getAttribute("art"); String idref = elem.getAttribute("idref"); String kommentar = elem.getAttribute("kommentar"); result.append("\n <Vorkenntnis art=\""); result.append(art); result.append("\" idref=\""); result.append(idref); result.append("\" kommentar=\""); result.append(kommentar); result.append("\" />"); } } node = node.getNextSibling(); } result.append("\n</Vorkenntnisse>"); return result.toString(); } private String getDozenten(Node node) { StringBuffer sb = new StringBuffer("<Dozenten>"); Element elem = (Element)node; node = node.getFirstChild(); while (node != null) { if (node instanceof Element) { elem = (Element)node; String tagName = ((Element)node).getTagName(); if (tagName.equals("Dozent")) { String idref = elem.getAttribute("idref"); Map attrs2 = (Map)dozenten.get(idref); if (attrs2!=null) { String name = (String)attrs2.get("name"); sb.append("\n <Dozentname=\"").append(name) .append("\" />"); } // TBD: Lecturer-Id? } } node = node.getNextSibling(); } sb.append("\n</Dozenten>"); return sb.toString(); } private void parseDozent(Node node) { // KuerzelDHP String nachname = ""; String vorname = ""; String geschlecht = ""; String titelvor = ""; String titelnach = ""; Element elem = (Element)node; // get attributes String id = elem.getAttribute("id"); // get information from children nodes node = node.getFirstChild(); while (node != null) { if (node instanceof Element) { elem = (Element)node; String tagName = elem.getTagName(); if (tagName.equals("Nachname")) { nachname = getLeafValue(node); } if (tagName.equals("Vorname")) { vorname = getLeafValue(node); } if (tagName.equals("TitelVor")) { titelvor = getLeafValue(node); } if (tagName.equals("TitelNach")) { titelnach = getLeafValue(node); } if (tagName.equals("Geschlecht")) { geschlecht = getLeafValue(node); } } node = node.getNextSibling(); } String name = vorname; name += " "; name += nachname; Map m = new HashMap(); m.put("id", id); m.put("name", name); m.put("vorname", vorname); m.put("nachname", nachname); dozenten.put(id, m); } private void parseProgram(Node node) { String name = ""; Element elem = (Element)node; // get attributes String id = elem.getAttribute("id"); // get information from children nodes node = node.getFirstChild(); while (node != null) { if (node instanceof Element) { elem = (Element)node; String tagName = elem.getTagName(); if (tagName.equals("Name")) { name = getLeafValue(node); } } node = node.getNextSibling(); } try { Map attrs = new HashMap(); attrs.put("cplabel", id); attrs.put("cpname", name); attrs.put("cpname_en", name); int cpid = courseManager.createProgram(attrs, null); logger.info("program "+id+" created"); cprogs.put(id, new Integer(cpid)); } catch (Exception e) { logger.error(LogUtil.ex("Failed creating program", e)); } } public String getLeafValue(Node node) { StringBuffer bf = new StringBuffer(); NodeList children = node.getChildNodes(); for (int i=0;i<children.getLength();i++){ Node textNode =children.item(i); if (textNode.getNodeType() == Node.TEXT_NODE || textNode.getNodeType() == Node.CDATA_SECTION_NODE) { bf.append(textNode.getNodeValue()); } } return (bf.toString()).trim(); } public importModules(String confdir) { dozenten = new HashMap(); cprogs = new HashMap(); try { PropertyConfigurator. configure(confdir+File.separator+"log.properties"); } catch (Throwable e) { } // Instantiate CoreManager coreManager = new CoreManager(); // load Cobricks configuration (properties) Properties properties = new Properties(); properties.put("configdir", confdir); PropertiesUtil.loadProperties(confdir, properties, coreManager); // initialize CoreManager object ... try { coreManager.init(properties); } catch (CobricksException e) { System.err.println(e.toString()); System.exit(-1); } // initialize Velocity try { // load Velocity properties Properties velocityProperties = new Properties(); PropertiesUtil. loadPropertiesResource("org.cobricks.portal", "velocity"+File.separator +"velocity.properties", velocityProperties, coreManager); velocityProperties.put("file.resource.loader.path", confdir); Velocity.setApplicationAttribute("coreManager", coreManager); Velocity.init(velocityProperties); logger.info("Velocity succesfully initialized"); } catch(Exception e) { logger.error(LogUtil.exception("Failed initializing Velocity", e)); } // initialize all the other components // this call instantiates all manager and presenter objects try { coreManager.initComponents(properties); } catch (Throwable e) { logger.error(LogUtil.ex("Failed initializing components.", e)); } ComponentDirectory cd = coreManager.getComponentDirectory(); courseManager = (CourseManager) cd.getManager("courseManager"); } //the methods inherited from Errorhandler /** Warning. */ public void warning(SAXParseException ex) { logger.warn(ex.getLineNumber()+":::"+ex.getMessage()); } /** Error. */ public void error(SAXParseException ex) { logger.error(ex.getLineNumber()+":::"+ex.getMessage()); } /** Fatal error. */ public void fatalError(SAXParseException ex) throws SAXException { logger.fatal(ex.getLineNumber()+":::"+ex.getMessage()); } } |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:15:02
|
Update of /cvsroot/cobricks/drehscheibe-in/tomcat/5.5/conf In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10733/tomcat/5.5/conf Added Files: catalina.policy catalina.properties context.xml logging.properties server.xml tomcat-users.xml web.xml Log Message: --- NEW FILE: context.xml --- <!-- The contents of this file will be loaded for each web application --> <Context> <!-- Default set of monitored resources --> <WatchedResource>WEB-INF/web.xml</WatchedResource> <!-- Uncomment this to disable session persistence across Tomcat restarts --> <!-- <Manager pathname="" /> --> </Context> --- NEW FILE: web.xml --- <?xml version="1.0" encoding="ISO-8859-1"?> <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> <!-- ======================== Introduction ============================== --> <!-- This document defines default values for *all* web applications --> <!-- loaded into this instance of Tomcat. As each application is --> <!-- deployed, this file is processed, followed by the --> <!-- "/WEB-INF/web.xml" deployment descriptor from your own --> <!-- applications. --> <!-- --> <!-- WARNING: Do not configure application-specific resources here! --> <!-- They should go in the "/WEB-INF/web.xml" file in your application. --> <!-- ================== Built In Servlet Definitions ==================== --> [...1031 lines suppressed...] <!-- When a request URI refers to a directory, the default servlet looks --> <!-- for a "welcome file" within that directory and, if present, --> <!-- to the corresponding resource URI for display. If no welcome file --> <!-- is present, the default servlet either serves a directory listing, --> <!-- or returns a 404 status, depending on how it is configured. --> <!-- --> <!-- If you define welcome files in your own application's web.xml --> <!-- deployment descriptor, that list *replaces* the list configured --> <!-- here, so be sure that you include any of the default values that --> <!-- you wish to include. --> <welcome-file-list> <welcome-file>index.html</welcome-file> <welcome-file>index.htm</welcome-file> <welcome-file>index.html.en</welcome-file> <welcome-file>index.html.de</welcome-file> <welcome-file>index.jsp</welcome-file> </welcome-file-list> </web-app> --- NEW FILE: server.xml --- <Server port="@@@SERVERPORT@@@" shutdown="SHUTDOWN" debug="0"> <!-- Comment these entries out to disable JMX MBeans support used for the administration web application --> <Listener className="org.apache.catalina.core.AprLifecycleListener" /> <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" /> <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" /> <Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/> <Service name="Catalina" debug="0"> <Connector port="@@@HTTPPORT@@@" maxHttpHeaderSize="8192" maxThreads="150" minSpareThreads="25" maxSpareThreads="75" enableLookups="false" redirectPort="@@@HTTPSPORT@@@" acceptCount="100" connectionTimeout="20000" disableUploadTimeout="true" /> <!-- Note : To disable connection timeouts, set connectionTimeout value to 0 --> <!-- Define a SSL HTTP/1.1 Connector on port 8443 --> <!-- <Connector port="@@@HTTPSPORT@@@" maxHttpHeaderSize="8192" maxThreads="150" minSpareThreads="25" maxSpareThreads="75" enableLookups="false" disableUploadTimeout="true" acceptCount="100" scheme="https" secure="true" clientAuth="false" sslProtocol="TLS"> Does this work in 5.5? <Factory className="org.apache.coyote.tomcat5.CoyoteServerSocketFactory" clientAuth="false" protocol="SSL" keystoreFile="keystore" truststoreFile="truststore" /> </Connector> --> <!-- Define the top level container in our container hierarchy --> <Engine name="Catalina" defaultHost="localhost" debug="0"> <Host name="localhost" appBase="webapps" debug="0" unpackWARs="true" autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false"> <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" prefix="access_log." suffix=".txt" pattern="common" resolveHosts="false"/> </Host> </Engine> </Service> </Server> --- NEW FILE: catalina.policy --- // ============================================================================ // catalina.corepolicy - Security Policy Permissions for Tomcat 5 // // This file contains a default set of security policies to be enforced (by the // JVM) when Catalina is executed with the "-security" option. In addition // to the permissions granted here, the following additional permissions are // granted to the codebase specific to each web application: // // * Read access to the document root directory // // $Id: catalina.policy,v 1.1 2006/05/30 14:14:30 kochm Exp $ // ============================================================================ // ========== SYSTEM CODE PERMISSIONS ========================================= // These permissions apply to javac grant codeBase "file:${java.home}/lib/-" { permission java.security.AllPermission; }; // These permissions apply to all shared system extensions grant codeBase "file:${java.home}/jre/lib/ext/-" { permission java.security.AllPermission; }; // These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre grant codeBase "file:${java.home}/../lib/-" { permission java.security.AllPermission; }; // These permissions apply to all shared system extensions when // ${java.home} points at $JAVA_HOME/jre grant codeBase "file:${java.home}/lib/ext/-" { permission java.security.AllPermission; }; // ========== CATALINA CODE PERMISSIONS ======================================= // These permissions apply to the launcher code grant codeBase "file:${catalina.home}/bin/commons-launcher.jar" { permission java.security.AllPermission; }; // These permissions apply to the daemon code grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" { permission java.security.AllPermission; }; // These permissions apply to the commons-logging API grant codeBase "file:${catalina.home}/bin/commons-logging-api.jar" { permission java.security.AllPermission; }; // These permissions apply to the server startup code grant codeBase "file:${catalina.home}/bin/bootstrap.jar" { permission java.security.AllPermission; }; // These permissions apply to the JMX server grant codeBase "file:${catalina.home}/bin/jmx.jar" { permission java.security.AllPermission; }; // These permissions apply to JULI grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" { permission java.security.AllPermission; }; // These permissions apply to the servlet API classes // and those that are shared across all class loaders // located in the "common" directory grant codeBase "file:${catalina.home}/common/-" { permission java.security.AllPermission; }; // These permissions apply to the container's core code, plus any additional // libraries installed in the "server" directory grant codeBase "file:${catalina.home}/server/-" { permission java.security.AllPermission; }; // The permissions granted to the balancer WEB-INF/classes directory grant codeBase "file:${catalina.home}/webapps/balancer/WEB-INF/classes/-" { permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester"; permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester.*"; }; // ========== WEB APPLICATION PERMISSIONS ===================================== // These permissions are granted by default to all web applications // In addition, a web application will be given a read FilePermission // and JndiPermission for all files and directories in its document root. grant { // Required for JNDI lookup of named JDBC DataSource's and // javamail named MimePart DataSource used to send mail permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.naming.*", "read"; permission java.util.PropertyPermission "javax.sql.*", "read"; // OS Specific properties to allow read access permission java.util.PropertyPermission "os.name", "read"; permission java.util.PropertyPermission "os.version", "read"; permission java.util.PropertyPermission "os.arch", "read"; permission java.util.PropertyPermission "file.separator", "read"; permission java.util.PropertyPermission "path.separator", "read"; permission java.util.PropertyPermission "line.separator", "read"; // JVM properties to allow read access permission java.util.PropertyPermission "java.version", "read"; permission java.util.PropertyPermission "java.vendor", "read"; permission java.util.PropertyPermission "java.vendor.url", "read"; permission java.util.PropertyPermission "java.class.version", "read"; permission java.util.PropertyPermission "java.specification.version", "read"; permission java.util.PropertyPermission "java.specification.vendor", "read"; permission java.util.PropertyPermission "java.specification.name", "read"; permission java.util.PropertyPermission "java.vm.specification.version", "read"; permission java.util.PropertyPermission "java.vm.specification.vendor", "read"; permission java.util.PropertyPermission "java.vm.specification.name", "read"; permission java.util.PropertyPermission "java.vm.version", "read"; permission java.util.PropertyPermission "java.vm.vendor", "read"; permission java.util.PropertyPermission "java.vm.name", "read"; // Required for OpenJMX permission java.lang.RuntimePermission "getAttribute"; // Allow read of JAXP compliant XML parser debug permission java.util.PropertyPermission "jaxp.debug", "read"; // Precompiled JSPs need access to this package. permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime"; permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime.*"; }; // You can assign additional permissions to particular web applications by // adding additional "grant" entries here, based on the code base for that // application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files. // // Different permissions can be granted to JSP pages, classes loaded from // the /WEB-INF/classes/ directory, all jar files in the /WEB-INF/lib/ // directory, or even to individual jar files in the /WEB-INF/lib/ directory. // // For instance, assume that the standard "examples" application // included a JDBC driver that needed to establish a network connection to the // corresponding database and used the scrape taglib to get the weather from // the NOAA web server. You might create a "grant" entries like this: // // The permissions granted to the context root directory apply to JSP pages. // grant codeBase "file:${catalina.home}/webapps/examples/-" { // permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect"; // permission java.net.SocketPermission "*.noaa.gov:80", "connect"; // }; // // The permissions granted to the context WEB-INF/classes directory // grant codeBase "file:${catalina.home}/webapps/examples/WEB-INF/classes/-" { // }; // // The permission granted to your JDBC driver // grant codeBase "jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/driver.jar!/-" { // permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect"; // }; // The permission granted to the scrape taglib // grant codeBase "jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/scrape.jar!/-" { // permission java.net.SocketPermission "*.noaa.gov:80", "connect"; // }; --- NEW FILE: tomcat-users.xml --- <!-- NOTE: By default, no user is included in the "manager" role required to operate the "/manager" web application. If you wish to use this app, you must define such a user - the username and password are arbitrary. --> <tomcat-users> <user name="tomcat" password="tomcat" roles="tomcat" /> <user name="role1" password="tomcat" roles="role1" /> <user name="both" password="tomcat" roles="tomcat,role1" /> </tomcat-users> --- NEW FILE: logging.properties --- handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4admin.org.apache.juli.FileHandler, 5host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler .handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler ############################################################ # Handler specific properties. # Describes specific configuration info for Handlers. ############################################################ 1catalina.org.apache.juli.FileHandler.level = FINE 1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/logs 1catalina.org.apache.juli.FileHandler.prefix = catalina. 2localhost.org.apache.juli.FileHandler.level = FINE 2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/logs 2localhost.org.apache.juli.FileHandler.prefix = localhost. 3manager.org.apache.juli.FileHandler.level = FINE 3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs 3manager.org.apache.juli.FileHandler.prefix = manager. 4admin.org.apache.juli.FileHandler.level = FINE 4admin.org.apache.juli.FileHandler.directory = ${catalina.base}/logs 4admin.org.apache.juli.FileHandler.prefix = admin. 5host-manager.org.apache.juli.FileHandler.level = FINE 5host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs 5host-manager.org.apache.juli.FileHandler.prefix = host-manager. java.util.logging.ConsoleHandler.level = FINE java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter ############################################################ # Facility specific properties. # Provides extra control for each logger. ############################################################ org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].level = INFO org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].handlers = 4admin.org.apache.juli.FileHandler org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 5host-manager.org.apache.juli.FileHandler # For example, set the com.xyz.foo logger to only log SEVERE # messages: #org.apache.catalina.startup.ContextConfig.level = FINE #org.apache.catalina.startup.HostConfig.level = FINE #org.apache.catalina.session.ManagerBase.level = FINE --- NEW FILE: catalina.properties --- # # List of comma-separated packages that start with or equal this string # will cause a security exception to be thrown when # passed to checkPackageAccess unless the # corresponding RuntimePermission ("accessClassInPackage."+package) has # been granted. package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.,sun.beans. # # List of comma-separated packages that start with or equal this string # will cause a security exception to be thrown when # passed to checkPackageDefinition unless the # corresponding RuntimePermission ("defineClassInPackage."+package) has # been granted. # # by default, no packages are restricted for definition, and none of # the class loaders supplied with the JDK call checkPackageDefinition. # package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper. # # # List of comma-separated paths defining the contents of the "common" # classloader. Prefixes should be used to define what is the repository type. # Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute. # If left as blank,the JVM system loader will be used as Catalina's "common" # loader. # Examples: # "foo": Add this folder as a class repository # "foo/*.jar": Add all the JARs of the specified folder as class # repositories # "foo/bar.jar": Add bar.jar as a class repository common.loader=${catalina.home}/common/classes,${catalina.home}/common/i18n/*.jar,${catalina.home}/common/endorsed/*.jar,${catalina.home}/common/lib/*.jar # # List of comma-separated paths defining the contents of the "server" # classloader. Prefixes should be used to define what is the repository type. # Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute. # If left as blank, the "common" loader will be used as Catalina's "server" # loader. # Examples: # "foo": Add this folder as a class repository # "foo/*.jar": Add all the JARs of the specified folder as class # repositories # "foo/bar.jar": Add bar.jar as a class repository server.loader=${catalina.home}/server/classes,${catalina.home}/server/lib/*.jar # # List of comma-separated paths defining the contents of the "shared" # classloader. Prefixes should be used to define what is the repository type. # Path may be relative to the CATALINA_BASE path or absolute. If left as blank, # the "common" loader will be used as Catalina's "shared" loader. # Examples: # "foo": Add this folder as a class repository # "foo/*.jar": Add all the JARs of the specified folder as class # repositories # "foo/bar.jar": Add bar.jar as a class repository # Please note that for individual jar files, e.g. bar.jar, you need the URL form # starting with file:. shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar # # String cache configuration. tomcat.util.buf.StringCache.byte.enabled=true #tomcat.util.buf.StringCache.char.enabled=true #tomcat.util.buf.StringCache.trainThreshold=500000 #tomcat.util.buf.StringCache.cacheSize=5000 |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:14:49
|
Update of /cvsroot/cobricks/drehscheibe-in/web/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10733/web/user Modified Files: card.html.de change_password.html.de login.html.de register-success.html.de register.html.de user-interests.html.de user.html.de Added Files: card-foaf.xml forgot_password.html.de forgot_password.txt.de registeremail.txt.de Log Message: Index: card.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/card.html.de,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- card.html.de 3 Nov 2004 15:25:45 -0000 1.4 +++ card.html.de 30 May 2006 14:14:31 -0000 1.5 @@ -1,27 +1,131 @@ -#parse ( "pageheader.html.de" ) -#parse ( "navigation-main.html.de" ) - -<td valign=top> - -#set ( $auserlogin = "$!auserlogin" ) -#set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) ) - - -#set ($auser = $userManager.getUser($auserid)) - -#set ($content = $auser.getAttribute("basic.personal.card")) - -<p> -#if ( "$content" == "") - -default ... - -#else - -$!portalPresenter.parseString($content,$portalRequest) - -#end -</p> - -</td> -#parse ( "pagefooter.html" ) \ No newline at end of file + +#parse ( "pageheader.html" ) +<em><a href="index.html">User Component</a> - +<a href="card.html">User Card</a></em> + +#set ( $auserlogin = "$!auserlogin" ) +#if ( $auserlogin == "" ) +#set ( $auserlogin = $userLogin ) +#end +#set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) ) +#if ($auserid == 0) + <p><div class="error">User with user login <b>$auserlogin</b> does not exist!</div></p> +#else + +<h1>User (Business) Card</h1> +<p>for user: $auserlogin</p> + +#set ($auser = $userManager.getUser($auserid)) +#set ($auserclass = $auser.getUserClass()) + +#set ($imageuri = $auser.getAttribute("basic.personal.imageuri")) +#if ("$!imageuri"!="") +<img align="right" src="$imageuri"> +#end + +<h2>$auser.getName()</h2> +#if ("$auserclass"!="user") +User class: $!auserclass<p> +#end + +Email (priv): $!auser.getAttribute("basic.contact-priv.online.email")<br> +Email (work): $!auser.getAttribute("basic.contact-work.online.email") + +<br clear="all"/> +<p> + +<hr> + +#set ( $loggedinusername = $userLogin ) +#set ( $loggedinid = $userManager.getUserIdForUserLogin($userLogin) ) + +<h3>Path to this user</h3> + +#if ($loggedinid == 0 ) + <p>No user is logged in.</p> +#else + +#set ($result = $userPresenter.getUserPath($loggedinid, $auserid)) +#set ($resultsize = $result.size()) +#set ($maxindex = $resultsize - 1) + +#if ($resultsize == 0) + No path to this user found. +#else + <table border=0 style="table-layout:fixed;"> + <tr> + #set ($index = 0) + #foreach ($i in $result) + <td height=32 valign=bottom align=center style="border:1px solid #DFDFDF;"> + #set ($imageuri = "") + #set ($imageuri = $i.getAttribute("basic.personal.imageuri")) + #if ($imageuri == "") + #set ($imageuri = "/images/nouser.png") + #end + + + + #set ($userLogin = $i.getUserLogin()) + + <a href="card.html?auserlogin=$userLogin"><img src="$imageuri" width=32 height=32></a> + <br> + <a href="card.html?auserlogin=$userLogin">$userLogin</a> + </td> + #if($index != $maxindex) + <td valign=middle rowspan=2 align=center> + <img src="/images/arrow.png"> + </td> + #end + #set ($index = $index + 1) + #end + + </tr> + </table> + + <br> + + (<a href="/user/user-allpaths?usera=$loggedinusername&userb=$auserlogin">show all paths</a>) +#end + +#end + +<hr> + +<h3>All public attributes</h3> + +#set ($attrNames = []) +#set ($attrValues = []) + +<table border="0"> +<tr bgcolor="#dfdfdf"> + <td> + <b>Attribute Name</b> + </td> + <td> + <b>Attribute Value</b> + </td> +</tr> + +$userPresenter.getUserAttributes($auserid, $attrNames, $attrValues, false, $lang) + + #set ($count = 0) + #foreach ($i in $attrNames) + <tr bgcolor="#dfdfdf"> + <td>$i</td> + <td>$attrValues.get($count)</td> + </tr> + #set ($count = $count + 1) + #end +</table> +<br> +#end + +#set ($foafuri = $auser.getAttribute("basic.personal.foafuri")) +#if ("$!foafuri"!="") +<a href="$foafuri"><img border="0" src="/images/foaf.gif" /></a> +#else +<a href="card-foaf.xml?auserid=$auserid"> +<img border="0" src="/images/foaf.gif" /></a> +#end + +#parse ( "pagefooter.html" ) Index: change_password.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/change_password.html.de,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- change_password.html.de 5 Oct 2004 15:36:14 -0000 1.5 +++ change_password.html.de 30 May 2006 14:14:31 -0000 1.6 @@ -1,96 +1,71 @@ -#parse ( "pageheader.html.de" ) -#parse ( "navigation-main.html.de" ) -<td valign=top> +$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) +<h1>Passwort ändern</h1> -<A - href="/user/user.html.de">Basisinfo</A> - - <A - href="/user/user-adress.html.de">Adressinfo</A> - - <A - href="/user/user-interests.html.de">Interessen</A> - - <A - href="/user/user-roles.html.de">Freundesliste</A> - - <A - href="/user/user-bannlist.html.de">Bannliste</A> - - <A - href="/user/user-card.html.de">Visitenkarte</A> - - <A - href="/user/user-veranstaltung.html.de">Veranstaltungsinfo</A> - - <A - href="/user/change_password.html.de"><B>Passwort</B></A> - -<p> -#if ($returnCode > 2000) -<div class="success"> -Die Benutzerdaten wurden erfolgreich aktualisiert. -$!portalPresenter.log($portalRequest, "user-update") -</div> -#end -#if ($returnCode < 2000) -<div class="error"> +#if (($returnCode >= 1000) && ($returnCode <=1020)) +#if ($returnCode == 1001) + <div class="error"> + Das alte Passwort ist nicht korrekt! + </div> +#end #if ($returnCode == 1002) -Das zur Passwortaktualisierung angegebene aktuelle Passwort war nicht korrekt. -Es wurden keine Änderungen am Benutzerprofil vorgenommen. -#end -#if ($returnCode == 1003) -Das neu gewählte Passwort ist zu kurz (<6 Zeichen) oder stimmt nicht mit der Bestätigung -überein. Es wurden keine Änderungen am Benutzerprofil vorgenommen. -#end -#if ($returnCode == 1004) -Die Änderung des Passworts ist fehlgeschlagen -Es wurden keine Änderungen am Benutzerprofil vorgenommen. + <div class="error">Die beiden Eingaben des neuen Passworts stimmen nicht überein.</div> #end -#if ($returnCode > 1004) -Fehler $returnCode beim Aktualisieren der Benutzerdaten. +#if ($returnCode == 1006) + <div class="error"> + Es wurde kein altes Passwort angegeben! + </div> #end -</div> +#if ($returnCode == 1007) + <div class="error"> + Es wurde kein neues Passwort angegeben! + </div> #end -</p> +#if ($returnCode == 1008) + <div class="error"> + Das neue Passwort ist zu kurz oder zu lang. + </div> +#end +#else + #if ($returnCode == 2001) + #else -#set ( $auserlogin = "$!auserlogin" ) -#if ( $auserlogin == "" ) -#set ( $auserlogin = $userLogin ) +<p>Zum Ändern Ihres Passworts tragen Sie bitte in dieses Formular das bisherige Passwort und das neue Passwort ein.</p> + + #end #end -#set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) ) -#set ( $auser = $userManager.getUser($auserid)) -$userPresenter.setUserAttrInContext($auser, $velocityContext) -#set ( $auth = $userPresenter.checkPermission($userId, "user", "read", "") ) -#if ( $auth != "true") +<form action="/USER" method=post> -<div class="error">Sie haben keine Berechtigung, das Profil von -Benutzer <b>$auserlogin</b> zu lesen oder zu editieren.</div> <p> -Bitte melden Sie sich als Benutzer mit den entsprechenden Rechten auf -der Plattform an oder erfragen Sie beim Plattformadministrator die -Zuweisung der ensprechenden Rechte an Ihre Kennung. - -#else -<form action="/USER" method="post" enctype="multipart/form-data" accept-charset="ISO-8859-1"> -<INPUT TYPE="hidden" NAME="cmd" VALUE="update" /> -<input type="hidden" name="attrrequ" value="" /> -<input type="hidden" name="anames" value="" /> -<input type="hidden" name="userclass" value="user" /> -<input type="hidden" name="auserid" value="$auserid" /> -<input type="hidden" name="cmd.success" value="/user/change_password.html.de" /> -<input type="hidden" name="cmd.error" value="/user/change_password.html.de" /> -<input type="hidden" name="path" value="$portalRequest.getPagePath()"/> -<p><b>Login: $auserlogin</b></p> -Altes Passwort:<BR> -<input type="password" name="passwordOld" value="" size="30"> -<P> -Neues Passwort:<BR> -<input type="password" name="passwordNew" value="" size="30"><BR> -Neues Passwort (Kontrolle):<BR> -<input type="password" name="passwordConfirm" value="" size="30"><P> -<input type="submit" value="Passwort ändern"> - +<INPUT TYPE=hidden NAME=cmd VALUE=changePassword /> +<input type="hidden" name="userclass" value="universityuser" /> -</form> +<input type="hidden" name="cmd.success" value="/user/change_password.html" /> +<input type="hidden" name="cmd.error" value="/user/change_password.html" /> +<input type="hidden" name="auLogin"> +#if ($returnCode == 2001) + <div class="info">Ihr Passwort wurde erfolgreich geändert.</div> +#else + <TABLE BORDER=0> + <tr> + <TD>Passwort (alt)*:</TD><TD><input type="password" name="passwordOld" size=20 value="$!passwordOld"></td> + </tr> + <tr> + <TD>Passwort (neu)*:</TD><TD><input type="password" name="passwordNew" size=20 value="$!passwordNew"></td> + </tr> + <tr> + <TD>Bestätige Passwort*:</TD><TD><input type="password" name="passwordConfirm" size=20 value="$!passwordConfirm"></td> + </tr> + + </table> + </p> + #set ($login = "$!auserlogin") + <p><input type=submit value="Passwort ändern"/></p> #end -</td> +</form> -#parse ( "pagefooter.html" ) \ No newline at end of file + +#parse ( "pagefooter.html" ) --- NEW FILE: forgot_password.txt.de --- (This appears to be a binary file; contents omitted.) --- NEW FILE: forgot_password.html.de --- $portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) <h1>Passwort neu setzen</h1> #if (($returnCode >= 1000) && ($returnCode <=1020)) #if ($returnCode == 1000) <div class="error"> Der Loginname muss angegeben werden. </div> #end #if ($returnCode == 1001) <div class="error"> Die Länge des Loginnamens muss zwischen 6 und 20 Zeichen betragen. </div> #end #if ($returnCode == 1009) <p> <div class="error"> Der Loginname darf keine Sonderzeichen enthalten. </div> </p> #end #if ($returnCode == 1006) <div class="error"> Die E-Mail-Adresse muss angegeben werden. </div> #end #if ($returnCode == 1007) <div class="error"> Die E-Mail-Adresse muss angegeben werden. </div> #end #if ($returnCode == 1020) <p><div class="error"> Ein Benutzer mit Loginnamen <b>$auserlogin</b> und E-Mail-Adresse <b>$email</b> exisitiert nicht. </div> </p> #end #else #if ($returnCode == 2001) #else <p>Wenn Sie bereits eine Kennung auf dieser Plattform eingerichtet haben, dann können Sie sich über das <a href="/user/login.html">Login-Formular</a> anmelden.</p> <p>Haben Sie Ihr Passwort vergessen?<br> In diesem Fall geben Sie bitte in nachfolgendes Formular Ihren Loginnamen und die E-Mail-Adresse ein, die Sie auf der Plattform angegeben haben.</p> #end #end <form action="/USER" method=post> <p> <INPUT TYPE=hidden NAME=cmd VALUE=forgotPassword /> <input type="hidden" name="cmd.success" value="/user/forgot_password.html" /> <input type="hidden" name="cmd.error" value="/user/forgot_password.html" /> #if ($returnCode == 2001) Ihr Password wurde an die E-Mail-Adresse <b>$email</b> gesandt. #else <TABLE BORDER=0> <tr> <TD>Loginname*:</TD><TD><input name="auserlogin" size=20 value="$!auserlogin"></td> </tr> <tr> <TD>E-Mail*:</TD><TD><input name="email" size=20 value="$!email"></td> </tr> <tr><td colspan = "2" align="left">Mit * gekennzeichnete Felder sind Pflichtfelder.</td></tr> </table> </p> #set ($login = "$!auserlogin") <p><input type=submit value="Neues Passwort anfordern"/></p> #end <input type="hidden" name="email_subject" value="Drehscheibe Password" /> <input type=hidden name="email_textsource" value="/user/forgot_password.txt.de" /> </form> $portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) Index: login.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/login.html.de,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- login.html.de 29 May 2006 07:30:17 -0000 1.6 +++ login.html.de 30 May 2006 14:14:31 -0000 1.7 @@ -53,8 +53,9 @@ müssen Sie sich an den Administrator der Plattform wenden (siehe Impressum).</p> -<p><INPUT TYPE=hidden NAME=cmd VALUE=forgotPassword /> -<input type="hidden" name="userclass" value="universityuser" /> +<p> +<form action="/USER" method=post> +<INPUT TYPE=hidden NAME=cmd VALUE=forgotPassword /> <input type="hidden" name="cmd.success" value="/user/login.html.de" /> <input type="hidden" name="cmd.error" value="/user/login.html.de" /> <table border="0"> @@ -70,9 +71,8 @@ <p>Nach dem Überprüfen Ihrer Angaben werden Ihnen Ihre Zugangsdaten für die Plattform an die angegebene E-Mail-Adresse geschickt.</p> -<input type="hidden" name="email_subject" value="Cobricks Passwort" /> -<input type=hidden name="email_text" value="Hiermit bekommen Sie Ihre Zugangsdaten fuer die Cobricks Plattform. Ihr Benutzername ist " /> -<input type=hidden name="email_text_1" value =". Ihr Passwort lautet " /> +<input type="hidden" name="email_subject" value="Drehscheibe Password" /> +<input type="hidden" name="email_textsource" value="/user/forgot_password.txt.de" /> </form> </td> --- NEW FILE: card-foaf.xml --- #if ("$!auserid" == "") <p><div class="error">No auserid given - do not know which user was meant!</div></p> #else #set ($auser = $userPresenter.getUserById($auserid)) <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:foaf="http://xmlns.com/foaf/0.1/"> <foaf:PersonalProfileDocument rdf:about=""> <foaf:maker rdf:nodeId="me"/> <foaf:primaryTopic rdf:nodeId="me"/> </foaf:PersonalProfileDocument> <foaf:Person> <foaf:name>$auser.getName()</foaf:name> #set ($email = $auser.getAttribute("basic.contact-priv.online.email")) #if ("$!email" == "") #set ($email = $auser.getAttribute("basic.contact-work.online.email")) #end #if ("$!email" == "") #set ($email = $auser.getAttribute("basic.contact.online.email")) #end <foaf:mbox rdf:resource="mailto:$!email" /> #set ($imageuri = $auser.getAttribute("basic.personal.imageuri")) #if ("$!imageuri"!="") <foaf:depiction rdf:resource="$imageuri" /> #end <foaf:homepage rdf:resource="/user/card.html?auserlogin=$auser.getUserLogin()"/> </foaf:Person> </rdf:RDF> #end Index: user.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user.html.de,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- user.html.de 11 Feb 2005 14:06:53 -0000 1.7 +++ user.html.de 30 May 2006 14:14:31 -0000 1.8 @@ -1,219 +1,163 @@ -#parse ( "pageheader.html.de" ) -#parse ( "navigation-main.html.de" ) -<td valign=top> - - - - - -#if ($returnCode < 2000) -<p><div class="error"> - -#if ($returnCode > 1004) -Fehler $returnCode beim Aktualisieren der Benutzerdaten. -#end -</div></p> -#end - - -<A - href="/user/user.html.de"><B>Basisinfo</B></A> - - <A - href="/user/user-adress.html.de">Adressinfo</A> - - <A - href="/user/user-interests.html.de">Interessen</A> - - <A - href="/user/user-roles.html.de">Freundesliste</A> - - <A - href="/user/user-bannlist.html.de">Bannliste</A> - - <A - href="/user/user-card.html.de">Visitenkarte</A> - - <A - href="/user/user-veranstaltung.html.de">Veranstaltungsinfo</A> - - <A - href="/user/change_password.html.de">Passwort</A> - -<P>Alle Attribute dieses Profils, die mit privat bzw. öffentlich - gekennzeichnet sind, können hinsichtlich ihrer Sichtbarkeit beschränkt - werden. Private Attribute können nur durch Personen innerhalb des eigenen - <A - href="https://www.in.tum.de/servlet/User_Profil?cmd=infofriendlist">Freundeskreises</A> - eingesehen werden. Alle öffentlichen Attribute können durch alle Personen, - die nicht auf der persönlichen <A - href="https://www.in.tum.de/servlet/User_Profil?cmd=infobanlist">Bannliste</A> - stehen, betrachtet werden.</P> +$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) #set ( $auserlogin = "$!auserlogin" ) #if ( $auserlogin == "" ) #set ( $auserlogin = $userLogin ) #end #set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) ) -#set ( $auser = $userManager.getUser($auserid)) -$userPresenter.setUserAttrInContext($auser, $velocityContext) - -#set ( $auth = $userPresenter.checkPermission($userId, "user", "read", "") ) -#if ( $auth == "true") - -<div class="error">Sie haben keine Berechtigung, das Profil von -Benutzer <b>$auserlogin</b> zu lesen oder zu editieren.</div> -<p> -Bitte melden Sie sich als Benutzer mit den entsprechenden Rechten auf -der Plattform an oder erfragen Sie beim Plattformadministrator die -Zuweisung der ensprechenden Rechte an Ihre Kennung. +#set ($auser = $userManager.getUser($auserid)) +#set ($auserclass = $auser.getUserClass() ) -#else +<h1>Benutzerprofil</h1> -#if("$!auser.getAttribute('mm.privat.online.emailbounced')" == "") -#set($mm_privat_online_emailbounced="0") -#end -#if("$!auser.getAttribute('mm.privat.online.email')" == "") -#set($mm_privat_online_email="0") -#end -#if("$!auser.getAttribute('mm.privat.telecom.mobile')" == "") -#set($mm_privat_telecom_mobile="0") -#end -#if("$!auser.getAttribute('mm.privat.online.uri')" == "") -#set($mm_privat_online_uri="0") +#set ( $auth = $userPresenter.checkPermission($userId, "user", "read", "userid=$auserid") ) +#if ( "$auth" != "true" ) + #if ( "$auserlogin" == "$userLogin" ) + #set ( $auth = "true" ) + #end #end +#if ( $auth != "true" ) +<div class="error">Sie haben keine ausreichenden Zugriffsrechte um das +Benutzerprofil von "$auserlogin" zu lesen.</div> -<form action="/USER" method="post" enctype="multipart/form-data" accept-charset="ISO-8859-1"> -<INPUT TYPE="hidden" NAME="cmd" VALUE="update" /> -<input type="hidden" name="attrrequ" value="" /> -<input type="hidden" name="anames" value="basic_personal_firstname,basic_personal_lastname,basic_university_status,basic_university_faculties,basic_university_graduation,basic_contact-priv_online_email,basic_contact-work_telecom_mobile,basic_contact-work_online_uri,basic_personal_online_imageuri,mm_privat_online_emailbounced,mm_privat_online_email,mm_privat_telecom_mobile,mm_privat_online_uri" /> -<input type="hidden" name="userclass" value="user" /> -<input type="hidden" name="auserid" value="$auserid" /> -<input type="hidden" name="cmd.success" value="/user/user.html.de" /> -<input type="hidden" name="cmd.error" value="/user/user.html.de" /> -<input type="hidden" name="path" value="$portalRequest.getPagePath()"/> - -<table border="0"> -<tbody> - -<tr><td>Vorname:</td> -<td colspan="2"> -<input type="text" name="basic_personal_firstname" size="45" value="$!basic_personal_firstname"> -</td></tr> - -<tr><td colspan="3"> </td></tr> -<tr><td>Nachname:</td> -<td colspan="2"> -<input type="text" name="basic_personal_lastname" size="45" value="$!basic_personal_lastname"> -</td></tr> - -<tr><td colspan="3"> </td></tr> -<tr><td>Status:</td><td colspan="2"> - - $portalPresenter.printSelect("basic_university_status","Student, Alumni, Doktorand, Assistent, Dozent, Gast","$!basic_university_status") -</td></tr> - -<tr><td>Studienrichtung:</td><td colspan="2"> +<p>Bitte melden Sie sich als Benutzer mit den entsprechenden Rechten +an oder kontaktieren Sie den Plattformadministrator um die notwendigen +Rechte zugewiesen zu bekommen.</p> -$portalPresenter.printSelect("basic_university_faculties","INF, BS-INF, ABS-INF, Lehramt, BS-WIRTINF, BS-BIOINF, MS-BIOINF, D-BIOINF, MS-CSEINF","$!basic_university_faculties") -<br>(Diplom-)Abschlussjahr (an der TUM): -<input type="text" name="basic_university_graduation" size="4" value="$!basic_university_graduation"> +#else -</td></tr> +#if (($returnCode != 2010) && ($returnCode != 1001)) +#if ($auserid == 0) + <p><div class="error">Loginname <b>$auserlogin</b> existiert nicht!</div></p> +#else -<tr><td colspan="3"> </td></tr> +#set ($imageuri = $auser.getAttribute("basic.personal.imageuri")) +#if ("$!imageuri"!="") +<img align="right" width="70" src="$imageuri"> +#end -<tr><td>E-Mail:</td> -<td> -<input type="text" name="basic_contact-priv_online_email" size="35" value="$!basic_contact-priv_online_email"> -<br> -E-Mail-Adresse ist: -$portalPresenter.printRadioButton("mm_privat_online_emailbounced","0,1","$!mm_privat_online_emailbounced","gültig, ungültig","line") +<p>Loginname: $auserlogin</p> +<form action="/USER" method="post" enctype="multipart/form-data"> +<INPUT TYPE="hidden" NAME="cmd" VALUE="update" /> +<input type="hidden" name="cmd.success" value="/user/user.html" /> +<input type="hidden" name="cmd.error" value="/user/user.html" /> +<input type="hidden" name="path" value="$portalRequest.getPagePath()"/> +<input type="hidden" name="auserid" value="$auserid" /> +<p> +#if ($returnCode == 1020) + <p><div class="error">Fehler beim Aktualisieren des Benutzerprofils.</div></p> +#end +#if ($returnCode == 2001) + <p><div class="info">Ihre Änderungen wirde erfolgreich gespeichert.</div></p> +#end +#if ($returnCode == 2002) + <p><div class="info">Sie haben nicht geändert..</div></p> +#end -</td> +<p> +<table border="1pt" width="100%" cellspacing="0pt" cellpadding="0pt"> +<tr bgcolor="#eeeeee"> <td> -$portalPresenter.printRadioButton("mm_privat_online_email","0,1","$!mm_privat_online_email","öffentlich, privat","line") - - +<table border="0" cellpadding="5pt"><tr><td> +<em><a href="user.html?auserlogin=$auserlogin">Basisdaten</a> - +<a href="user-interests.html?auserlogin=$auserlogin">Interessen</a> - +<a href="user-buddylist.html?auserlogin=$auserlogin">Freundesliste</a> - +<a href="user-roles.html?auserlogin=$auserlogin">Zugriffsrechte</a><em></td> +</td></tr></table></td> +<td align="right"> +<table border="0" cellpadding="5pt"><tr><td> +<em><a href="change_password.html?auserlogin=$auserlogin">Passwort ändern</a></em> +</td></tr></table> </td></tr> +<tr><td colspan="2"> -<tr><td colspan="3"> </td></tr> - -<tr><td>Mobiltelefonnummer für SMS:<br>(nur Ziffern, keine Trennzeichen)</td> -<td> -<input type="text" name="basic_contact-work_telecom_mobile" size="35" value="$!basic_contact-work_telecom_mobile"> +<table border="0" cellpadding="8pt"> +<tr><td> -</td> -<td> -$portalPresenter.printRadioButton("mm_privat_telecom_mobile","0,1","$!mm_privat_telecom_mobile","öffentlich, privat","line") +<table border="0"> +<tr><td>$userPresenter.printDescription($auserid, "basic.personal.firstname", $lang):</td> +<td>$userPresenter.printUserAttrInput($auserid, "basic.personal.firstname")</td></tr> +<tr><td>$userPresenter.printDescription($auserid, "basic.personal.lastname", $lang):</td> +<td>$userPresenter.printUserAttrInput($auserid, "basic.personal.lastname")</td></tr> +<tr><td>$userPresenter.printDescription($auserid, "basic.demographics.gender", $lang):</td> +<td>$userPresenter.printUserAttrInput($auserid, "basic.demographics.gender")</td></tr> +<tr><td>$userPresenter.printDescription($auserid, "basic.contact-priv.online.email", $lang):</td> +<td>$userPresenter.printUserAttrInput($auserid, "basic.contact-priv.online.email")</td></tr> +<tr><td>$userPresenter.printDescription($auserid, "preference.language", $lang):</td> +<td>$userPresenter.printUserAttrInput($auserid, "preference.language")</td></tr> +<tr><td valign=top>$userPresenter.printDescription($auserid, "basic.personal.languagesspoken", $lang):</td> +<td>$userPresenter.printUserAttrInput($auserid, "basic.personal.languagesspoken")</td></tr> +</table> +<table border="0"> +<tr><td>$userPresenter.printDescription($auserid, "basic.personal.imageuri", $lang):</td> +<td>$userPresenter.printUserAttrInput($auserid, "basic.personal.imageuri")</td></tr> +</table> -</td></tr><tr><td colspan="3"> </td></tr> +<p>If you do not have a possibility to upload a portrait to a Web server, +you can upload an image file (gif, png or jpg) to our server. Just select a +file from you local file system:<br> +<input type="file" size="40" name="uploadimage"> -<tr><td>Homepage:</td> -<td> -<input type="text" name="basic_contact-work_online_uri" size="35" value="$!basic_contact-work_online_uri"> +<p> -</td> -<td> +You can load your user profile from a FOAF/RDF user profile +representation. Just enter the URL of your FOAF description here and +the content of this file will be loaded intot your local Cobricks user +profile. -$portalPresenter.printRadioButton("mm_privat_online_uri","0,1","$!mm_privat_online_uri","öffentlich, privat","line") -</td></tr> +<table border="0"> +<tr><td>$userPresenter.printDescription($auserid, "basic.personal.foafuri", $lang): +$userPresenter.printUserAttrInput($auserid, "basic.personal.foafuri")</td></tr> +</table> +<p> +<input type="submit" value="Update"> -<td> </td></tr> +</td></tr></table> -<tr><td colspan="3"> </td></tr> -<tr><td>URL eines (Portrait-)Bildes:</td> -<td colspan="2"> -<input type="text" name="basic_personal_online_imageuri" size="45" value="$!basic_personal_online_imageuri"> -</td></tr> +</td></tr></table> -<tr><td valign="top" align="left" colspan="3" class="form_td_buttons"> -<input type="submit" value="Speichern"> -</td></tr> -</tbody></table> +#end +#end </form> -<p> -Wenn Sie keine Möglichkeit haben, ein Porträtbild auf einen Web-Server -zu stellen, dann können Sie auch ein Bild (GIF oder JPEG-Format) -auf unseren Server hochladen. Dazu hier einfach die Datei im lokalen -Dateisystem auswählen:<br> - -</p> -<form action="/USER" method="post" enctype="multipart/form-data" accept-charset="ISO-8859-1"> -<INPUT TYPE="hidden" NAME="cmd" VALUE="update" /> -<input type="hidden" name="attrrequ" value="" /> -<input type="hidden" name="anames" value="" /> -<input type="hidden" name="userclass" value="user" /> -<input type="hidden" name="auserid" value="$auserid" /> -<input type="hidden" name="cmd.success" value="/user/user.html.de" /> -<input type="hidden" name="cmd.error" value="/user/user.html.de" /> +<form action="/USER" method="post"> +<input type="hidden" name="cmd" value="delete"/> +<input type="hidden" name="cmd.success" value="/user/user.html"> +<input type="hidden" name="cmd.error" value="/user/user.html"> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> +#if ($auserid == 0) -<input type="file" size="40" name="uploadimage">$!basic_personal_imageuri - - -</form> - +#else -<p>Neben diesen Basisinformationen können Sie im -Benutzerprofil noch weitere Daten speichern, die -benutzt werden, um die Dienste der Informationsdrehscheibe -besser auf Ihre Bedürfnisse anzupassen. So können Sie -Interessenskategorien angeben, zu denen Sie Nachrichten -auf Ihrer persönlichen Portalseite sehen möchten bzw. -zu denen Sie neue Mitteilungen direkt per Email -zugestellt haben möchten. Weiterhin können Sie mit -Mitstudierenden oder Co-Alumnis Adressinformation -austauschen. Wer Ihre Information sehen kann, können Sie -mit Freundes- und Bannlisten beeinflussen.</p> +#set ($userloginToDelete = $auserlogin) +##set ($test="$uLogin") + #if ($returnCode == 1001) + <div class="error"> + Loginname <b>$auserlogin</b> existiert nicht. + </div> + #end + #if ($returnCode == 2010) + <div class="info"> + Die Benutzerkennung <b>$userloginToDelete</b> wurde erfolgreich gelöscht. + </div> + $portalPresenter.doLogout($portalRequest) + #else + <input type="hidden" name="auserlogin" value="$auserlogin" /> + <input type="hidden" name="auserid" value="$auserid" /> + <input type="submit" value="Benutzerkennung löschen" /> + #end -<h3>Kennung löschen</h3> +</form> -Wenn Sie sicher sind, dass Sie diese Kennung löschen wollen, dann -wählen die <a href="/user/user-delete.html.de">diesen Link</a> -an. +#end #end -</td> -#parse ( "pagefooter.html" ) + +$portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) --- NEW FILE: registeremail.txt.de --- (This appears to be a binary file; contents omitted.) Index: user-interests.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user-interests.html.de,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- user-interests.html.de 26 Nov 2004 10:14:22 -0000 1.10 +++ user-interests.html.de 30 May 2006 14:14:31 -0000 1.11 @@ -1,5 +1,6 @@ -#parse ( "pageheader.html.de" ) -#parse ( "navigation-main.html.de" ) +#parse ( "pageheader.html" ) +<em><a href="index.html">User Component</a> - +<a href="user-interests.html">User Profile Interests</a></em> #set ( $auserlogin = "$!auserlogin" ) #if ( $auserlogin == "" ) @@ -7,143 +8,120 @@ #end #set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) ) #set ($auser = $userManager.getUser($auserid)) -#if(!$selectedLangs) - #set($selectedLangs = [$lang]) -#end -#set ($langs = "") -#if (!$language) - #set($language = $lang) +#set ($auserclass = $auser.getUserClass() ) + +<h1>User Profile - Interests</h1> + +#set ( $auth = $userPresenter.checkPermission($userId, "user", "read", "userid=$auserid") ) +#if ( "$auth" != "true" ) + #if ( "$auserlogin" == "$userLogin" ) + #set ( $auth = "true" ) + #end #end +#if ( $auth != "true" ) +<div class="error">You do not have the access permission to read user +information of user "$auserlogin".</div> +<p> +Please log in as user with the specified permission or ask the platform +administrator to assign the permission to your account. -<td valign=top> - <A - href="/user/user.html.de">Basisinfo</A> - - <A - href="/user/user-adress.html.de">Adressinfo</A> - - <A - href="/user/user-interests.html.de"><B>Interessen</B></A> - - <A - href="/user/user-roles.html.de">Freundesliste</A> - - <A - href="/user/user-bannlist.html.de">Bannliste</A> - - <A - href="/user/user-card.html.de">Visitenkarte</A> - - <A - href="/user/user-veranstaltung.html.de">Veranstaltungsinfo</A> - - <A - href="/user/change_password.html.de">Passwort</A> - -<BR> -<B>Interessenskategorien - (Communities):</B><BR> - +#else - #if ($returnCode == 1002) - <p><div class="info">Der eingegebene Eintrag ist bereits in Ihrer Interessen Liste vorhanden!</div></p> - #end - #if ($returnCode == 1010) - <p><div class="info">Sie haben nichts eingegeben!</div></p> - #end - #if ($returnCode == 2001) - <p><div class="info">Ein neuer Eintrag ist der Liste hinzugefügt worden.</div></p> - #end - <TABLE border=0> - <TBODY> - <TR> - <TD colSpan=2> - <P>Wenn Sie hier Communities anwählen und bei den Basisinformation - eine E-Mail-Adresse angeben, dann knnen Sie Benachrichtigungen zu - Ereignissen, die mit Items in diesen Communities zusammenhängen, - direkt per E-Mail zugestellt bekommen. Beispiele fr solche - Ereignisse sind das Erzeugen oder das Ãndern von neuen Items wie - z.B. Mitteilungen. </P> - <P>Sie knnen auch auswählen, wann Benachrichtigungen zusgestellt - werden sollen. Bei der Auswahl von täglich, wchentlich oder - monatlich erhalten Sie die Benachrichtigungen gesammelt in Form - eines Newsletters. </P></TD></TR> - <TR> - <TD><EM>Sofort: (inklusive Attachments)</EM></TD> - <TD><EM>Tälich:</EM></TD></TR> - - <TR> - <TD> - <form action="/USER" method="post"> - <input type="hidden" name="cmd" value="addListMember" /> - <input type="hidden" name="cmd.success" value="/user/user-interests.html.de" /> - <input type="hidden" name="cmd.error" value="/user/user-interests.html.de" /> - <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> - <input type="hidden" name="aname" value="interests.categories" /> - - <input type="hidden" name="uid" value="$auserid" /> - #if ($auserid > 0) - - <select multiple size=15 name="cid"> - #foreach( $i in $categoryPresenter.getCategories("community", "", "") ) - <option value="$i.getId()" - #set ($result = $userPresenter.getUserAttrSet($auserid, "interests.categories")) - #foreach ($j in $result) - #if ($!i.getId()==$!j.getId()) - selected - #end - #end - > - $!i.getAttribute("title_$language") </option> - - #end - </select> - - <br><br> - +#if ($auserid == 0) + <p><div class="error">User with user login <b>$auserlogin</b> does not exist!</div></p> +#else - #end - +#if ($returnCode == 1002) +<p><div class="info">The interest you try to add, is already in your interests list.</div></p> +#end +#if ($returnCode == 1010) +<p><div class="info">You have choosen nothing to add. </div></p> +#end +#if ($returnCode == 2001) +<p><div class="info">The new entry has been added to your interests list.</div></p> +#end - +<p>User Login: $auserlogin</p> - - - - - - - </TD> - <TD> - - <input type="hidden" name="aname" value="interests.categories.mail" /> - +<form action="/USER" method="post"> +<input type="hidden" name="cmd" value="deleteListMember" /> +<input type="hidden" name="cmd.success" value="/user/user-interests.html" /> +<input type="hidden" name="cmd.error" value="/user/user-interests.html" /> +<input type="hidden" name="path" value="$portalRequest.getPagePath()"/> +<input type="hidden" name="aname" value="interests.categories" /> +<input type="hidden" name="uid" value="$auserid" /> - #if ($auserid > 0) +<p> +<table border="1pt" width="100%" cellspacing="0pt" cellpadding="0pt"> +<tr bgcolor="#eeeeee"> +<td> +<table border="0" cellpadding="5pt"><tr><td> +<em><a href="user.html?auserlogin=$auserlogin">basic</a> - +<a href="user-interests.html?auserlogin=$auserlogin">interests</a> - +<a href="user-buddylist.html?auserlogin=$auserlogin">buddylist</a> - +<a href="user-roles.html?auserlogin=$auserlogin">access roles</a><em></td> +</td></tr></table></td> +<td align="right"> +<table border="0" cellpadding="5pt"><tr><td> +<em><a href="change_password.html?auserlogin=$auserlogin">change password</a></em> +</td></tr></table> +</td></tr> +<tr><td colspan="2"> - <select multiple size=15 name="cid"> - #foreach( $i in $categoryPresenter.getCategories("community", "", "") ) - <option value="$i.getId()" - #set ($result = $userPresenter.getUserAttrSet($auserid, "interests.categories.mail")) - #foreach ($j in $result) - #if ($!i.getId()==$!j.getId()) - selected - #end - #end - - >$!i.getAttribute("title_$language") </option> - #end - </select> - - <br><br> - <input type="submit" value="In die Liste aufnehmen"> +<table border="0" cellpadding="8pt"> +<tr><td> - #end - </form> - - </TD> - </TR> - </TBODY></TABLE><BR> +<b>Interests of user <i>$userManager.getUser($auserid).getName()</i></b> +<br><br> +<table width="100%"> + <tr bgcolor="dfdfdf"><td width="7%"><b>Delete</b></td><td width="43%"><b>Name</b></td><td width="50%"><b>Category Class</b></td></tr> + #set ($result = $userPresenter.getUserAttrSet($auserid, "interests.categories")) + #if ($result.size() > 0) + #foreach ($i in $result) + <tr bgcolor="dfdfdf"> + <td align="center"><input type="checkbox" name="id" value="$i.getId()"></td> + <td>$i.getTitle()</td> + <td>$i.getOntologyClassName() </td> + </tr> + #end + #else + <tr><td colspan = "3">Your interests list has no entries yet. You can choose it from the list below and add it to your interests list.</td></tr> + #end +</table> +<br> +<input type="submit" value="Delete"> +</form> +<p> + +<form action="/USER" method="post"> +<input type="hidden" name="cmd" value="addListMember" /> +<input type="hidden" name="cmd.success" value="/user/user-interests.html" /> +<input type="hidden" name="cmd.error" value="/user/user-interests.html" /> +<input type="hidden" name="path" value="$portalRequest.getPagePath()"/> +<input type="hidden" name="aname" value="interests.categories" /> +<input type="hidden" name="uid" value="$auserid" /> +Please choose more interests from the list and click the button "Add to the +list": +<select name="cid"> +#foreach( $i in $categoryPresenter.getCategories("", "", "") ) + <option value="$i.getId()">$!i.getTitle() </option> +#end +</select> +<br><br> +<input type="submit" value="Add to the list"> + +</td></tr></table> + +</td></tr></table> +</form> +#end +#end -</td> -#parse ( "pagefooter.html" ) \ No newline at end of file +#parse ( "pagefooter.html" ) Index: register-success.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/register-success.html.de,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- register-success.html.de 29 May 2006 07:19:35 -0000 1.4 +++ register-success.html.de 30 May 2006 14:14:31 -0000 1.5 @@ -1,14 +1,16 @@ $portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) -<h1>User Registration</h1> +<h1>Benutzerregistrierung</h1> -<p>Thank you for registering <i>$firstname $lastname</i> -<br> -Your login name is <b>$auserlogin</b>.</p> +<p>Für den Benutzer <b>$basic_personal_firstname +$basic_personal_lastname</b> wurde eine Benutzerkennung mit dem +Loginnamen <b>$auserlogin</b> angelegt.</p> -<p> -Your password will be sent to the email address <b>$email</b>. -</p> +<p> Das Passwort zum Anmelden wurde per E-Mail an die Adresse +<b>$basic_contact-priv_online_email</b> gesandt. Bitte warten Sie auf +das Eintreffen der E-Mail mit dem Passwort, melden sich dann mit +diesem Passwort an un ändern Sie es Ihren Wünschen +entsprechend.</p> $portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) Index: register.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/register.html.de,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- register.html.de 29 May 2006 07:30:17 -0000 1.7 +++ register.html.de 30 May 2006 14:14:31 -0000 1.8 @@ -4,98 +4,92 @@ <h1>Benutzerregistrierung</h1> #if (($returnCode >= 1000) && ($returnCode <=1020)) - #if ($returnCode == 1000) - <font color="red"> - Loginname ist ein Pflichtfeld! - </font> - #end - #if ($returnCode == 1001) - <div class="error"> - Länge des Loginnamens muss mindestens 6 und - höchstens 20 Symbolen sein. - </div> - #end - #if ($returnCode == 1009) - <p> - <div class="error"> - Der Loginname darf keine Leerzeichen - oder Sonderzeichen (Ausnahme ".", "-" und "_") enthalten. - </div> - </p> - - #end - #if ($returnCode == 1002) - <div class="error"> - Vorname ist ein Pflichtfeld! - </div> - #end - #if ($returnCode == 1003) - <div class="error"> - Vorname muss mindestens 1 und höchstens 20 Symbolen sein. - </div> - #end - #if ($returnCode == 1004) - <div class="error"> - Lastname ist ein Pflichtfeld! - </div> - #end - #if ($returnCode == 1005) - <div class="error"> - Lastname muss mindestens 1 und höchstens 20 Symbolen sein. - </div> - #end - #if ($returnCode == 1006) - <div class="error"> - E-Mail ist ein Pflichtfeld! - </div> - #end - #if ($returnCode == 1007) - <div class="error"> - E-Mail ist nicht gültig - </div> - <br> - <div class="error"> - E-Mail muss mindestens 6 und höchstens 30 Symbolen sein. - </div> - #end - - - #if ($returnCode == 1020) - <p><div class="error"> - Benutzer mit login <i>$auserlogin</i> existiert bereits. - </div> - </p> - #end - <br> - Bitte versuchen Sie noch ein mal! -#else +#if ($returnCode == 1000) + <font color="red"> + Loginname ist ein Pflichtfeld! + </font> +#end +#if ($returnCode == 1001) + <div class="error"> + Länge des Loginnamens muss mindestens 6 und + höchstens 20 Zeichen sein. + </div> +#end +#if ($returnCode == 1009) <p> - Wenn Sie bereits eine Kennung auf dieser Plattform haben, dann - können Sie sich über das Login-Formular auf der linken Seite - anmelden. + <div class="error"> + Der Loginname darf keine Leerzeichen + oder Sonderzeichen (Ausnahme ".", "-" und "_") enthalten. + </div> </p> - <p> - Um sich als neuer Benutzer auf dieser Plattform zu registrieren, - wählen Sie im nachfolgenden Formular zuerst einen Benutzernamen und - geben Sie eine gültige E-Mail-Adresse an. Bei einer erfolgreichen - Anmeldung wird Ihr Anfangs-Passwort an die angegebene E-Mail-Adresse - geschickt. +#end +#if ($returnCode == 1002) + <div class="error"> + Vorname ist ein Pflichtfeld! + </div> +#end +#if ($returnCode == 1003) + <div class="error"> + Vorname muss mindestens 1 und höchstens 20 Zeichen haben. + </div> +#end +#if ($returnCode == 1004) + <div class="error"> + Nachname ist ein Pflichtfeld! + </div> +#end +#if ($returnCode == 1005) + <div class="error"> + Nachname muss mindestens 1 und höchstens 20 Zeichen haben. + </div> +#end +#if ($returnCode == 1006) + <div class="error"> + E-Mail-Adresse ist ein Pflichtfeld! + </div> +#end +#if ($returnCode == 1007) + <div class="error"> + E-Mail-Adresse ist nicht gültig + </div> + <br> + <div class="error"> + E-Mail-Adresse ist nicht gültig + </div> +#end + +#if ($returnCode == 1020) + <p><div class="error"> + Benutzer mit login <i>$auserlogin</i> existiert bereits. + Bitte wählen Sie einen anderen Benutzernamen. + </div> </p> - <p> - Die Länge des <b><font color="black">Loginnames</font></b> - muss zwischen 6 und 20 Symbolen sein. - Der Loginname darf keine Leerzeichen - oder Sonderzeichen (Ausnahme ".", "-" und "_") enthalten. - </p> #end +#else -##if () +<p> Wenn Sie bereits eine Kennung auf dieser Plattform haben, dann +können Sie sich über das <a +href="/user/login.html">Login-Formular</a> anmelden. </p> + +<p> Um sich als neuer Benutzer auf dieser Plattform zu registrieren, +wählen Sie im nachfolgenden Formular zuerst einen Benutzernamen +und geben Sie eine gültige E-Mail-Adresse an. Bei einer +erfolgreichen Anmeldung wird Ihr Anfangs-Passwort an die angegebene +E-Mail-Adresse geschickt. </p> + +<p> Die Länge des <b><font color="black">Loginnames</font></b> +muss zwischen 6 und 20 Symbolen sein. Der Loginname darf keine +Leerzeichen oder Sonderzeichen (Ausnahme ".", "-" und "_") enthalten. +</p> + +#end <form action="/USER" method=post> <p> <INPUT TYPE=hidden NAME=cmd VALUE=register /> +<input type="hidden" name="attrrequ" value="basic_personal_firstname,basic_personal_lastname,basic_contact-priv_online_email" /> <input type="hidden" name="attrnames" value="basic_university_status,basic_personal_title" /> <input type="hidden" name="userclass" value="universityuser" /> @@ -106,20 +100,20 @@ <TD>Gewünschter Loginname*:</TD><TD><input name="auserlogin" size=20 value="$!auserlogin"></td> </tr> <tr> - <TD>Vorname*:</TD><TD><input name="firstname" size=20 value="$!firstname"></td> + <TD>Vorname*:</TD><TD><input name="basic_personal_firstname" size=20 value="$!basic_personal_firstname"></td> </tr> <tr> - <TD>Nachname*:</TD><TD><input name="lastname" size=20 value="$!lastname"></td> + <TD>Nachname*:</TD><TD><input name="basic_personal_lastname" size=20 value="$!basic_personal_lastname"></td> </tr> <tr> - <TD>E-Mail*:</TD><TD><input name="email" size=20 value="$!email"></td> + <TD>E-Mail*:</TD><TD><input name="basic_contact-priv_online_email" size=20 value="$!basic_contact-priv_online_email"></td> </tr> <tr> <TD>Status:</TD><TD> #set ( $tmpstatus = "$!basic_university_status" ) #set ($auserclass = "$!userclass") <select width ="20" name="basic_university_status"> - #foreach( $i in $userManager.getProfileModel("universityuser").getAttribute("basic.university.status").getValues() ) +#foreach( $i in $userManager.getProfileModel("universityuser").getAttribute("basic.university.status").getValues() ) #if ( $i == $tmpstatus ) <option value="$i" selected="true">$i #else @@ -135,16 +129,15 @@ </tr> <tr> - <br> - <td colspan = "2" align="left">Mit * gekennzeichnete Felder sind Pflichtfelder.</td> + <br> + <td colspan = "2" align="left">Mit * gekennzeichnete Felder sind Pflichtfelder.</td> </tr> </table> </p> #set ($login = "$!auserlogin") <p><input type=submit value="Registrieren"></p> - <input type="hidden" name="email_subject" value="Cobricks Registrierung" /> - <input type=hidden name="email_text" value=" Sie haben sich bei der Cobricks Plattform registriert. Ihr Benutzername ist " /> - <input type=hidden name="email_text_1" value =". Ihr Passwort lautet " /> +<input type="hidden" name="email_subject" value="Drehscheibe Registrierung" /> +<input type=hidden name="email_textsource" value="/user/registeremail.txt.de" /> </form> $portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:14:44
|
Update of /cvsroot/cobricks/drehscheibe-in/tomcat/5.5/webapps In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10733/tomcat/5.5/webapps Added Files: README.txt Log Message: --- NEW FILE: README.txt --- Currently, there are no webapps here - but there has to be a file to prevent CVS from deleting the directory ... |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:14:42
|
Update of /cvsroot/cobricks/drehscheibe-in/tomcat/5.0/conf In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10733/tomcat/5.0/conf Added Files: catalina.policy catalina.properties server.xml tomcat-users.xml web.xml Log Message: --- NEW FILE: catalina.policy --- // ============================================================================ // catalina.corepolicy - Security Policy Permissions for Tomcat 5 // // This file contains a default set of security policies to be enforced (by the // JVM) when Catalina is executed with the "-security" option. In addition // to the permissions granted here, the following additional permissions are // granted to the codebase specific to each web application: // // * Read access to the document root directory // // $Id: catalina.policy,v 1.1 2006/05/30 14:14:30 kochm Exp $ // ============================================================================ // ========== SYSTEM CODE PERMISSIONS ========================================= // These permissions apply to javac grant codeBase "file:${java.home}/lib/-" { permission java.security.AllPermission; }; // These permissions apply to all shared system extensions grant codeBase "file:${java.home}/jre/lib/ext/-" { permission java.security.AllPermission; }; // These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre grant codeBase "file:${java.home}/../lib/-" { permission java.security.AllPermission; }; // These permissions apply to all shared system extensions when // ${java.home} points at $JAVA_HOME/jre grant codeBase "file:${java.home}/lib/ext/-" { permission java.security.AllPermission; }; // ========== CATALINA CODE PERMISSIONS ======================================= // These permissions apply to the launcher code grant codeBase "file:${catalina.home}/bin/commons-launcher.jar" { permission java.security.AllPermission; }; // These permissions apply to the server startup code grant codeBase "file:${catalina.home}/bin/bootstrap.jar" { permission java.security.AllPermission; }; // These permissions apply to the servlet API classes // and those that are shared across all class loaders // located in the "common" directory grant codeBase "file:${catalina.home}/common/-" { permission java.security.AllPermission; }; // These permissions apply to the container's core code, plus any additional // libraries installed in the "server" directory grant codeBase "file:${catalina.home}/server/-" { permission java.security.AllPermission; }; // ========== WEB APPLICATION PERMISSIONS ===================================== // These permissions are granted by default to all web applications // In addition, a web application will be given a read FilePermission // and JndiPermission for all files and directories in its document root. grant { // Required for JNDI lookup of named JDBC DataSource's and // javamail named MimePart DataSource used to send mail permission java.util.PropertyPermission "java.home", "read"; permission java.util.PropertyPermission "java.naming.*", "read"; permission java.util.PropertyPermission "javax.sql.*", "read"; // OS Specific properties to allow read access permission java.util.PropertyPermission "os.name", "read"; permission java.util.PropertyPermission "os.version", "read"; permission java.util.PropertyPermission "os.arch", "read"; permission java.util.PropertyPermission "file.separator", "read"; permission java.util.PropertyPermission "path.separator", "read"; permission java.util.PropertyPermission "line.separator", "read"; // JVM properties to allow read access permission java.util.PropertyPermission "java.version", "read"; permission java.util.PropertyPermission "java.vendor", "read"; permission java.util.PropertyPermission "java.vendor.url", "read"; permission java.util.PropertyPermission "java.class.version", "read"; permission java.util.PropertyPermission "java.specification.version", "read"; permission java.util.PropertyPermission "java.specification.vendor", "read"; permission java.util.PropertyPermission "java.specification.name", "read"; permission java.util.PropertyPermission "java.vm.specification.version", "read"; permission java.util.PropertyPermission "java.vm.specification.vendor", "read"; permission java.util.PropertyPermission "java.vm.specification.name", "read"; permission java.util.PropertyPermission "java.vm.version", "read"; permission java.util.PropertyPermission "java.vm.vendor", "read"; permission java.util.PropertyPermission "java.vm.name", "read"; // Required for OpenJMX permission java.lang.RuntimePermission "getAttribute"; // Allow read of JAXP compliant XML parser debug permission java.util.PropertyPermission "jaxp.debug", "read"; }; // You can assign additional permissions to particular web applications by // adding additional "grant" entries here, based on the code base for that // application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files. // // Different permissions can be granted to JSP pages, classes loaded from // the /WEB-INF/classes/ directory, all jar files in the /WEB-INF/lib/ // directory, or even to individual jar files in the /WEB-INF/lib/ directory. // // For instance, assume that the standard "examples" application // included a JDBC driver that needed to establish a network connection to the // corresponding database and used the scrape taglib to get the weather from // the NOAA web server. You might create a "grant" entries like this: // // The permissions granted to the context root directory apply to JSP pages. // grant codeBase "file:${catalina.home}/webapps/examples/-" { // permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect"; // permission java.net.SocketPermission "*.noaa.gov:80", "connect"; // }; // // The permissions granted to the context WEB-INF/classes directory // grant codeBase "file:${catalina.home}/webapps/examples/WEB-INF/classes/-" { // }; // // The permission granted to your JDBC driver // grant codeBase "jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/driver.jar!/-" { // permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect"; // }; // The permission granted to the scrape taglib // grant codeBase "jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/scrape.jar!/-" { // permission java.net.SocketPermission "*.noaa.gov:80", "connect"; // }; --- NEW FILE: web.xml --- <?xml version="1.0" encoding="ISO-8859-1"?> <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> <web-app> <!-- ======================== Introduction ============================== --> <!-- This document defines default values for *all* web applications --> <!-- loaded into this instance of Tomcat. As each application is --> <!-- deployed, this file is processed, followed by the --> <!-- "/WEB-INF/web.xml" deployment descriptor from your own --> <!-- applications. --> <!-- --> <!-- WARNING: Do not configure application-specific resources here! --> <!-- They should go in the "/WEB-INF/web.xml" file in your application. --> <!-- ================== Built In Servlet Definitions ==================== --> <!-- The default servlet for all web applications, that serves static --> <!-- resources. It processes all requests that are not mapped to other --> <!-- servlets with servlet mappings (defined either here or in your own --> <!-- web.xml file. This servlet supports the following initialization --> <!-- parameters (default values are in square brackets): --> <!-- --> <!-- debug Debugging detail level for messages logged --> <!-- by this servlet. [0] --> <!-- --> <!-- input Input buffer size (in bytes) when reading --> <!-- resources to be served. [2048] --> <!-- --> <!-- listings Should directory listings be produced if there --> <!-- is no welcome file in this directory? [true] --> <!-- --> <!-- output Output buffer size (in bytes) when writing --> <!-- resources to be served. [2048] --> <!-- --> <!-- readonly Is this context "read only", so HTTP --> <!-- commands like PUT and DELETE are --> <!-- rejected? [true] --> <!-- --> <!-- readmeFile File name to display with the directory --> <!-- contents. [null] --> <!-- --> <!-- For directory listing customization. Checks localXsltFile, then --> <!-- globalXsltFile, then defaults to original behavior. --> <!-- --> <!-- localXsltFile Make directory listings an XML doc and --> <!-- pass the result to this style sheet residing --> <!-- in that directory. This overrides --> <!-- globalXsltFile[null] --> <!-- --> <!-- globalXsltFile Site wide configuration version of --> <!-- localXsltFile This argument is expected --> <!-- to be a physical file. [null] --> <!-- --> <!-- --> <servlet> <servlet-name>default</servlet-name> <servlet-class> org.apache.catalina.servlets.DefaultServlet </servlet-class> <init-param> <param-name>debug</param-name> <param-value>0</param-value> </init-param> <init-param> <param-name>listings</param-name> <param-value>true</param-value> </init-param> <load-on-startup>1</load-on-startup> </servlet> <!-- The "invoker" servlet, which executes anonymous servlet classes --> <!-- that have not been defined in a web.xml file. Traditionally, this --> <!-- servlet is mapped to URL pattern "/servlet/*", but you can map it --> <!-- to other patterns as well. The extra path info portion of such a --> <!-- request must be the fully qualified class name of a Java class that --> <!-- implements Servlet (or extends HttpServlet), or the servlet name --> <!-- of an existing servlet definition. This servlet supports the --> <!-- following initialization parameters (default values are in square --> <!-- brackets): --> <!-- --> <!-- debug Debugging detail level for messages logged --> <!-- by this servlet. [0] --> <servlet> <servlet-name>invoker</servlet-name> <servlet-class> org.apache.catalina.servlets.InvokerServlet </servlet-class> <init-param> <param-name>debug</param-name> <param-value>0</param-value> </init-param> <load-on-startup>2</load-on-startup> </servlet> <!-- The JSP page compiler and execution servlet, which is the mechanism --> <!-- used by Tomcat to support JSP pages. Traditionally, this servlet --> <!-- is mapped to URL patterh "*.jsp". This servlet supports the --> <!-- following initialization parameters (default values are in square --> <!-- brackets): --> <!-- --> <!-- checkInterval If development is false and reloading is true, --> <!-- background compiles are enabled. checkInterval --> <!-- is the time in seconds between checks to see --> <!-- if a JSP page needs to be recompiled. [300] --> <!-- --> <!-- compiler Which compiler Ant should use to compile JSP --> <!-- pages. See the Ant documenation for more --> <!-- information. [javac] --> <!-- --> <!-- classdebuginfo Should the class file be compiled with --> <!-- debugging information? [true] --> <!-- --> <!-- classpath What class path should I use while compiling --> <!-- generated servlets? [Created dynamically --> <!-- based on the current web application] --> <!-- --> <!-- development Is Jasper used in development mode (will check --> <!-- for JSP modification on every access)? [true] --> <!-- --> <!-- enablePooling Determines whether tag handler pooling is --> <!-- enabled [true] --> <!-- --> <!-- fork Tell Ant to fork compiles of JSP pages so that --> <!-- a separate JVM is used for JSP page compiles --> <!-- from the one Tomcat is running in. [true] --> <!-- --> <!-- ieClassId The class-id value to be sent to Internet --> <!-- Explorer when using <jsp:plugin> tags. --> <!-- [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93] --> <!-- --> <!-- javaEncoding Java file encoding to use for generating java --> <!-- source files. [UTF8] --> <!-- --> <!-- keepgenerated Should we keep the generated Java source code --> <!-- for each page instead of deleting it? [true] --> <!-- --> <!-- logVerbosityLevel The level of detailed messages to be produced --> <!-- by this servlet. Increasing levels cause the --> <!-- generation of more messages. Valid values are --> <!-- FATAL, ERROR, WARNING, INFORMATION, and DEBUG. --> <!-- [WARNING] --> <!-- --> <!-- mappedfile Should we generate static content with one --> <!-- print statement per input line, to ease --> <!-- debugging? [false] --> <!-- --> <!-- reloading Should Jasper check for modified JSPs? [true] --> <!-- --> <!-- suppressSmap Should the generation of SMAP info for JSR45 --> <!-- debugging be suppressed? [false] --> <!-- --> <!-- dumpSmap Should the SMAP info for JSR45 debugging be --> <!-- dumped to a file? [false] --> <!-- False if suppressSmap is true --> <!-- --> <!-- scratchdir What scratch directory should we use when --> <!-- compiling JSP pages? [default work directory --> <!-- for the current web application] --> <!-- --> <!-- tagPoolSize The tag handler pool size --> <!-- --> <!-- If you wish to use Jikes to compile JSP pages: --> <!-- Set the init parameter "compiler" to "jikes". Define --> <!-- the property "-Dbuild.compiler.emacs=true" when starting Tomcat --> <!-- by adding the above to your CATALINA_OPTS environment variable. --> <!-- If you get an error reporting that jikes can't use UTF8 encoding, --> <!-- try setting the init parameter "javaEncoding" to "ISO-8859-1". --> <servlet> <servlet-name>jsp</servlet-name> <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class> <init-param> <param-name>logVerbosityLevel</param-name> <param-value>WARNING</param-value> </init-param> <init-param> <param-name>fork</param-name> <param-value>false</param-value> </init-param> <load-on-startup>3</load-on-startup> </servlet> <!-- Server Side Includes processing servlet, which processes SSI --> <!-- directives in HTML pages consistent with similar support in web --> <!-- servers like Apache. Traditionally, this servlet is mapped to --> <!-- URL pattern "*.shtml". This servlet supports the following --> <!-- initialization parameters (default values are in square brackets): --> <!-- --> <!-- buffered Should output from this servlet be buffered? --> <!-- (0=false, 1=true) [0] --> <!-- --> <!-- debug Debugging detail level for messages logged --> <!-- by this servlet. [0] --> <!-- --> <!-- expires The number of seconds before a page with SSI --> <!-- directives will expire. [No default] --> <!-- --> <!-- isVirtualWebappRelative --> <!-- Should "virtual" paths be interpreted as --> <!-- relative to the context root, instead of --> <!-- the server root? (0=false, 1=true) [0] --> <!-- --> <!-- --> <!-- IMPORTANT: To use the SSI servlet, you also need to rename the --> <!-- $CATALINA_HOME/server/lib/servlets-ssi.renametojar file --> <!-- to $CATALINA_HOME/server/lib/servlets-ssi.jar --> <!-- <servlet> <servlet-name>ssi</servlet-name> <servlet-class> org.apache.catalina.ssi.SSIServlet </servlet-class> <init-param> <param-name>buffered</param-name> <param-value>1</param-value> </init-param> <init-param> <param-name>debug</param-name> <param-value>0</param-value> </init-param> <init-param> <param-name>expires</param-name> <param-value>666</param-value> </init-param> <init-param> <param-name>isVirtualWebappRelative</param-name> <param-value>0</param-value> </init-param> <load-on-startup>4</load-on-startup> </servlet> --> <!-- Common Gateway Includes (CGI) processing servlet, which supports --> <!-- execution of external applications that conform to the CGI spec --> <!-- requirements. Typically, this servlet is mapped to the URL pattern --> <!-- "/cgi-bin/*", which means that any CGI applications that are --> <!-- executed must be present within the web application. This servlet --> <!-- supports the following initialization parameters (default values --> <!-- are in square brackets): --> <!-- --> <!-- cgiPathPrefix The CGI search path will start at --> <!-- webAppRootDir + File.separator + this prefix. --> <!-- [WEB-INF/cgi] --> <!-- --> <!-- clientInputTimeout The time (in milliseconds) to wait for input --> <!-- from the browser before assuming that there --> <!-- is none. [100] --> <!-- --> <!-- debug Debugging detail level for messages logged --> <!-- by this servlet. [0] --> <!-- --> <!-- IMPORTANT: To use the CGI servlet, you also need to rename the --> <!-- $CATALINA_HOME/server/lib/servlets-cgi.renametojar file --> <!-- to $CATALINA_HOME/server/lib/servlets-cgi.jar --> <!-- <servlet> <servlet-name>cgi</servlet-name> <servlet-class>org.apache.catalina.servlets.CGIServlet</servlet-class> <init-param> <param-name>clientInputTimeout</param-name> <param-value>100</param-value> </init-param> <init-param> <param-name>debug</param-name> <param-value>6</param-value> </init-param> <init-param> <param-name>cgiPathPrefix</param-name> <param-value>WEB-INF/cgi</param-value> </init-param> <load-on-startup>5</load-on-startup> </servlet> --> <!-- ================ Built In Servlet Mappings ========================= --> <!-- The servlet mappings for the built in servlets defined above. Note --> <!-- that, by default, the CGI and SSI servlets are *not* mapped. You --> <!-- must uncomment these mappings (or add them to your application's own --> <!-- web.xml deployment descriptor) to enable these services --> <!-- The mapping for the default servlet --> <servlet-mapping> <servlet-name>default</servlet-name> <url-pattern>/</url-pattern> </servlet-mapping> <!-- The mapping for the invoker servlet --> <!-- <servlet-mapping> <servlet-name>invoker</servlet-name> <url-pattern>/servlet/*</url-pattern> </servlet-mapping> --> <!-- The mapping for the JSP servlet --> <servlet-mapping> <servlet-name>jsp</servlet-name> <url-pattern>*.jsp</url-pattern> </servlet-mapping> <servlet-mapping> <servlet-name>jsp</servlet-name> <url-pattern>*.jspx</url-pattern> </servlet-mapping> <!-- The mapping for the SSI servlet --> <!-- <servlet-mapping> <servlet-name>ssi</servlet-name> <url-pattern>*.shtml</url-pattern> </servlet-mapping> --> <!-- The mapping for the CGI Gateway servlet --> <!-- <servlet-mapping> <servlet-name>cgi</servlet-name> <url-pattern>/cgi-bin/*</url-pattern> </servlet-mapping> --> <!-- ==================== Default Session Configuration ================= --> <!-- You can set the default session timeout (in minutes) for all newly --> <!-- created sessions by modifying the value below. --> <session-config> <session-timeout>30</session-timeout> </session-config> <!-- ===================== Default MIME Type Mappings =================== --> <!-- When serving static resources, Tomcat will automatically generate --> <!-- a "Content-Type" header based on the resource's filename extension, --> <!-- based on these mappings. Additional mappings can be added here (to --> <!-- apply to all web applications), or in your own application's web.xml --> <!-- deployment descriptor. --> <mime-mapping> <extension>abs</extension> <mime-type>audio/x-mpeg</mime-type> </mime-mapping> <mime-mapping> <extension>ai</extension> <mime-type>application/postscript</mime-type> </mime-mapping> <mime-mapping> <extension>aif</extension> <mime-type>audio/x-aiff</mime-type> </mime-mapping> <mime-mapping> <extension>aifc</extension> <mime-type>audio/x-aiff</mime-type> </mime-mapping> <mime-mapping> <extension>aiff</extension> <mime-type>audio/x-aiff</mime-type> </mime-mapping> <mime-mapping> <extension>aim</extension> <mime-type>application/x-aim</mime-type> </mime-mapping> <mime-mapping> <extension>art</extension> <mime-type>image/x-jg</mime-type> </mime-mapping> <mime-mapping> <extension>asf</extension> <mime-type>video/x-ms-asf</mime-type> </mime-mapping> <mime-mapping> <extension>asx</extension> <mime-type>video/x-ms-asf</mime-type> </mime-mapping> <mime-mapping> <extension>au</extension> <mime-type>audio/basic</mime-type> </mime-mapping> <mime-mapping> <extension>avi</extension> <mime-type>video/x-msvideo</mime-type> </mime-mapping> <mime-mapping> <extension>avx</extension> <mime-type>video/x-rad-screenplay</mime-type> </mime-mapping> <mime-mapping> <extension>bcpio</extension> <mime-type>application/x-bcpio</mime-type> </mime-mapping> <mime-mapping> <extension>bin</extension> <mime-type>application/octet-stream</mime-type> </mime-mapping> <mime-mapping> <extension>bmp</extension> <mime-type>image/bmp</mime-type> </mime-mapping> <mime-mapping> <extension>body</extension> <mime-type>text/html</mime-type> </mime-mapping> <mime-mapping> <extension>cdf</extension> <mime-type>application/x-cdf</mime-type> </mime-mapping> <mime-mapping> <extension>cer</extension> <mime-type>application/x-x509-ca-cert</mime-type> </mime-mapping> <mime-mapping> <extension>class</extension> <mime-type>application/java</mime-type> </mime-mapping> <mime-mapping> <extension>cpio</extension> <mime-type>application/x-cpio</mime-type> </mime-mapping> <mime-mapping> <extension>csh</extension> <mime-type>application/x-csh</mime-type> </mime-mapping> <mime-mapping> <extension>css</extension> <mime-type>text/css</mime-type> </mime-mapping> <mime-mapping> <extension>dib</extension> <mime-type>image/bmp</mime-type> </mime-mapping> <mime-mapping> <extension>doc</extension> <mime-type>application/msword</mime-type> </mime-mapping> <mime-mapping> <extension>dtd</extension> <mime-type>text/plain</mime-type> </mime-mapping> <mime-mapping> <extension>dv</extension> <mime-type>video/x-dv</mime-type> </mime-mapping> <mime-mapping> <extension>dvi</extension> <mime-type>application/x-dvi</mime-type> </mime-mapping> <mime-mapping> <extension>eps</extension> <mime-type>application/postscript</mime-type> </mime-mapping> <mime-mapping> <extension>etx</extension> <mime-type>text/x-setext</mime-type> </mime-mapping> <mime-mapping> <extension>exe</extension> <mime-type>application/octet-stream</mime-type> </mime-mapping> <mime-mapping> <extension>gif</extension> <mime-type>image/gif</mime-type> </mime-mapping> <mime-mapping> <extension>gtar</extension> <mime-type>application/x-gtar</mime-type> </mime-mapping> <mime-mapping> <extension>gz</extension> <mime-type>application/x-gzip</mime-type> </mime-mapping> <mime-mapping> <extension>hdf</extension> <mime-type>application/x-hdf</mime-type> </mime-mapping> <mime-mapping> <extension>hqx</extension> <mime-type>application/mac-binhex40</mime-type> </mime-mapping> <mime-mapping> <extension>htc</extension> <mime-type>text/x-component</mime-type> </mime-mapping> <mime-mapping> <extension>htm</extension> <mime-type>text/html</mime-type> </mime-mapping> <mime-mapping> <extension>html</extension> <mime-type>text/html</mime-type> </mime-mapping> <mime-mapping> <extension>hqx</extension> <mime-type>application/mac-binhex40</mime-type> </mime-mapping> <mime-mapping> <extension>ief</extension> <mime-type>image/ief</mime-type> </mime-mapping> <mime-mapping> <extension>jad</extension> <mime-type>text/vnd.sun.j2me.app-descriptor</mime-type> </mime-mapping> <mime-mapping> <extension>jar</extension> <mime-type>application/java-archive</mime-type> </mime-mapping> <mime-mapping> <extension>java</extension> <mime-type>text/plain</mime-type> </mime-mapping> <mime-mapping> <extension>jnlp</extension> <mime-type>application/x-java-jnlp-file</mime-type> </mime-mapping> <mime-mapping> <extension>jpe</extension> <mime-type>image/jpeg</mime-type> </mime-mapping> <mime-mapping> <extension>jpeg</extension> <mime-type>image/jpeg</mime-type> </mime-mapping> <mime-mapping> <extension>jpg</extension> <mime-type>image/jpeg</mime-type> </mime-mapping> <mime-mapping> <extension>js</extension> <mime-type>text/javascript</mime-type> </mime-mapping> <mime-mapping> <extension>jsf</extension> <mime-type>text/plain</mime-type> </mime-mapping> <mime-mapping> <extension>jspf</extension> <mime-type>text/plain</mime-type> </mime-mapping> <mime-mapping> <extension>kar</extension> <mime-type>audio/x-midi</mime-type> </mime-mapping> <mime-mapping> <extension>latex</extension> <mime-type>application/x-latex</mime-type> </mime-mapping> <mime-mapping> <extension>m3u</extension> <mime-type>audio/x-mpegurl</mime-type> </mime-mapping> <mime-mapping> <extension>mac</extension> <mime-type>image/x-macpaint</mime-type> </mime-mapping> <mime-mapping> <extension>man</extension> <mime-type>application/x-troff-man</mime-type> </mime-mapping> <mime-mapping> <extension>me</extension> <mime-type>application/x-troff-me</mime-type> </mime-mapping> <mime-mapping> <extension>mid</extension> <mime-type>audio/x-midi</mime-type> </mime-mapping> <mime-mapping> <extension>midi</extension> <mime-type>audio/x-midi</mime-type> </mime-mapping> <mime-mapping> <extension>mif</extension> <mime-type>application/x-mif</mime-type> </mime-mapping> <mime-mapping> <extension>mov</extension> <mime-type>video/quicktime</mime-type> </mime-mapping> <mime-mapping> <extension>movie</extension> <mime-type>video/x-sgi-movie</mime-type> </mime-mapping> <mime-mapping> <extension>mp1</extension> <mime-type>audio/x-mpeg</mime-type> </mime-mapping> <mime-mapping> <extension>mp2</extension> <mime-type>audio/x-mpeg</mime-type> </mime-mapping> <mime-mapping> <extension>mp3</extension> <mime-type>audio/x-mpeg</mime-type> </mime-mapping> <mime-mapping> <extension>mpa</extension> <mime-type>audio/x-mpeg</mime-type> </mime-mapping> <mime-mapping> <extension>mpe</extension> <mime-type>video/mpeg</mime-type> </mime-mapping> <mime-mapping> <extension>mpeg</extension> <mime-type>video/mpeg</mime-type> </mime-mapping> <mime-mapping> <extension>mpega</extension> <mime-type>audio/x-mpeg</mime-type> </mime-mapping> <mime-mapping> <extension>mpg</extension> <mime-type>video/mpeg</mime-type> </mime-mapping> <mime-mapping> <extension>mpv2</extension> <mime-type>video/mpeg2</mime-type> </mime-mapping> <mime-mapping> <extension>ms</extension> <mime-type>application/x-wais-source</mime-type> </mime-mapping> <mime-mapping> <extension>nc</extension> <mime-type>application/x-netcdf</mime-type> </mime-mapping> <mime-mapping> <extension>oda</extension> <mime-type>application/oda</mime-type> </mime-mapping> <mime-mapping> <extension>pbm</extension> <mime-type>image/x-portable-bitmap</mime-type> </mime-mapping> <mime-mapping> <extension>pct</extension> <mime-type>image/pict</mime-type> </mime-mapping> <mime-mapping> <extension>pdf</extension> <mime-type>application/pdf</mime-type> </mime-mapping> <mime-mapping> <extension>pgm</extension> <mime-type>image/x-portable-graymap</mime-type> </mime-mapping> <mime-mapping> <extension>pic</extension> <mime-type>image/pict</mime-type> </mime-mapping> <mime-mapping> <extension>pict</extension> <mime-type>image/pict</mime-type> </mime-mapping> <mime-mapping> <extension>pls</extension> <mime-type>audio/x-scpls</mime-type> </mime-mapping> <mime-mapping> <extension>png</extension> <mime-type>image/png</mime-type> </mime-mapping> <mime-mapping> <extension>pnm</extension> <mime-type>image/x-portable-anymap</mime-type> </mime-mapping> <mime-mapping> <extension>pnt</extension> <mime-type>image/x-macpaint</mime-type> </mime-mapping> <mime-mapping> <extension>ppm</extension> <mime-type>image/x-portable-pixmap</mime-type> </mime-mapping> <mime-mapping> <extension>ps</extension> <mime-type>application/postscript</mime-type> </mime-mapping> <mime-mapping> <extension>psd</extension> <mime-type>image/x-photoshop</mime-type> </mime-mapping> <mime-mapping> <extension>qt</extension> <mime-type>video/quicktime</mime-type> </mime-mapping> <mime-mapping> <extension>qti</extension> <mime-type>image/x-quicktime</mime-type> </mime-mapping> <mime-mapping> <extension>qtif</extension> <mime-type>image/x-quicktime</mime-type> </mime-mapping> <mime-mapping> <extension>ras</extension> <mime-type>image/x-cmu-raster</mime-type> </mime-mapping> <mime-mapping> <extension>rgb</extension> <mime-type>image/x-rgb</mime-type> </mime-mapping> <mime-mapping> <extension>rm</extension> <mime-type>application/vnd.rn-realmedia</mime-type> </mime-mapping> <mime-mapping> <extension>roff</extension> <mime-type>application/x-troff</mime-type> </mime-mapping> <mime-mapping> <extension>rtf</extension> <mime-type>application/rtf</mime-type> </mime-mapping> <mime-mapping> <extension>rtx</extension> <mime-type>text/richtext</mime-type> </mime-mapping> <mime-mapping> <extension>sh</extension> <mime-type>application/x-sh</mime-type> </mime-mapping> <mime-mapping> <extension>shar</extension> <mime-type>application/x-shar</mime-type> </mime-mapping> <mime-mapping> <extension>smf</extension> <mime-type>audio/x-midi</mime-type> </mime-mapping> <mime-mapping> <extension>sit</extension> <mime-type>application/x-stuffit</mime-type> </mime-mapping> <mime-mapping> <extension>snd</extension> <mime-type>audio/basic</mime-type> </mime-mapping> <mime-mapping> <extension>src</extension> <mime-type>application/x-wais-source</mime-type> </mime-mapping> <mime-mapping> <extension>sv4cpio</extension> <mime-type>application/x-sv4cpio</mime-type> </mime-mapping> <mime-mapping> <extension>sv4crc</extension> <mime-type>application/x-sv4crc</mime-type> </mime-mapping> <mime-mapping> <extension>swf</extension> <mime-type>application/x-shockwave-flash</mime-type> </mime-mapping> <mime-mapping> <extension>t</extension> <mime-type>application/x-troff</mime-type> </mime-mapping> <mime-mapping> <extension>tar</extension> <mime-type>application/x-tar</mime-type> </mime-mapping> <mime-mapping> <extension>tcl</extension> <mime-type>application/x-tcl</mime-type> </mime-mapping> <mime-mapping> <extension>tex</extension> <mime-type>application/x-tex</mime-type> </mime-mapping> <mime-mapping> <extension>texi</extension> <mime-type>application/x-texinfo</mime-type> </mime-mapping> <mime-mapping> <extension>texinfo</extension> <mime-type>application/x-texinfo</mime-type> </mime-mapping> <mime-mapping> <extension>tif</extension> <mime-type>image/tiff</mime-type> </mime-mapping> <mime-mapping> <extension>tiff</extension> <mime-type>image/tiff</mime-type> </mime-mapping> <mime-mapping> <extension>tr</extension> <mime-type>application/x-troff</mime-type> </mime-mapping> <mime-mapping> <extension>tsv</extension> <mime-type>text/tab-separated-values</mime-type> </mime-mapping> <mime-mapping> <extension>txt</extension> <mime-type>text/plain</mime-type> </mime-mapping> <mime-mapping> <extension>ulw</extension> <mime-type>audio/basic</mime-type> </mime-mapping> <mime-mapping> <extension>ustar</extension> <mime-type>application/x-ustar</mime-type> </mime-mapping> <mime-mapping> <extension>xbm</extension> <mime-type>image/x-xbitmap</mime-type> </mime-mapping> <mime-mapping> <extension>xml</extension> <mime-type>text/xml</mime-type> </mime-mapping> <mime-mapping> <extension>xpm</extension> <mime-type>image/x-xpixmap</mime-type> </mime-mapping> <mime-mapping> <extension>xsl</extension> <mime-type>text/xml</mime-type> </mime-mapping> <mime-mapping> <extension>xwd</extension> <mime-type>image/x-xwindowdump</mime-type> </mime-mapping> <mime-mapping> <extension>wav</extension> <mime-type>audio/x-wav</mime-type> </mime-mapping> <mime-mapping> <extension>svg</extension> <mime-type>image/svg+xml</mime-type> </mime-mapping> <mime-mapping> <extension>svgz</extension> <mime-type>image/svg+xml</mime-type> </mime-mapping> <mime-mapping> <!-- Wireless Bitmap --> <extension>wbmp</extension> <mime-type>image/vnd.wap.wbmp</mime-type> </mime-mapping> <mime-mapping> <!-- WML Source --> <extension>wml</extension> <mime-type>text/vnd.wap.wml</mime-type> </mime-mapping> <mime-mapping> <!-- Compiled WML --> <extension>wmlc</extension> <mime-type>application/vnd.wap.wmlc</mime-type> </mime-mapping> <mime-mapping> <!-- WML Script Source --> <extension>wmls</extension> <mime-type>text/vnd.wap.wmlscript</mime-type> </mime-mapping> <mime-mapping> <!-- Compiled WML Script --> <extension>wmlscriptc</extension> <mime-type>application/vnd.wap.wmlscriptc</mime-type> </mime-mapping> <mime-mapping> <extension>wrl</extension> <mime-type>x-world/x-vrml</mime-type> </mime-mapping> <mime-mapping> <extension>Z</extension> <mime-type>application/x-compress</mime-type> </mime-mapping> <mime-mapping> <extension>z</extension> <mime-type>application/x-compress</mime-type> </mime-mapping> <mime-mapping> <extension>zip</extension> <mime-type>application/zip</mime-type> </mime-mapping> <!-- ==================== Default Welcome File List ===================== --> <!-- When a request URI refers to a directory, the default servlet looks --> <!-- for a "welcome file" within that directory and, if present, --> <!-- to the corresponding resource URI for display. If no welcome file --> <!-- is present, the default servlet either serves a directory listing, --> <!-- or returns a 404 status, depending on how it is configured. --> <!-- --> <!-- If you define welcome files in your own application's web.xml --> <!-- deployment descriptor, that list *replaces* the list configured --> <!-- here, so be sure that you include any of the default values that --> <!-- you wish to include. --> <welcome-file-list> <welcome-file>index.html</welcome-file> <welcome-file>index.htm</welcome-file> <welcome-file>index.html.en</welcome-file> <welcome-file>index.html.de</welcome-file> <welcome-file>index.jsp</welcome-file> </welcome-file-list> </web-app> --- NEW FILE: server.xml --- <Server port="@@@SERVERPORT@@@" shutdown="SHUTDOWN" debug="0"> <Service name="Catalina" debug="0"> <Connector className="org.apache.coyote.tomcat5.CoyoteConnector" port="@@@HTTPPORT@@@" minProcessors="5" maxProcessors="100" enableLookups="true" redirectPort="8443" acceptCount="100" debug="0" connectionTimeout="20000" disableUploadTimeout="true" /> <!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 --> <!-- <Connector className="org.apache.coyote.tomcat5.CoyoteConnector" port="@@@HTTPSPORT@@@" minProcessors="5" maxProcessors="75" enableLookups="true" disableUploadTimeout="true" acceptCount="100" debug="0" scheme="https" secure="true"> <Factory className="org.apache.coyote.tomcat5.CoyoteServerSocketFactory" clientAuth="false" protocol="SSL" keystoreFile="keystore" truststoreFile="truststore" /> </Connector> --> <!-- Define the top level container in our container hierarchy --> <Engine name="Catalina" defaultHost="localhost" debug="0"> <Logger className="org.apache.catalina.logger.FileLogger" directory="logs" prefix="catalina_log." suffix=".txt" timestamp="true"/> <Host name="localhost" debug="0" appBase="webapps" unpackWARs="true" autoDeploy="true"> <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" prefix="access_log." suffix=".txt" pattern="common" resolveHosts="false"/> <Logger className="org.apache.catalina.logger.FileLogger" directory="logs" prefix="localhost_log." suffix=".txt" timestamp="true"/> <!-- <Context path="" docBase="ROOT" debug="0"/> <Context path="/manager" docBase="manager" debug="0" privileged="true"> </Context> --> </Host> </Engine> </Service> </Server> --- NEW FILE: tomcat-users.xml --- <!-- NOTE: By default, no user is included in the "manager" role required to operate the "/manager" web application. If you wish to use this app, you must define such a user - the username and password are arbitrary. --> <tomcat-users> <user name="tomcat" password="tomcat" roles="tomcat" /> <user name="role1" password="tomcat" roles="role1" /> <user name="both" password="tomcat" roles="tomcat,role1" /> </tomcat-users> --- NEW FILE: catalina.properties --- # # List of comma-separated packages that start with or equal this string # will cause a security exception to be thrown when # passed to checkPackageAccess unless the # corresponding RuntimePermission ("accessClassInPackage."+package) has # been granted. package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.,sun.beans. # # List of comma-separated packages that start with or equal this string # will cause a security exception to be thrown when # passed to checkPackageDefinition unless the # corresponding RuntimePermission ("defineClassInPackage."+package) has # been granted. # # by default, no packages are restricted for definition, and none of # the class loaders supplied with the JDK call checkPackageDefinition. # package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper. # # # List of comma-separated paths defining the contents of the "common" # classloader. Prefixes should be used to define what is the repository type. # Path may be relative to the CATALINA_HOME path or absolute. If left as blank, # the JVM system loader will be used as Catalina's "common" loader. # Examples: # "foo": Add this folder as a class repository # "foo/*.jar": Add all the JARs of the specified folder as class # repositories # "foo/bar.jar": Add bar.jar as a class repository common.loader=${catalina.home}/common/classes,${catalina.home}/common/endorsed/*.jar,${catalina.home}/common/lib/*.jar # # List of comma-separated paths defining the contents of the "server" # classloader. Prefixes should be used to define what is the repository type. # Path may be relative to the CATALINA_HOME path or absolute. If left as blank, # the "common" loader will be used as Catalina's "server" loader. # Examples: # "foo": Add this folder as a class repository # "foo/*.jar": Add all the JARs of the specified folder as class # repositories # "foo/bar.jar": Add bar.jar as a class repository server.loader=${catalina.home}/server/classes,${catalina.home}/server/lib/*.jar # # List of comma-separated paths defining the contents of the "shared" # classloader. Prefixes should be used to define what is the repository type. # Path may be relative to the CATALINA_BASE path or absolute. If left as blank, # the "common" loader will be used as Catalina's "shared" loader. # Examples: # "foo": Add this folder as a class repository # "foo/*.jar": Add all the JARs of the specified folder as class # repositories # "foo/bar.jar": Add bar.jar as a class repository shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:14:41
|
Update of /cvsroot/cobricks/drehscheibe-in/web/course In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10733/web/course Modified Files: cdelete.html.de clsearch.html.de cmcreateres.txt cmdelete.html.de crcreate.html.de crsearch.html.de csearch.html.de cupdate.html.de index.html.de Log Message: Index: cmdelete.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cmdelete.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cmdelete.html.de 29 May 2006 07:13:31 -0000 1.1 +++ cmdelete.html.de 30 May 2006 14:14:31 -0000 1.2 @@ -54,6 +54,9 @@ #end <p> +Bitte bestätigen Sie das Löschen. + +<p> <form action="/COURSE" method="post"> <input type="hidden" name="cmd" value="deletecoursemodule" /> <input type="hidden" name="cmd.success" value="/course/index.html" /> Index: csearch.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/csearch.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- csearch.html.de 29 May 2006 07:13:31 -0000 1.1 +++ csearch.html.de 30 May 2006 14:14:31 -0000 1.2 @@ -45,10 +45,10 @@ $courseModule.getType() </td> <td align="center"> -<a href="/COURSE?cmd=addcoursett&cid=$c.getId()&uid=$auserid&cmd.success=/course/timetable.html&cmd.error=/course/timetable.html">add to timetable</a> +<a href="/COURSE?cmd=addcoursett&cid=$c.getId()&uid=$auserid&cmd.success=/course/timetable.html&cmd.error=/course/timetable.html">zum Stundenplan</a> #if ( "$!acc" == "true" ) | <a href="cupdate.html?cid=$c.getId()">edit</a> | -<a href="cdelete.html?cid=$c.getId()">delete</a> +<a href="cdelete.html?cid=$c.getId()">löschen</a> #end </td> </tr> @@ -176,7 +176,7 @@ <option value="">alle</option> #foreach( $i in ["pf","wp","wa","ko","vt","er","gr","ke"] ) #set ($sel = "") - #if ( $i == $!coursetype ) + #if ( "$!i" == "$!coursetype" ) #set ($sel = 'selected="1"') #end <option value="$i" $!sel>$i </option> Index: cmcreateres.txt =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cmcreateres.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cmcreateres.txt 29 May 2006 07:13:31 -0000 1.1 +++ cmcreateres.txt 30 May 2006 14:14:31 -0000 1.2 @@ -13,10 +13,10 @@ #else beantragt: #end -- $!cmsid -- $!cmname -- $!cmtype -- $!courseManager.getLecturer($cm.getResponsible()).getName2() +- Id: $!cmsid +- Name: $!cmname +- Typ: $!cmtype +- Modulverantwortlicher: $!courseManager.getLecturer($cm.getResponsible()).getName2() $!portal_baseurl/course/cm.html?id=$!cmsid Index: crsearch.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/crsearch.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- crsearch.html.de 29 May 2006 07:13:31 -0000 1.1 +++ crsearch.html.de 30 May 2006 14:14:31 -0000 1.2 @@ -28,7 +28,7 @@ <tr class="resulttitle"> <td>Name</td> <td>Information</td> -<td>Contact</td> +<td>Kontakt</td> <td> </td> </tr> #foreach ( $c in $results ) @@ -54,7 +54,7 @@ <table border="0"> <form action="crsearch.html" method="post"> <tr> - <td>Name</td> + <td>Name (Substring)</td> <td><input name="crname" size="20" value="$!{crname}"></td> </tr> Index: cdelete.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cdelete.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cdelete.html.de 29 May 2006 07:13:31 -0000 1.1 +++ cdelete.html.de 30 May 2006 14:14:31 -0000 1.2 @@ -1,28 +1,32 @@ $portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) -<h1>Veranstaltung löschen</h1> +<h1>Veranstaltung löschen</h1> #set ( $auserid = $userManager.getUserIdForUserLogin($userLogin) ) #if ( $auserid == 0 ) $portalPresenter.parse("$!contextPath/pagelogin.html.de",$portalRequest) +#else #set ( $auser = $userManager.getUser($auserid)) #set ( $tmps = $userPresenter.checkRole("$auserid", "admin-course") ) #if ( "$!tmps" != "true" ) <p><div class="error">Ihr aktueller Login hat nicht ausreichend Rechte um Veranstaltungen zu editieren. Wenn Sie die entsprechenden Rechte -benötigen, dann wenden Sie sich bitte an die Administratoren der +benötigen, dann wenden Sie sich bitte an die Administratoren der Plattform.</div></p> #else #if ( $returnCode > 1999 ) -<font color="red">Fehler beim Löschen einer Veranstaltung.</font><p> +<font color="red">Fehler beim Löschen einer Veranstaltung.</font><p> #end -<p>Bitte bestätigen Sie, dass die Veranstaltung mit der Id $!cid -wirklich gelöscht werden soll.</p> +#set ($cid = "$!cid") +#set( $course = $coursePresenter.getCourse($cid) ) + +<p>Bitte bestätigen Sie, dass die Veranstaltung "$course.getName()" im +Semester $course.getTerm() wirklich gelöscht werden soll.</p> <form action="/COURSE" method="post"> <input type="hidden" name="cmd" value="deletecourse" /> @@ -33,8 +37,7 @@ <input type="hidden" name="cid" value="$cid" /> -<input type="button" class="submit" value="Back" onClick="javascript:history.go(-1)"/> -<input type="submit" class="submit" value="Veranstaltung löschen"/> +<input type="submit" class="submit" value="Veranstaltung löschen"/> </form> #end Index: crcreate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/crcreate.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- crcreate.html.de 29 May 2006 07:13:31 -0000 1.1 +++ crcreate.html.de 30 May 2006 14:14:31 -0000 1.2 @@ -31,7 +31,8 @@ <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <tr> <td>Name</td> - <td><input name="crname" size="50" value=""></td> + <td><input name="crname" size="50" value=""><br> +z.B. MI HS 1, MI 00.08.038, MW 00011<</td> </tr> <tr> <td>Information</td> @@ -49,8 +50,8 @@ <td>Sichtbarkeit</td> <td> <select name="crhidden"> - <option value="0" selected="1">nicht sichtbar</option> - <option value="1">sichtbar</option> + <option value="0">nicht sichtbar</option> + <option value="1" selected="1">sichtbar</option> </select> </td> </tr> Index: index.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/index.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.html.de 29 May 2006 07:13:31 -0000 1.1 +++ index.html.de 30 May 2006 14:14:31 -0000 1.2 @@ -87,7 +87,7 @@ #else #set ( $tmps = $userPresenter.checkRole("$auserid", "admin-course") ) #if ( "$!tmps" == "true" ) -- Editieren von Veranstaltungen und eingeschränktes Editieren von Modulen +- Editieren von Veranstaltungen #end #end </div></p> Index: clsearch.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/clsearch.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- clsearch.html.de 29 May 2006 07:13:31 -0000 1.1 +++ clsearch.html.de 30 May 2006 14:14:31 -0000 1.2 @@ -11,7 +11,11 @@ #set ( $acc = $userPresenter.checkRole("$auserid", "admin-course") ) #end -#set ($query = "lfirstname=$!{lfirstname}&llastname=$!{llastname}<yp=$!{ltyp}&lgroup=$!{lgroup}") +#set ($tmps = "$!lfirstname$!llastname$!ltyp") +#set ($query = "lfirstname=$!{lfirstname}&llastname=$!{llastname}<yp=$!{ltyp}") +#if ("$!tmps" == "") +#set ($query = "ltyp=p") +#end <h1>Dozentensuche</h1> @@ -28,14 +32,13 @@ Die Suche hat $rcount Ergebnisse geliefert:<p> <table id="result" width="90%" align="center"> <tr class="resulttitle"> -<td>ID</td> <td>Nachname</td> +<td>Vorname</td> <td>Typ</td> <td> </td> </tr> #foreach ( $c in $results ) <tr> -<td>$!c.getId()</td> <td>$!c.getLastName()</td> <td>$!c.getFirstName()</td> <td>$!c.getType() @@ -43,7 +46,7 @@ <td> #if ( "$!acc" == "true" ) <a href="clupdate.html?lid=$!c.getId()">edit</a> | -<a href="cldelete.html?lid=$!c.getId()">delete</a> +<a href="cldelete.html?lid=$!c.getId()">löschen</a> #end </td> </tr> Index: cupdate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cupdate.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cupdate.html.de 29 May 2006 07:13:31 -0000 1.1 +++ cupdate.html.de 30 May 2006 14:14:31 -0000 1.2 @@ -18,7 +18,7 @@ #else -#set ($cid = $!cid) +#set ($cid = "$!cid") #set( $course = $coursePresenter.getCourse($cid) ) #set( $courseModule = $course.getCourseModule() ) |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:14:38
|
Update of /cvsroot/cobricks/drehscheibe-in/conf In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10733/conf Modified Files: userontology.xml Added Files: redirects.txt Log Message: --- NEW FILE: redirects.txt --- /home.html=/index.html /ects/modules/*=/course/cm.html?id=* /module/*=/course/cm.html?id=* Index: userontology.xml =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/conf/userontology.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- userontology.xml 8 Oct 2004 12:09:49 -0000 1.7 +++ userontology.xml 30 May 2006 14:14:29 -0000 1.8 @@ -1,94 +1,33 @@ <userontology> -<class name="user" javaclassname="org.cobricks.user.User"> +<class name="universityuser" parent="user"> - <attr name="basic.personal.firstname" type="string(30)"> - <description lang="de">Vorname</description> - <description lang="en">Firstname</description> + <attr name="basic.university.status" type="string(10)"> + <description lang="de">Universitaet Status</description> + <description lang="en">University Status</description> + <value>---</value> + <value>Student</value> + <value>Alumni</value> + <value>Mitarbeiter</value> + <value>Professor</value> + <value>Dozent</value> + <value>Gast</value> + <value>Extern</value> </attr> - <attr name="basic.personal.lastname" type="string(30)"> - <description lang="de">Nachname</description> - <description lang="en">Lastname</description> + <attr name="basic.university.graduation" type="int"> + <description lang="de">Abschlussjahr</description> + <description lang="en">Graduation</description> </attr> - <attr name="basic.contact-priv.online.email" type="string(50)"> - <description lang="de">E-Mail (privat)</description> - <description lang="en">E-Mail (private)</description> + <attr name="basic.university.subject" type="string(30)"> + <description lang="de">Studiengang</description> + <description lang="en">Major subject</description> </attr> - <attr name="basic.personal.imageuri" type="string(100)"> - <description lang="de">Image URI</description> - <description lang="en">Image URI</description> - </attr> - <attr name="basic.university.status" type="string(30)"/> - <attr name="basic.university.faculties" type="string(15)"/> - <attr name="basic.university.graduation" type="string(15)"/> - <attr name="basic.contact-priv.postal.street" type="string(50)"/> - <attr name="basic.contact-priv.postal.postalcode" type="string(20)"/> - <attr name="basic.contact-priv.postal.city" type="string(30)"/> - <attr name="basic.contact-priv.postal.country" type="string(30)"/> - <attr name="basic.contact-priv.telecom.telephone" type="string(25)"/> - <attr name="basic.contact-priv.telecom.mobile" type="string(25)"/> - <attr name="basic.contact-priv.postal.comment" type="string(50)"/> - <attr name="basic.business.jobtitle" type="string(30)"/> - <attr name="basic.business.companyname" type="string(50)"/> - <attr name="basic.contact-work.telecom.telephone" type="string(25)"/> - <attr name="basic.business.comment" type="string(100)"/> - <attr name="basic.contact-work.telecom.mobile" type="string(25)"/> - <attr name="basic.personal.online.imageuri" type="string(100)"/> - <attr name="mm.privat.online.emailbounced" type="string(10)" /> - <attr name="mm.privat.online.email" type="string(10)" /> - <attr name="mm.privat.telecom.mobile" type="string(10)" /> - <attr name="mm.privat.online.uri" type="string(10)" /> - - <attr name="mm.contact-priv.postal.street" type="string(10)" /> - <attr name="mm.contact-priv.postal.postalcode" type="string(10)" /> - <attr name="mm.contact-priv.postal.city" type="string(10)" /> - <attr name="mm.contact-priv.postal.country" type="string(10)" /> - <attr name="mm.contact-priv.telecom.telephone" type="string(10)" /> - <attr name="mm.contact-priv.telecom.mobile" type="string(10)" /> - <attr name="mm.contact-priv.postal.comment" type="string(10)" /> - <attr name="mm.business.jobtitle" type="string(10)" /> - <attr name="mm.contact-work.telecom.telephone" type="string(10)" /> - <attr name="mm.business.comment" type="string(10)" /> - <attr name="mm.business.companyname" type="string(10)" /> - - <attr name="basic.personal.card" type="string(10000)" /> - - - - <attr name="pim.network.buddylist" type="user[]"> - <description lang="de">Benutzer Buddylist</description> - <description lang="en">User Buddylist</description> - <contextclass>ContextUserUser</contextclass> - </attr> - - <attr name="pim.network.banlist" type="user[]"> - <contextclass>ContextUserUser</contextclass> - </attr> - - <attr name="interests.categories" type="category[]"> - <description lang="de">Interessen</description> - <description lang="en">Interests</description> - <contextclass>ContextUserCategory</contextclass> - </attr> - <attr name="interests.categories.mail" type="category[]"> - <description lang="de">Interessen</description> - <description lang="en">Interests</description> - <contextclass>ContextUserCategory</contextclass> + <attr name="basic.personal.card" type="string(10000)"> + <description lang="de">Visitenkarte</description> + <description lang="en">Business card</description> </attr> - - - - <attr name="basic.credentials.password.crypt" type="string(30)"/> - - <attr name="history.org.cobricks.lastlogin" type="date"/> - <attr name="history.org.cobricks.regtime" type="date"/> - - <attr name="app.org.cobricks.emailprefix" type="string(15)"/> - - - </class> </userontology> |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:14:38
|
Update of /cvsroot/cobricks/drehscheibe-in/web/WEB-INF/lib In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10733/web/WEB-INF/lib Added Files: commons-collections-3.2.jar commons-dbcp-1.2.1.jar commons-pool-1.3.jar Log Message: --- NEW FILE: commons-collections-3.2.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: commons-pool-1.3.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: commons-dbcp-1.2.1.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:14:37
|
Update of /cvsroot/cobricks/drehscheibe-in In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10733 Modified Files: .cvsignore build.xml Log Message: Index: .cvsignore =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 3 Aug 2004 08:31:49 -0000 1.1 +++ .cvsignore 30 May 2006 14:14:29 -0000 1.2 @@ -1,3 +1,5 @@ build build.properties .cvsignore +web.full +Modul* Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- build.xml 26 Oct 2004 10:37:20 -0000 1.3 +++ build.xml 30 May 2006 14:14:29 -0000 1.4 @@ -5,7 +5,7 @@ installations, but add your property changes to build.properties --> -<project name="cobricks-2-app" default="compile" basedir="."> +<project name="drehscheibe" default="compile" basedir="."> <!-- ==================== Property Definitions ========================== --> @@ -13,21 +13,21 @@ <property file="build.properties"/> <property file="${user.home}/build.properties"/> -<property name="app.name" value="cobricks-app"/> +<property name="app.name" value="drehscheibe"/> <property name="app.path" value=""/> <property name="app.version" value="0.9"/> <property name="build.home" value="${basedir}/build"/> -<property name="java.home" value="/usr/proj/java/jdk1.4.2"/> -<property name="catalina.home" value="/usr/proj/java/tomcat5.0.3"/> -<property name="axis.home" value="/usr/proj/java/axis-1.1"/> -<property name="xindice.home" value="/usr/proj/java/xindice-1.1"/> +<property name="java.home.dir" value=""/> +<property name="catalina.home" value=""/> +<property name="catalina.version" value="5.5"/> +<property name="axis.home" value=""/> <property name="dist.home" value="${basedir}/dist"/> +<property name="docs.home" value="${basedir}/docs"/> <property name="src.home" value="${basedir}/src"/> <property name="conf.home" value="${basedir}/conf"/> <property name="web.home" value="${basedir}/web"/> <property name="weblib.home" value="${basedir}/web/WEB-INF/lib"/> - -<property name="cobricks.home" value="${basedir}/../cobricks2"/> +<property name="webappname" value="ROOT"/> <property name="catalina.serverport" value="4005"/> <property name="catalina.httpport" value="4080"/> @@ -45,6 +45,11 @@ <path id="compile.classpath"> + <!-- Include all JAR files that will be included in /WEB-INF/lib --> + <fileset dir="${weblib.home}"> + <include name="*.jar"/> + </fileset> + <!-- Include all elements that Tomcat exposes to applications --> <pathelement location="${catalina.home}/common/classes"/> <fileset dir="${catalina.home}/common/endorsed"> @@ -53,32 +58,25 @@ <fileset dir="${catalina.home}/common/lib"> <include name="*.jar"/> </fileset> + <fileset dir="${catalina.home}/server/lib"> + <include name="servlets-webdav.jar"/> + <include name="servlets-default.jar"/> + </fileset> <pathelement location="${catalina.home}/shared/classes"/> <fileset dir="${catalina.home}/shared/lib"> <include name="*.jar"/> </fileset> - <!-- Include Xindice libraries --> - <fileset dir="${xindice.home}/lib"> - <include name="xml*.jar"/> - <exclude name="xmldb-api-sdk*.jar"/> - </fileset> - <!-- Include Axis libraries --> <fileset dir="${axis.home}/webapps/axis/WEB-INF/lib"> <include name="*.jar"/> <exclude name="commons-logging.jar"/> </fileset> - <!-- Include all JAR files that will be included in /WEB-INF/lib --> - <fileset dir="${weblib.home}"> - <include name="*.jar"/> - </fileset> - </path> <path id="exec.classpath"> - <pathelement location="${build.home}/webapps/ROOT/WEB-INF/classes" /> + <pathelement location="${build.home}/webapps/${webappname}/WEB-INF/classes" /> <path refid="compile.classpath"/> </path> @@ -103,11 +101,10 @@ <target name="compile" depends="prepare,compile.cobrickshome" description="Compile Java sources"> - <mkdir dir="${build.home}/webapps/ROOT/WEB-INF/classes"/> - <!-- Compile Java classes as necessary --> + <mkdir dir="${build.home}/webapps/${webappname}/WEB-INF/classes"/> <javac srcdir="${src.home}" - destdir="${build.home}/webapps/ROOT/WEB-INF/classes" + destdir="${build.home}/webapps/${webappname}/WEB-INF/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}"> @@ -116,7 +113,7 @@ </javac> <!-- Copy application resources --> - <copy todir="${build.home}/webapps/ROOT/WEB-INF/classes"> + <copy todir="${build.home}/webapps/${webappname}/WEB-INF/classes"> <fileset dir="${src.home}" excludes="**/*.java"/> </copy> @@ -216,7 +213,7 @@ <!-- copy tomcat configuration --> <copy todir="${build.home}/conf"> - <fileset dir="${basedir}/tomcat/conf"/> + <fileset dir="${basedir}/tomcat/${catalina.version}/conf"/> </copy> <!-- adapt server.xml (port numbers) --> <replace file="${build.home}/conf/server.xml" token="@@@SERVERPORT@@@" @@ -227,12 +224,12 @@ value="${catalina.httpsport}" /> <!-- Copy static content of this web application --> - <copy todir="${build.home}/webapps/ROOT"> + <copy todir="${build.home}/webapps/${webappname}"> <fileset dir="${web.home}"/> </copy> <!-- copy Cobricks configuration --> - <copy todir="${build.home}/webapps/ROOT/WEB-INF/conf"> + <copy todir="${build.home}/webapps/${webappname}/WEB-INF/conf"> <fileset dir="${conf.home}"/> </copy> @@ -241,9 +238,9 @@ <copy file="conf/log.properties.orig" tofile="conf/log.properties" overwrite="false"/> - <!-- copy manager web application --> - <copy todir="${build.home}/webapps/manager"> - <fileset dir="${basedir}/tomcat/webapps/manager"/> + <!-- copy manager web application and other web apps --> + <copy todir="${build.home}/webapps"> + <fileset dir="${basedir}/tomcat/${catalina.version}/webapps" excludes="**/CVS"/> </copy> <copy todir="${build.home}/webapps/ROOT/WEB-INF/lib"> @@ -253,22 +250,6 @@ </fileset> </copy> - <copy todir="${build.home}/webapps/ROOT/WEB-INF/lib"> - <fileset dir="${xindice.home}/lib"> - <include name="xml*.jar" if="xindice.home"/> - <exclude name="xmldb-api-sdk*"/> - </fileset> - </copy> - - <!-- copy other web applications to webapps directory --> - <antcall target="copyjetspeed"/> - -</target> - -<target name="copyjetspeed" if="jetspeed.home"> - <copy todir="${build.home}/webapps/jetspeed"> - <fileset dir="${jetspeed.home}"/> - </copy> </target> @@ -374,6 +355,13 @@ </java> </target> +<target name="moduleimport" depends="compile"> + <java fork="yes" classname="de.tum.cobricks.course.importModules" + classpathref="exec.classpath"> + <arg line="build/webapps/ROOT/WEB-INF/conf Module_060510.xml"/> + </java> +</target> + </project> |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:14:36
|
Update of /cvsroot/cobricks/drehscheibe-in/web In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10733/web Modified Files: index.html.de logout.html.de Added Files: pagelogin.html.de Log Message: --- NEW FILE: pagelogin.html.de --- <p><div class="error">Sie müssen sich zuerst als berechtigter Benutzer anmelden wenn Sie diese Funktionalität nutzen wollen.</div></p> <p><ul> <li><a href="/user/login.html">Benutzer anmelden (Login)</a> <li><a href="/user/register.html">Neuen Benutzer registrieren</a> </ul></p> <p>Wenn Sie sich schon angemeldet haben und immer noch diese Meldung bekommen, dann prüfen Sie bitte ob Ihre Web-Browser Cookies akzeptiert.</p> Index: logout.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/logout.html.de,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- logout.html.de 29 May 2006 07:37:16 -0000 1.4 +++ logout.html.de 30 May 2006 14:14:30 -0000 1.5 @@ -1,6 +1,8 @@ $portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +<h1>Logout</h1> + <P>Die Login-Information im Browser sollte jetzt gelöscht sein.</P> <P>Bitte wechseln Sie jetzt zu einer beliebigen Seite oder <A Index: index.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/index.html.de,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- index.html.de 29 May 2006 07:37:16 -0000 1.14 +++ index.html.de 30 May 2006 14:14:30 -0000 1.15 @@ -15,10 +15,10 @@ <h1 class=title>Willkommen an der Fakultät für Informatik!</h1> <hr noshade="true" size="1"> -<P>Diese Test-Plattform unterstützt momentan nur die +<P>Diese Test-Plattform unterstützt momentan nur die Benutzerverwaltung und das Course Management (Verwaltung von Lehrveranstaltungen und Modulen). Bei allen Daten handelt es sich nur -um Testdaten, die bei der Migration der Live-Plattform wieder gelöscht +um Testdaten, die bei der Migration der Live-Plattform wieder gelöscht werden.</p> <ul> |
|
From: Michael K. <ko...@us...> - 2006-05-30 14:07:48
|
Update of /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/course In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv7505/course Log Message: Directory /cvsroot/cobricks/drehscheibe-in/src/de/tum/cobricks/course added to the repository |
