Modified: incubator/openmeetings/trunk/singlewebapp/docs/UserService.html URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/UserService.html?rev=1419868&r1=1419867&r2=1419868&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/docs/UserService.html (original) +++ incubator/openmeetings/trunk/singlewebapp/docs/UserService.html Mon Dec 10 23:27:02 2012 @@ -265,7 +265,7 @@ limitations under the License. </table> <br/> REST Sample Call/URL:<br/> - <a href="http://localhost:5080/openmeetings/services/UserService/loginUser?SID=VALUE&username=VALUE&userpass=VALUE";>http://localhost:5080/openmeetings/services/UserService/loginUser?&&</a> + <a href="http://localhost:5080/openmeetings/services/UserService/loginUser?SID=VALUE&username=VALUE&userpass=VALUE";>http://localhost:5080/openmeetings/services/UserService/loginUser?SID=VALUE&username=VALUE&userpass=VALUE</a> </div> <div class="method"> <div class="method_header"> @@ -330,7 +330,7 @@ limitations under the License. </table> <br/> REST Sample Call/URL:<br/> - <a href="http://localhost:5080/openmeetings/services/UserService/getErrorByCode?SID=VALUE&errorid=VALUE&language_id=VALUE";>http://localhost:5080/openmeetings/services/UserService/getErrorByCode?&&</a> + <a href="http://localhost:5080/openmeetings/services/UserService/getErrorByCode?SID=VALUE&errorid=VALUE&language_id=VALUE";>http://localhost:5080/openmeetings/services/UserService/getErrorByCode?SID=VALUE&errorid=VALUE&language_id=VALUE</a> </div> <div class="method"> <div class="method_header"> @@ -505,7 +505,7 @@ limitations under the License. </table> <br/> REST Sample Call/URL:<br/> - <a href="http://localhost:5080/openmeetings/services/UserService/addNewUser?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&states_id=VALUE&town=VALUE&language_id=VALUE&baseURL=VALUE";>http://localhost:5080/openmeetings/services/UserService/addNewUser?&&&&&&&&&&&&&</a> + <a href="http://localhost:5080/openmeetings/services/UserService/addNewUser?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&states_id=VALUE&town=VALUE&language_id=VALUE&baseURL=VALUE";>http://localhost:5080/openmeetings/services/UserService/addNewUser?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&states_id=VALUE&town=VALUE&language_id=VALUE&baseURL=VALUE</a> </div> <div class="method"> <div class="method_header"> @@ -690,7 +690,7 @@ limitations under the License. </table> <br/> REST Sample Call/URL:<br/> - <a href="http://localhost:5080/openmeetings/services/UserService/addNewUserWithTimeZone?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&states_id=VALUE&town=VALUE&language_id=VALUE&baseURL=VALUE&jNameTimeZone=VALUE";>http://localhost:5080/openmeetings/services/UserService/addNewUserWithTimeZone?&&&&&&&&&&&&&&</a> + <a href="http://localhost:5080/openmeetings/services/UserService/addNewUserWithTimeZone?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&states_id=VALUE&town=VALUE&language_id=VALUE&baseURL=VALUE&jNameTimeZone=VALUE";>http://localhost:5080/openmeetings/services/UserService/addNewUserWithTimeZone?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&states_id=VALUE&town=VALUE&language_id=VALUE&baseURL=VALUE&jNameTimeZone=VALUE</a> </div> <div class="method"> <div class="method_header"> @@ -887,7 +887,7 @@ limitations under the License. </table> <br/> REST Sample Call/URL:<br/> - <a href="http://localhost:5080/openmeetings/services/UserService/addNewUserWithExternalType?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&states_id=VALUE&town=VALUE&language_id=VALUE&jNameTimeZone=VALUE&externalUserId=VALUE&externalUserType=VALUE";>http://localhost:5080/openmeetings/services/UserService/addNewUserWithExternalType?&&&&&&&&&&&&&&&</a> + <a href="http://localhost:5080/openmeetings/services/UserService/addNewUserWithExternalType?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&states_id=VALUE&town=VALUE&language_id=VALUE&jNameTimeZone=VALUE&externalUserId=VALUE&externalUserType=VALUE";>http://localhost:5080/openmeetings/services/UserService/addNewUserWithExternalType?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&states_id=VALUE&town=VALUE&language_id=VALUE &jNameTimeZone=VALUE&externalUserId=VALUE&externalUserType=VALUE</a> </div> <div class="method"> <div class="method_header"> @@ -939,7 +939,7 @@ limitations under the License. </table> <br/> REST Sample Call/URL:<br/> - <a href="http://localhost:5080/openmeetings/services/UserService/deleteUserById?SID=VALUE&userId=VALUE";>http://localhost:5080/openmeetings/services/UserService/deleteUserById?&</a> + <a href="http://localhost:5080/openmeetings/services/UserService/deleteUserById?SID=VALUE&userId=VALUE";>http://localhost:5080/openmeetings/services/UserService/deleteUserById?SID=VALUE&userId=VALUE</a> </div> <div class="method"> <div class="method_header"> @@ -1001,7 +1001,7 @@ limitations under the License. </table> <br/> REST Sample Call/URL:<br/> - <a href="http://localhost:5080/openmeetings/services/UserService/deleteUserByExternalUserIdAndType?SID=VALUE&externalUserId=VALUE&externalUserType=VALUE";>http://localhost:5080/openmeetings/services/UserService/deleteUserByExternalUserIdAndType?&&</a> + <a href="http://localhost:5080/openmeetings/services/UserService/deleteUserByExternalUserIdAndType?SID=VALUE&externalUserId=VALUE&externalUserType=VALUE";>http://localhost:5080/openmeetings/services/UserService/deleteUserByExternalUserIdAndType?SID=VALUE&externalUserId=VALUE&externalUserType=VALUE</a> </div> <div class="method"> <div class="method_header"> @@ -1096,7 +1096,7 @@ limitations under the License. </table> <br/> REST Sample Call/URL:<br/> - <a href="http://localhost:5080/openmeetings/services/UserService/setUserObject?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE";>http://localhost:5080/openmeetings/services/UserService/setUserObject?&&&&&</a> + <a href="http://localhost:5080/openmeetings/services/UserService/setUserObject?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE";>http://localhost:5080/openmeetings/services/UserService/setUserObject?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE</a> </div> <div class="method"> <div class="method_header"> @@ -1211,7 +1211,7 @@ limitations under the License. </table> <br/> REST Sample Call/URL:<br/> - <a href="http://localhost:5080/openmeetings/services/UserService/setUserObjectWithExternalUser?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE";>http://localhost:5080/openmeetings/services/UserService/setUserObjectWithExternalUser?&&&&&&&</a> + <a href="http://localhost:5080/openmeetings/services/UserService/setUserObjectWithExternalUser?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE";>http://localhost:5080/openmeetings/services/UserService/setUserObjectWithExternalUser?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE</a> </div> <div class="method"> <div class="method_header"> @@ -1356,7 +1356,7 @@ limitations under the License. </table> <br/> REST Sample Call/URL:<br/> - <a href="http://localhost:5080/openmeetings/services/UserService/setUserObjectAndGenerateRoomHash?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE&room_id=VALUE&becomeModeratorAsInt=VALUE&showAudioVideoTestAsInt=VALUE";>http://localhost:5080/openmeetings/services/UserService/setUserObjectAndGenerateRoomHash?&&&&&&&&&&</a> + <a href="http://localhost:5080/openmeetings/services/UserService/setUserObjectAndGenerateRoomHash?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE&room_id=VALUE&becomeModeratorAsInt=VALUE&showAudioVideoTestAsInt=VALUE";>http://localhost:5080/openmeetings/services/UserService/setUserObjectAndGenerateRoomHash?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE&room_id=VALUE&becomeModeratorAsInt=VALUE&showAudioVideoTestAsInt=VALUE</a> </div> <div class="method"> <div class="method_header"> @@ -1505,7 +1505,7 @@ limitations under the License. </table> <br/> REST Sample Call/URL:<br/> - <a href="http://localhost:5080/openmeetings/services/UserService/setUserObjectAndGenerateRoomHashByURL?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE&room_id=VALUE&becomeModeratorAsInt=VALUE&showAudioVideoTestAsInt=VALUE";>http://localhost:5080/openmeetings/services/UserService/setUserObjectAndGenerateRoomHashByURL?&&&&&&&&&&</a> + <a href="http://localhost:5080/openmeetings/services/UserService/setUserObjectAndGenerateRoomHashByURL?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE&room_id=VALUE&becomeModeratorAsInt=VALUE&showAudioVideoTestAsInt=VALUE";>http://localhost:5080/openmeetings/services/UserService/setUserObjectAndGenerateRoomHashByURL?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE&room_id=VALUE&becomeModeratorAsInt=VALUE&showAudioVideoTestAsInt=VALUE</a> </div> <div class="method"> <div class="method_header"> @@ -1666,7 +1666,7 @@ limitations under the License. </table> <br/> REST Sample Call/URL:<br/> - <a href="http://localhost:5080/openmeetings/services/UserService/setUserObjectAndGenerateRoomHashByURLAndRecFlag?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE&room_id=VALUE&becomeModeratorAsInt=VALUE&showAudioVideoTestAsInt=VALUE&allowRecording=VALUE";>http://localhost:5080/openmeetings/services/UserService/setUserObjectAndGenerateRoomHashByURLAndRecFlag?&&&&&&&&&&&</a> + <a href="http://localhost:5080/openmeetings/services/UserService/setUserObjectAndGenerateRoomHashByURLAndRecFlag?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE&room_id=VALUE&becomeModeratorAsInt=VALUE&showAudioVideoTestAsInt=VALUE&allowRecording=VALUE";>http://localhost:5080/openmeetings/services/UserService/setUserObjectAndGenerateRoomHashByURLAndRecFlag?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE&room_id=VALUE&becomeModeratorAsInt=VALUE&showAudioVideoTestAsInt=VALUE&allowRecording=VALUE</a> </div> <div class="method"> <div class="method_header"> @@ -1784,7 +1784,7 @@ limitations under the License. </table> <br/> REST Sample Call/URL:<br/> - <a href="http://localhost:5080/openmeetings/services/UserService/setUserObjectMainLandingZone?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE";>http://localhost:5080/openmeetings/services/UserService/setUserObjectMainLandingZone?&&&&&&&</a> + <a href="http://localhost:5080/openmeetings/services/UserService/setUserObjectMainLandingZone?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE";>http://localhost:5080/openmeetings/services/UserService/setUserObjectMainLandingZone?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE</a> </div> <div class="method"> <div class="method_header"> @@ -1949,7 +1949,7 @@ limitations under the License. </table> <br/> REST Sample Call/URL:<br/> - <a href="http://localhost:5080/openmeetings/services/UserService/setUserAndNickName?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE&room_id=VALUE&becomeModeratorAsInt=VALUE&showAudioVideoTestAsInt=VALUE&showNickNameDialogAsInt=VALUE";>http://localhost:5080/openmeetings/services/UserService/setUserAndNickName?&&&&&&&&&&&</a> + <a href="http://localhost:5080/openmeetings/services/UserService/setUserAndNickName?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE&room_id=VALUE&becomeModeratorAsInt=VALUE&showAudioVideoTestAsInt=VALUE&showNickNameDialogAsInt=VALUE";>http://localhost:5080/openmeetings/services/UserService/setUserAndNickName?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&profilePictureUrl=VALUE&email=VALUE&externalUserId=VALUE&externalUserType=VALUE&room_id=VALUE&becomeModeratorAsInt=VALUE&showAudioVideoTestAsInt=VALUE&showNickNameDialogAsInt=VALUE</a> </div> <div class="method"> <div class="method_header"> @@ -2052,7 +2052,7 @@ limitations under the License. </table> <br/> REST Sample Call/URL:<br/> - <a href="http://localhost:5080/openmeetings/services/UserService/setUserObjectAndGenerateRecordingHashByURL?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&externalUserId=VALUE&externalUserType=VALUE&recording_id=VALUE";>http://localhost:5080/openmeetings/services/UserService/setUserObjectAndGenerateRecordingHashByURL?&&&&&&</a> + <a href="http://localhost:5080/openmeetings/services/UserService/setUserObjectAndGenerateRecordingHashByURL?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&externalUserId=VALUE&externalUserType=VALUE&recording_id=VALUE";>http://localhost:5080/openmeetings/services/UserService/setUserObjectAndGenerateRecordingHashByURL?SID=VALUE&username=VALUE&firstname=VALUE&lastname=VALUE&externalUserId=VALUE&externalUserType=VALUE&recording_id=VALUE</a> </div> <div class="method"> <div class="method_header"> @@ -2124,7 +2124,7 @@ limitations under the License. </table> <br/> REST Sample Call/URL:<br/> - <a href="http://localhost:5080/openmeetings/services/UserService/addUserToOrganisation?SID=VALUE&user_id=VALUE&organisation_id=VALUE&insertedby=VALUE";>http://localhost:5080/openmeetings/services/UserService/addUserToOrganisation?&&&</a> + <a href="http://localhost:5080/openmeetings/services/UserService/addUserToOrganisation?SID=VALUE&user_id=VALUE&organisation_id=VALUE&insertedby=VALUE";>http://localhost:5080/openmeetings/services/UserService/addUserToOrganisation?SID=VALUE&user_id=VALUE&organisation_id=VALUE&insertedby=VALUE</a> </div> <div class="method"> <div class="method_header"> @@ -2216,7 +2216,7 @@ limitations under the License. </table> <br/> REST Sample Call/URL:<br/> - <a href="http://localhost:5080/openmeetings/services/UserService/getUsersByOrganisation?SID=VALUE&organisation_id=VALUE&start=VALUE&max=VALUE&orderby=VALUE&asc=VALUE";>http://localhost:5080/openmeetings/services/UserService/getUsersByOrganisation?&&&&&</a> + <a href="http://localhost:5080/openmeetings/services/UserService/getUsersByOrganisation?SID=VALUE&organisation_id=VALUE&start=VALUE&max=VALUE&orderby=VALUE&asc=VALUE";>http://localhost:5080/openmeetings/services/UserService/getUsersByOrganisation?SID=VALUE&organisation_id=VALUE&start=VALUE&max=VALUE&orderby=VALUE&asc=VALUE</a> </div> <div class="method"> <div class="method_header"> @@ -2269,7 +2269,7 @@ limitations under the License. </table> <br/> REST Sample Call/URL:<br/> - <a href="http://localhost:5080/openmeetings/services/UserService/kickUserByPublicSID?SID=VALUE&publicSID=VALUE";>http://localhost:5080/openmeetings/services/UserService/kickUserByPublicSID?&</a> + <a href="http://localhost:5080/openmeetings/services/UserService/kickUserByPublicSID?SID=VALUE&publicSID=VALUE";>http://localhost:5080/openmeetings/services/UserService/kickUserByPublicSID?SID=VALUE&publicSID=VALUE</a> </div>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java?rev=1419868&r1=1419867&r2=1419868&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java Mon Dec 10 23:27:02 2012 @@ -22,9 +22,7 @@ import java.io.InputStream; import org.apache.openmeetings.OpenmeetingsVariables; import org.apache.openmeetings.data.user.Emailmanagement; -import org.apache.openmeetings.data.user.Organisationmanagement; import org.apache.openmeetings.data.user.Usermanagement; -import org.apache.openmeetings.data.user.dao.StateDao; import org.apache.openmeetings.data.user.dao.UsersDao; import org.apache.openmeetings.persistence.beans.user.Users; import org.apache.openmeetings.servlet.outputhandler.BackupImportController; @@ -39,14 +37,10 @@ public class UserImport { @Autowired private Usermanagement userManagement; @Autowired - private Organisationmanagement organisationmanagement; - @Autowired private Emailmanagement emailManagement; @Autowired private UsersDao usersDao; @Autowired - private StateDao statemanagement; - @Autowired private BackupImportController backupController; public Long addUsersByDocument(InputStream is) throws Exception { Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/ApiMethodsTemplate.vm URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/ApiMethodsTemplate.vm?rev=1419868&r1=1419867&r2=1419868&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/xdocs/ApiMethodsTemplate.vm (original) +++ incubator/openmeetings/trunk/singlewebapp/xdocs/ApiMethodsTemplate.vm Mon Dec 10 23:27:02 2012 @@ -134,6 +134,7 @@ limitations under the License. #set ($displayLink = $displayLink + "&") #end #set ($link = $link + $parameter.name()+"=VALUE") + #set ($displayLink = $displayLink + $parameter.name()+"=VALUE") #set ($index = $index+1) #end <a href="$link">$displayLink</a>
