[jira] [Commented] (OPENMEETINGS-611) Cloned openmeetings server dont works

2013-04-22 Thread Celestino Veiga (JIRA)

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-611?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13637826#comment-13637826
 ] 

Celestino Veiga commented on OPENMEETINGS-611:
--

Hi Maxim, I think so and it seems you are right. In fact I  planned
before to analyse the network setting but did not have time to do it. When
I do it I give reply on results.

Thanks,


Celestino


2013/4/22 Maxim Solodovnik (JIRA) j...@apache.org



 Cloned openmeetings server dont works
 -

 Key: OPENMEETINGS-611
 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-611
 Project: Openmeetings
  Issue Type: Test
Affects Versions: 2.1.0 Apache Release
 Environment: Ubuntu 12.04 x86_64
Reporter: Celestino Veiga

 I have installed openmeetings 2.1.0 on ubuntu 12.04 x86_64 that works 
 normally. I can make image of the server and from  image make new server, or 
 I can make a clone of the server directly. After making new server I try to 
 browser openmeetings using new IP associated to the new server. But 
 openmeetings is not opened, instead I getr the error:
 Oops! This page appears broken. DNS Error - Server cannot be found.
 So I see that I have a DNS error.
 Any tips on ho to solve this problem?
 Regards,
 Celestino

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


svn commit: r1470616 - in /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings: data/conference/dao/ persistence/beans/room/ web/app/ web/components/ web/components/user/room/ web/components/u

2013-04-22 Thread solomax
Author: solomax
Date: Mon Apr 22 16:51:02 2013
New Revision: 1470616

URL: http://svn.apache.org/r1470616
Log:
Wicket: NotInited page is added to avoid displaying exceptions to the end user;
Tabbed list of organizational rooms is added;
code clean-up;

Added:

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/
  - copied from r1469669, 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsPanel.html

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsPanel.java

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsSelectorPanel.html
  - copied, changed from r1469669, 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.html

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsSelectorPanel.java
  - copied, changed from r1469669, 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.java

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsTabbedPanel.html

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/RoomsTabbedPanel.java

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/NotInitedPage.html

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/NotInitedPage.java
Removed:

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/UserRoomsPanel.html

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/UserRoomsPanel.java

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/
Modified:

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Room.java

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java?rev=1470616r1=1470615r2=1470616view=diff
==
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
 Mon Apr 22 16:51:02 2013
@@ -85,12 +85,7 @@ public class RoomDao implements IDataPro
}
 
public ListRoom getOrganisationRooms(long orgId) {
-   TypedQueryRoom q = em.createQuery(
-   SELECT DISTINCT c.room FROM RoomOrganisation c 
LEFT JOIN FETCH c.room 
-   + WHERE c.organisation.organisation_id = 
:orgId 
-   + AND c.deleted = false AND c.room.deleted = 
false AND c.room.appointment = false 
-   + AND c.organisation.deleted = false 
-   + ORDER BY c.room.name ASC, Room.class);
+   TypedQueryRoom q = 
em.createNamedQuery(getOrganisationRooms, Room.class);
q.setParameter(orgId, orgId);
return q.getResultList();
}

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Room.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Room.java?rev=1470616r1=1470615r2=1470616view=diff
==
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Room.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Room.java
 Mon Apr 22 16:51:02 2013
@@ -74,6 +74,9 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = countRooms, query = SELECT COUNT(r) FROM Room r 
WHERE r.deleted = false),
@NamedQuery(name = getBackupRooms, query = SELECT r FROM Room r LEFT 
JOIN FETCH r.moderators WHERE r.deleted = false ),
@NamedQuery(name = getRoomsCapacityByIds, query = SELECT 
SUM(r.numberOfPartizipants) FROM Room r WHERE r.deleted = false AND r.rooms_id 
IN :ids)
+   , @NamedQuery(name = getOrganisationRooms, query = SELECT DISTINCT 
c.room FROM RoomOrganisation c LEFT JOIN FETCH c.room 
+  

svn commit: r1470811 - in /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings: data/calendar/daos/ data/calendar/management/ data/conference/dao/ persistence/beans/calendar/ remote/ web/compo

2013-04-22 Thread solomax
Author: solomax
Date: Tue Apr 23 04:30:25 2013
New Revision: 1470811

URL: http://svn.apache.org/r1470811
Log:
Wicket: Private rooms list is implemented
License headers are added;
Code clean-up

Added:

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/
  - copied from r1470616, 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/
Removed:

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/room/
Modified:

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConfigurationService.java

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentDialog.java

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentModel.java

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/RoomsPanel.java

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/RoomsSelectorPanel.java

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/RoomsTabbedPanel.java

openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/NotInitedPage.java

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java?rev=1470811r1=1470810r2=1470811view=diff
==
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
 Tue Apr 23 04:30:25 2013
@@ -18,6 +18,8 @@
  */
 package org.apache.openmeetings.data.calendar.daos;
 
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -35,7 +37,6 @@ import javax.persistence.criteria.Criter
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.apache.openmeetings.OpenmeetingsVariables;
 import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
 import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
 import org.apache.openmeetings.data.calendar.management.MeetingMemberLogic;
@@ -59,9 +60,7 @@ import org.springframework.transaction.a
 
 @Transactional
 public class AppointmentDao {
-
-   private static final Logger log = Red5LoggerFactory.getLogger(
-   AppointmentDao.class, 
OpenmeetingsVariables.webAppRootKey);
+   private static final Logger log = 
Red5LoggerFactory.getLogger(AppointmentDao.class, webAppRootKey);
@PersistenceContext
private EntityManager em;
@Autowired
@@ -868,17 +867,6 @@ public class AppointmentDao {
public ListAppointment getTodaysAppointmentsbyRangeAndMember(Long 
userId) {
log.debug(getAppoitmentbyRangeAndMember : UserID -  + userId);
 
-   //this query returns duplicates if the user books an 
appointment with
-   //his own user as second meeting-member, swagner 19.02.2012
-   
-   String hql = SELECT app from MeetingMember mm 
-   + JOIN mm.appointment as app 
-   + WHERE mm.userid.user_id= :userId 
-   + AND mm.deleted  :mm_deleted 
-   + AND app.deleted  :app_deleted  + AND  
-   + app.appointmentStarttime between :starttime 
 + AND 
-   +  :endtime;
-   
TimeZone timeZone = 
timezoneUtil.getTimezoneByUser(usersDao.get(userId));
 
Calendar startCal = Calendar.getInstance(timeZone);
@@ -891,23 +879,15 @@ public class AppointmentDao {
endCal.set(Calendar.HOUR, 59);
endCal.set(Calendar.SECOND, 59);
 
-   try {
-   TypedQueryAppointment query = em.createQuery(hql,
-   Appointment.class);
+   TypedQueryAppointment query = 
em.createNamedQuery(appointmentsInRangeByUser, Appointment.class);
 
-