Author: solomax
Date: Tue Apr 12 06:23:18 2016
New Revision: 1738696
URL: http://svn.apache.org/viewvc?rev=1738696&view=rev
Log:
no jira: code clean-up
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateThumbs.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateThumbs.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java?rev=1738696&r1=1738695&r2=1738696&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
Tue Apr 12 06:23:18 2016
@@ -50,10 +50,7 @@ public class GenerateImage extends BaseC
@Autowired
private GenerateThumbs generateThumbs;
- public ConverterProcessResultList convertImage(String fileName, String
fileExt,
- String roomName, String fileNameShort, boolean
fullProcessing)
- throws Exception {
-
+ public ConverterProcessResultList convertImage(String fileName, String
fileExt, String roomName) throws IOException {
ConverterProcessResultList returnMap = new
ConverterProcessResultList();
File fileFullPath = new
File(OmFileHelper.getUploadTempRoomDir(roomName), fileName + fileExt);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateThumbs.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateThumbs.java?rev=1738696&r1=1738695&r2=1738696&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateThumbs.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateThumbs.java
Tue Apr 12 06:23:18 2016
@@ -40,7 +40,7 @@ public class GenerateThumbs extends Base
String[] argv = new String[] {
getPathToImageMagick()
, "-thumbnail"
- , Integer.toString(thumbSize) + "x" +
Integer.toString(thumbSize)
+ , thumbSize + "x" + thumbSize
, f.getCanonicalPath()
, new File(parent, pre + name).getCanonicalPath()
};
@@ -60,23 +60,11 @@ public class GenerateThumbs extends Base
String[] argv = new String[] {
getPathToImageMagick()
, "-thumbnail" // FIXME
- , Integer.toString(thumbSize)
+ , "" + thumbSize
, inputfile.getCanonicalPath()
, new File(outputpath, "_" + pre +
"_page-%04d.jpg").getCanonicalPath()
};
return ProcessHelper.executeScript("generateBatchThumbByWidth",
argv);
}
-
- public ConverterProcessResult generateImageBatchByWidth(
- String current_dir, String inputfile, String outputpath,
- Integer thumbWidth, String pre) {
- log.debug("generateImageBatchByWidth");
-
- String[] argv = new String[] { getPathToImageMagick(),
- "-resize", Integer.toString(thumbWidth),
inputfile,
- outputpath + "_" + pre + "_page.png" };
-
- return ProcessHelper.executeScript("generateImageBatchByWidth",
argv);
- }
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java?rev=1738696&r1=1738695&r2=1738696&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
Tue Apr 12 06:23:18 2016
@@ -129,7 +129,7 @@ public class FileProcessor {
} else if (isImage && !isAsIs) {
// convert it to JPG
log.debug("##### convert it to JPG: ");
- returnError = generateImage.convertImage(newName,
extDot, "files", newName, false);
+ returnError = generateImage.convertImage(newName,
extDot, "files");
} else if (isAsIs) {
ConverterProcessResult processThumb =
generateThumbs.generateThumb(thumbImagePrefix, completeName, 50);
returnError.addItem("processThumb", processThumb);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1738696&r1=1738695&r2=1738696&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
Tue Apr 12 06:23:18 2016
@@ -50,9 +50,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.util.CalendarPatterns;
import org.apache.openmeetings.util.OmException;
-import org.apache.openmeetings.util.crypt.CryptProvider;
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java?rev=1738696&r1=1738695&r2=1738696&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
Tue Apr 12 06:23:18 2016
@@ -89,7 +89,5 @@ public class ChatDao {
public void delete(ChatMessage entity, long userId) {
// TODO Auto-generated method stub
-
}
-
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java?rev=1738696&r1=1738695&r2=1738696&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
Tue Apr 12 06:23:18 2016
@@ -20,7 +20,6 @@ package org.apache.openmeetings.db.entit
import static org.apache.openmeetings.db.util.UserHelper.invalidPassword;
-import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Date;
@@ -59,8 +58,8 @@ import org.apache.openjpa.persistence.jd
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.server.Sessiondata;
-import org.apache.openmeetings.util.crypt.MD5;
import org.apache.openmeetings.util.crypt.CryptProvider;
+import org.apache.openmeetings.util.crypt.MD5;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList;
import org.simpleframework.xml.Root;
Modified:
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java?rev=1738696&r1=1738695&r2=1738696&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
Tue Apr 12 06:23:18 2016
@@ -190,9 +190,9 @@ public class AppointmentLogic {
String appointmentLocation, String
appointmentDescription,
Calendar appointmentstart, Calendar appointmentend,
Boolean isDaily, Boolean isWeekly, Boolean isMonthly,
- Boolean isYearly, Long categoryId, String remind,
String[] mmClient,
+ Boolean isYearly, String remind, String[] mmClient,
Long roomType, Long languageId,
- Boolean isPasswordProtected, String password, long
roomId, Long userId) {
+ boolean isPasswordProtected, String password, long
roomId, Long userId) {
Appointment a = new Appointment();
a.setTitle(appointmentName);
a.setLocation(appointmentLocation);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1738696&r1=1738695&r2=1738696&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
Tue Apr 12 06:23:18 2016
@@ -64,9 +64,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.db.util.TimezoneUtil;
import org.apache.openmeetings.service.mail.EmailManager;
-import org.apache.openmeetings.util.CalendarPatterns;
import org.apache.openmeetings.util.DaoHelper;
-import org.apache.openmeetings.util.crypt.CryptProvider;
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.scope.IScope;
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1738696&r1=1738695&r2=1738696&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
Tue Apr 12 06:23:18 2016
@@ -20,7 +20,6 @@ package org.apache.openmeetings.web.page
import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength;
import static org.apache.openmeetings.db.util.UserHelper.getMinPasswdLength;
-import static
org.apache.openmeetings.util.CalendarPatterns.getDateWithTimeByMiliSeconds;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
@@ -28,7 +27,6 @@ import static org.apache.openmeetings.we
import static
org.apache.wicket.validation.validator.StringValidator.minimumLength;
import java.util.Arrays;
-import java.util.Date;
import java.util.List;
import java.util.TimeZone;
import java.util.UUID;
@@ -37,7 +35,6 @@ import org.apache.openmeetings.db.dao.ba
import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.util.crypt.CryptProvider;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.LanguageDropDown;
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java?rev=1738696&r1=1738695&r2=1738696&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
Tue Apr 12 06:23:18 2016
@@ -57,7 +57,6 @@ public class TestAppointmentAddAppointme
String appointmentLocation = "office";
Boolean isMonthly = false;
Boolean isDaily = false;
- Long categoryId = 1L;
Boolean isWeekly = false;
String remind = Appointment.Reminder.ical.name();
Boolean isYearly = false;
@@ -72,7 +71,7 @@ public class TestAppointmentAddAppointme
Appointment a = appointmentLogic.getAppointment(appointmentName,
appointmentLocation, appointmentDescription,
start, end, isDaily, isWeekly,
- isMonthly, isYearly, categoryId, remind,
mmClient,
+ isMonthly, isYearly, remind, mmClient,
roomType, languageId, false, "", -1, userId);
a = appointmentDao.update(a, userId);
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java?rev=1738696&r1=1738695&r2=1738696&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
Tue Apr 12 06:23:18 2016
@@ -50,10 +50,7 @@ public class GenerateImage extends BaseC
@Autowired
private GenerateThumbs generateThumbs;
- public ConverterProcessResultList convertImage(String fileName, String
fileExt,
- String roomName, String fileNameShort, boolean
fullProcessing)
- throws Exception {
-
+ public ConverterProcessResultList convertImage(String fileName, String
fileExt, String roomName) throws IOException {
ConverterProcessResultList returnMap = new
ConverterProcessResultList();
File fileFullPath = new
File(OmFileHelper.getUploadTempRoomDir(roomName), fileName + fileExt);
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateThumbs.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateThumbs.java?rev=1738696&r1=1738695&r2=1738696&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateThumbs.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateThumbs.java
Tue Apr 12 06:23:18 2016
@@ -40,7 +40,7 @@ public class GenerateThumbs extends Base
String[] argv = new String[] {
getPathToImageMagick()
, "-thumbnail"
- , Integer.toString(thumbSize) + "x" +
Integer.toString(thumbSize)
+ , thumbSize + "x" + thumbSize
, f.getCanonicalPath()
, new File(parent, pre + name).getCanonicalPath()
};
@@ -60,23 +60,11 @@ public class GenerateThumbs extends Base
String[] argv = new String[] {
getPathToImageMagick()
, "-thumbnail" // FIXME
- , Integer.toString(thumbSize)
+ , "" + thumbSize
, inputfile.getCanonicalPath()
, new File(outputpath, "_" + pre +
"_page-%04d.jpg").getCanonicalPath()
};
return ProcessHelper.executeScript("generateBatchThumbByWidth",
argv);
}
-
- public ConverterProcessResult generateImageBatchByWidth(
- String current_dir, String inputfile, String outputpath,
- Integer thumbWidth, String pre) {
- log.debug("generateImageBatchByWidth");
-
- String[] argv = new String[] { getPathToImageMagick(),
- "-resize", Integer.toString(thumbWidth),
inputfile,
- outputpath + "_" + pre + "_page.png" };
-
- return ProcessHelper.executeScript("generateImageBatchByWidth",
argv);
- }
}
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java?rev=1738696&r1=1738695&r2=1738696&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
Tue Apr 12 06:23:18 2016
@@ -129,7 +129,7 @@ public class FileProcessor {
} else if (isImage && !isAsIs) {
// convert it to JPG
log.debug("##### convert it to JPG: ");
- returnError = generateImage.convertImage(newName,
extDot, "files", newName, false);
+ returnError = generateImage.convertImage(newName,
extDot, "files");
} else if (isAsIs) {
ConverterProcessResult processThumb =
generateThumbs.generateThumb(thumbImagePrefix, completeName, 50);
returnError.addItem("processThumb", processThumb);
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1738696&r1=1738695&r2=1738696&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
Tue Apr 12 06:23:18 2016
@@ -50,9 +50,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.util.CalendarPatterns;
import org.apache.openmeetings.util.OmException;
-import org.apache.openmeetings.util.crypt.CryptProvider;
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java?rev=1738696&r1=1738695&r2=1738696&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
Tue Apr 12 06:23:18 2016
@@ -89,7 +89,5 @@ public class ChatDao {
public void delete(ChatMessage entity, long userId) {
// TODO Auto-generated method stub
-
}
-
}
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java?rev=1738696&r1=1738695&r2=1738696&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
Tue Apr 12 06:23:18 2016
@@ -20,7 +20,6 @@ package org.apache.openmeetings.db.entit
import static org.apache.openmeetings.db.util.UserHelper.invalidPassword;
-import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Date;
@@ -59,8 +58,8 @@ import org.apache.openjpa.persistence.jd
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.server.Sessiondata;
-import org.apache.openmeetings.util.crypt.MD5;
import org.apache.openmeetings.util.crypt.CryptProvider;
+import org.apache.openmeetings.util.crypt.MD5;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList;
import org.simpleframework.xml.Root;
Modified:
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java?rev=1738696&r1=1738695&r2=1738696&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
(original)
+++
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
Tue Apr 12 06:23:18 2016
@@ -190,9 +190,9 @@ public class AppointmentLogic {
String appointmentLocation, String
appointmentDescription,
Calendar appointmentstart, Calendar appointmentend,
Boolean isDaily, Boolean isWeekly, Boolean isMonthly,
- Boolean isYearly, Long categoryId, String remind,
String[] mmClient,
+ Boolean isYearly, String remind, String[] mmClient,
Long roomType, Long languageId,
- Boolean isPasswordProtected, String password, long
roomId, Long userId) {
+ boolean isPasswordProtected, String password, long
roomId, Long userId) {
Appointment a = new Appointment();
a.setTitle(appointmentName);
a.setLocation(appointmentLocation);
Modified:
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1738696&r1=1738695&r2=1738696&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
(original)
+++
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
Tue Apr 12 06:23:18 2016
@@ -64,9 +64,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.db.util.TimezoneUtil;
import org.apache.openmeetings.service.mail.EmailManager;
-import org.apache.openmeetings.util.CalendarPatterns;
import org.apache.openmeetings.util.DaoHelper;
-import org.apache.openmeetings.util.crypt.CryptProvider;
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.scope.IScope;
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1738696&r1=1738695&r2=1738696&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
Tue Apr 12 06:23:18 2016
@@ -20,7 +20,6 @@ package org.apache.openmeetings.web.page
import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength;
import static org.apache.openmeetings.db.util.UserHelper.getMinPasswdLength;
-import static
org.apache.openmeetings.util.CalendarPatterns.getDateWithTimeByMiliSeconds;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
@@ -28,7 +27,6 @@ import static org.apache.openmeetings.we
import static
org.apache.wicket.validation.validator.StringValidator.minimumLength;
import java.util.Arrays;
-import java.util.Date;
import java.util.List;
import java.util.TimeZone;
import java.util.UUID;
@@ -37,7 +35,6 @@ import org.apache.openmeetings.db.dao.ba
import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.util.crypt.CryptProvider;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.LanguageDropDown;
Modified:
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java?rev=1738696&r1=1738695&r2=1738696&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
Tue Apr 12 06:23:18 2016
@@ -57,7 +57,6 @@ public class TestAppointmentAddAppointme
String appointmentLocation = "office";
Boolean isMonthly = false;
Boolean isDaily = false;
- Long categoryId = 1L;
Boolean isWeekly = false;
String remind = Appointment.Reminder.ical.name();
Boolean isYearly = false;
@@ -72,7 +71,7 @@ public class TestAppointmentAddAppointme
Appointment a = appointmentLogic.getAppointment(appointmentName,
appointmentLocation, appointmentDescription,
start, end, isDaily, isWeekly,
- isMonthly, isYearly, categoryId, remind,
mmClient,
+ isMonthly, isYearly, remind, mmClient,
roomType, languageId, false, "", -1, userId);
a = appointmentDao.update(a, userId);
