You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by es...@apache.org on 2012/02/24 00:44:10 UTC
svn commit: r1293032 - in /incubator/openmeetings/branches/jira-plugin: ./
src/main/java/org/openmeetings/jira/plugin/ao/omrooms/
src/main/java/org/openmeetings/jira/plugin/gateway/
src/main/java/org/openmeetings/jira/plugin/jira/customfields/ src/main...
Author: eschwert
Date: Thu Feb 23 23:44:09 2012
New Revision: 1293032
URL: http://svn.apache.org/viewvc?rev=1293032&view=rev
Log:
OPENMEETINGS-60 Templates improvements, new userdata for setUserObjectAndGenerateRoomHash method.
Modified:
incubator/openmeetings/branches/jira-plugin/.classpath
incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/ao/omrooms/Room.java
incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/ao/omrooms/RoomService.java
incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/ao/omrooms/RoomServiceImpl.java
incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/gateway/OmGateway.java
incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/jira/customfields/RoomSelectList.java
incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/servlet/AdminServlet.java
incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/servlet/RoomsServlet.java
incubator/openmeetings/branches/jira-plugin/src/main/resources/atlassian-plugin.xml
incubator/openmeetings/branches/jira-plugin/src/main/resources/i18n.properties
incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/config/adminedit.vm
incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/config/omconfig.vm
incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/customfields/room-select-list/view.vm
incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/omrooms/edit.vm
incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/omrooms/list.vm
incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/omrooms/new.vm
Modified: incubator/openmeetings/branches/jira-plugin/.classpath
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/.classpath?rev=1293032&r1=1293031&r2=1293032&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/.classpath (original)
+++ incubator/openmeetings/branches/jira-plugin/.classpath Thu Feb 23 23:44:09 2012
@@ -132,7 +132,7 @@
<attribute value="jar:file:/home/eschwert/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/" name="javadoc_location"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.5.6/spring-context-2.5.6.jar" sourcepath="M2_REPO/org/springframework/spring-context/2.5.6/spring-context-2.5.6-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.5.6.SEC02/spring-context-2.5.6.SEC02.jar" sourcepath="M2_REPO/org/springframework/spring-context/2.5.6.SEC02/spring-context-2.5.6.SEC02-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5.6/spring-beans-2.5.6.jar" sourcepath="M2_REPO/org/springframework/spring-beans/2.5.6/spring-beans-2.5.6-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/atlassian/profiling/atlassian-profiling/1.8.2/atlassian-profiling-1.8.2.jar" sourcepath="M2_REPO/com/atlassian/profiling/atlassian-profiling/1.8.2/atlassian-profiling-1.8.2-sources.jar">
@@ -142,7 +142,7 @@
</classpathentry>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar" sourcepath="M2_REPO/junit/junit/4.6/junit-4.6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/2.5.6/spring-web-2.5.6.jar" sourcepath="M2_REPO/org/springframework/spring-web/2.5.6/spring-web-2.5.6-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/2.0.6/spring-web-2.0.6.jar"/>
<classpathentry kind="var" path="M2_REPO/com/atlassian/crowd/crowd-core/2.2.8/crowd-core-2.2.8.jar">
<attributes>
<attribute value="jar:file:/home/eschwert/.m2/repository/com/atlassian/crowd/crowd-core/2.2.8/crowd-core-2.2.8-javadoc.jar!/" name="javadoc_location"/>
@@ -164,7 +164,7 @@
</attributes>
</classpathentry>
<classpathentry kind="var" path="M2_REPO/org/springframework/security/spring-security-core/2.0.4/spring-security-core-2.0.4.jar" sourcepath="M2_REPO/org/springframework/security/spring-security-core/2.0.4/spring-security-core-2.0.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/2.5.6/spring-aop-2.5.6.jar" sourcepath="M2_REPO/org/springframework/spring-aop/2.5.6/spring-aop-2.5.6-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/2.0.8/spring-aop-2.0.8.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-tx/2.5.6/spring-tx-2.5.6.jar" sourcepath="M2_REPO/org/springframework/spring-tx/2.5.6/spring-tx-2.5.6-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/atlassian/plugins/atlassian-plugins-core/2.8.0/atlassian-plugins-core-2.8.0.jar" sourcepath="M2_REPO/com/atlassian/plugins/atlassian-plugins-core/2.8.0/atlassian-plugins-core-2.8.0-sources.jar">
<attributes>
@@ -204,7 +204,6 @@
</attributes>
</classpathentry>
<classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.2/antlr-2.7.2.jar" sourcepath="M2_REPO/antlr/antlr/2.7.2/antlr-2.7.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm/3.1/asm-3.1.jar" sourcepath="M2_REPO/asm/asm/3.1/asm-3.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-orm/2.5.6.SEC02/spring-orm-2.5.6.SEC02.jar" sourcepath="M2_REPO/org/springframework/spring-orm/2.5.6.SEC02/spring-orm-2.5.6.SEC02-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar" sourcepath="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6-sources.jar">
@@ -861,19 +860,4 @@
<classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/woodstox-core-asl/4.1.0/woodstox-core-asl-4.1.0.jar" sourcepath="M2_REPO/org/codehaus/woodstox/woodstox-core-asl/4.1.0/woodstox-core-asl-4.1.0-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/stax2-api/3.1.0/stax2-api-3.1.0.jar" sourcepath="M2_REPO/org/codehaus/woodstox/stax2-api/3.1.0/stax2-api-3.1.0-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc/2.5.6/spring-webmvc-2.5.6.jar" sourcepath="M2_REPO/org/springframework/spring-webmvc/2.5.6/spring-webmvc-2.5.6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/jersey/contribs/jersey-spring/1.11/jersey-spring-1.11.jar" sourcepath="M2_REPO/com/sun/jersey/contribs/jersey-spring/1.11/jersey-spring-1.11-sources.jar">
- <attributes>
- <attribute value="jar:file:/home/eschwert/.m2/repository/com/sun/jersey/contribs/jersey-spring/1.11/jersey-spring-1.11-javadoc.jar!/" name="javadoc_location"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-servlet/1.11/jersey-servlet-1.11.jar" sourcepath="M2_REPO/com/sun/jersey/jersey-servlet/1.11/jersey-servlet-1.11-sources.jar">
- <attributes>
- <attribute value="jar:file:/home/eschwert/.m2/repository/com/sun/jersey/jersey-servlet/1.11/jersey-servlet-1.11-javadoc.jar!/" name="javadoc_location"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-server/1.11/jersey-server-1.11.jar" sourcepath="M2_REPO/com/sun/jersey/jersey-server/1.11/jersey-server-1.11-sources.jar">
- <attributes>
- <attribute value="jar:file:/home/eschwert/.m2/repository/com/sun/jersey/jersey-server/1.11/jersey-server-1.11-javadoc.jar!/" name="javadoc_location"/>
- </attributes>
- </classpathentry>
</classpath>
\ No newline at end of file
Modified: incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/ao/omrooms/Room.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/ao/omrooms/Room.java?rev=1293032&r1=1293031&r2=1293032&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/ao/omrooms/Room.java (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/ao/omrooms/Room.java Thu Feb 23 23:44:09 2012
@@ -38,7 +38,7 @@ public interface Room extends Entity
void setRoomId(Long roomId);
- Integer getCreatedByUserId();
+ String getCreatedByUserName();
- void setCreatedByUserId(Long createdByUserId);
+ void setCreatedByUserName(String createdByUserName);
}
Modified: incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/ao/omrooms/RoomService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/ao/omrooms/RoomService.java?rev=1293032&r1=1293031&r2=1293032&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/ao/omrooms/RoomService.java (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/ao/omrooms/RoomService.java Thu Feb 23 23:44:09 2012
@@ -8,7 +8,7 @@ import java.util.List;
public interface RoomService
{
Room add(boolean isAllowedRecording, boolean isAudioOnly, boolean isModeratedRoom,
- String name, Long numberOfParticipent, Long roomType, Long roomId, Long createdByUserId);
+ String name, Long numberOfParticipent, Long roomType, Long roomId, String createdByUserName);
Room update(Integer id, boolean isAllowedRecording, boolean isAudioOnly, boolean isModeratedRoom,
String name, Long numberOfParticipent, Long roomType);
@@ -20,4 +20,6 @@ public interface RoomService
List<Room> all();
List<Room> allNotDeleted();
+
+ List<Room> allNotDeletedByUserName(String userName);
}
\ No newline at end of file
Modified: incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/ao/omrooms/RoomServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/ao/omrooms/RoomServiceImpl.java?rev=1293032&r1=1293031&r2=1293032&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/ao/omrooms/RoomServiceImpl.java (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/ao/omrooms/RoomServiceImpl.java Thu Feb 23 23:44:09 2012
@@ -20,7 +20,7 @@ public final class RoomServiceImpl imple
@Override
public Room add(boolean isAllowedRecording, boolean isAudioOnly, boolean isModeratedRoom,
- String name, Long numberOfParticipent, Long roomType, Long roomId, Long createdByUserId)
+ String name, Long numberOfParticipent, Long roomType, Long roomId, String createdByUserName)
{
final Room room = ao.create(Room.class);
@@ -31,7 +31,7 @@ public final class RoomServiceImpl imple
room.setNumberOfParticipent(numberOfParticipent);
room.setRoomType(roomType);
room.setRoomId(roomId);
- room.setCreatedByUserId(createdByUserId);
+ room.setCreatedByUserName(createdByUserName);
room.setIsDeleted(false);
room.save();
return room;
@@ -84,4 +84,14 @@ public final class RoomServiceImpl imple
final Room room = ao.get(Room.class, id);
return room;
}
+
+ @Override
+ public List<Room> allNotDeletedByUserName(String userName) {
+
+ return newArrayList(ao.find(Room.class, Query.select().
+ where("IS_DELETED LIKE ? AND CREATED_BY_USER_NAME LIKE ?",false, userName.toString()).limit(1000)));
+
+ //return newArrayList(ao.find(Room.class,"IS_DELETED LIKE ? AND CREATED_BY_USER_NAME = ?", false, userName));
+
+ }
}
Modified: incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/gateway/OmGateway.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/gateway/OmGateway.java?rev=1293032&r1=1293031&r2=1293032&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/gateway/OmGateway.java (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/gateway/OmGateway.java Thu Feb 23 23:44:09 2012
@@ -49,15 +49,10 @@ public class OmGateway {
this.setSessionId(item.elementText("session_id"));
- log.error(item.elementText("session_id"));
+ log.info(item.elementText("session_id"));
LinkedHashMap<String, Element> result = omRestService.call("http://"+url+":"+port+"/openmeetings/services/UserService/loginUser?SID="+this.getSessionId()+"&username="+omusername+"&userpass="+userpass, null);
- //log.error(result.get("return").asXML());
-
- log.error(result.get("return").getStringValue());
-
-
if (Integer.valueOf(result.get("return").getStringValue())>0){
return true;
} else {
Modified: incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/jira/customfields/RoomSelectList.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/jira/customfields/RoomSelectList.java?rev=1293032&r1=1293031&r2=1293032&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/jira/customfields/RoomSelectList.java (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/jira/customfields/RoomSelectList.java Thu Feb 23 23:44:09 2012
@@ -40,18 +40,11 @@ import com.atlassian.jira.issue.fields.c
import com.atlassian.jira.issue.fields.layout.field.FieldLayoutItem;
public class RoomSelectList extends TextCFType {
- private static final Logger log = LoggerFactory.getLogger(RoomSelectList.class);
- //private final OptionsManager optionsManager;
- //private static SelectConverter selectConverter;
- private final RoomService roomService;
-
-// public RoomSelectList(CustomFieldValuePersister customFieldValuePersister, StringConverter stringConverter, SelectConverter selectConverter, OptionsManager optionsManager, GenericConfigManager genericConfigManager, RoomService roomService) {
-// super(customFieldValuePersister, stringConverter, selectConverter, optionsManager, genericConfigManager);
-// this.roomService = roomService;
-// //this.optionsManager = optionsManager;
-
+ private static final Logger log = LoggerFactory.getLogger(RoomSelectList.class);
+ private final RoomService roomService;
+
public RoomSelectList(CustomFieldValuePersister customFieldValuePersister,
GenericConfigManager genericConfigManager, RoomService roomService) {
super(customFieldValuePersister, genericConfigManager);
@@ -69,22 +62,10 @@ import com.atlassian.jira.issue.fields.l
if (issue == null) {
return map;
}
-
- FieldConfig fieldConfig = field.getRelevantConfig(issue);
- //add what you need to the map here
- //field.getValue(issue);
-
- //fieldConfig.getConfigItems().get(1);
- //getValueFromIssue
- //Object param = issue.getCustomFieldValue(field);
- //map.put("param", param);
-
- List<Room> rooms = roomService.allNotDeleted();
-
- map.put("rooms", rooms);
- //map.put("value", param);
-
- return map;
+ //FieldConfig fieldConfig = field.getRelevantConfig(issue);
+ List<Room> rooms = roomService.allNotDeleted();
+ map.put("rooms", rooms);
+ return map;
}
@Override
Modified: incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/servlet/AdminServlet.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/servlet/AdminServlet.java?rev=1293032&r1=1293031&r2=1293032&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/servlet/AdminServlet.java (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/servlet/AdminServlet.java Thu Feb 23 23:44:09 2012
@@ -37,21 +37,14 @@ public class AdminServlet extends HttpSe
{
private static final Logger log = LoggerFactory.getLogger(AdminServlet.class);
- private final UserManager userManager;
- //private final TemplateRenderer renderer;
- //private final LoginUriProvider loginUriProvider;
+ private final UserManager userManager;
private TemplateRenderer templateRenderer;
private com.atlassian.jira.user.util.UserManager jiraUserManager;
private OmPluginSettings omPluginSettings;
- private static final String NEW_BROWSER_TEMPLATE = "/templates/config/adminnew.vm";
- private static final String EDIT_BROWSER_TEMPLATE = "/templates/config/adminedit.vm";
+
private static final String OM_CONFIG_TEMPLATE = "/templates/config/omconfig.vm";
-// public TodoServlet(ActiveObjects ao)
-// {
-// this.ao = checkNotNull(ao);
-// }
public AdminServlet(com.atlassian.jira.user.util.UserManager jiraUserManager,
TemplateRenderer templateRenderer,
@@ -87,17 +80,9 @@ public class AdminServlet extends HttpSe
response.setContentType("text/html;charset=utf-8");
// Render the velocity template (new.vm). Since the new.vm template
// doesn't need to render any in dynamic content, we just pass it an empty context
- templateRenderer.render(NEW_BROWSER_TEMPLATE, context, response.getWriter());
+ //templateRenderer.render(NEW_BROWSER_TEMPLATE, context, response.getWriter());
} else if ("y".equals(request.getParameter("edit"))) {
- // Renders edit.vm template if the "edit" parameter is passed
-
-// // Retrieve issue with the specified key
-// AdminConfiguration omConfig = adminOmConfigurationService.get(request.getParameter("key"));// req.getParameter("key"));
-// Map<String, Object> context = Maps.newHashMap();
-// context.put("omConfig", omConfig);
-// response.setContentType("text/html;charset=utf-8");
-// // Render the template with the issue inside the context
-// templateRenderer.render(EDIT_BROWSER_TEMPLATE, context, response.getWriter());
+
} else {
String url;
@@ -142,7 +127,8 @@ public class AdminServlet extends HttpSe
if ("y".equals(request.getParameter("edit"))) {
-
+
+ response.sendRedirect(request.getContextPath() + "secure/AdminSummary.jspa");
} else {
String url = request.getParameter("url");
Modified: incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/servlet/RoomsServlet.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/servlet/RoomsServlet.java?rev=1293032&r1=1293031&r2=1293032&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/servlet/RoomsServlet.java (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/java/org/openmeetings/jira/plugin/servlet/RoomsServlet.java Thu Feb 23 23:44:09 2012
@@ -8,68 +8,98 @@ import javax.servlet.http.HttpServletRes
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPathExpressionException;
+
import org.dom4j.DocumentException;
+import org.jfree.util.Log;
import org.openmeetings.jira.plugin.ao.omrooms.Room;
import org.openmeetings.jira.plugin.ao.omrooms.RoomService;
import org.openmeetings.jira.plugin.gateway.OmGateway;
+import org.openmeetings.jira.plugin.gateway.OmRestService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
import com.atlassian.crowd.embedded.api.User;
import com.atlassian.sal.api.user.UserManager;
import com.atlassian.jira.ComponentManager;
-import com.atlassian.jira.bc.issue.IssueService;
+import com.atlassian.jira.functest.framework.UserProfile;
import com.atlassian.jira.issue.Issue;
+import com.atlassian.jira.user.util.DefaultUserManager;
import com.atlassian.templaterenderer.TemplateRenderer;
import com.google.common.collect.Maps;
import java.io.IOException;
import java.io.PrintWriter;
+import java.net.URI;
+import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import static com.google.common.base.Preconditions.*;
+
+import com.atlassian.jira.util.velocity.VelocityRequestContextFactory;
+import com.atlassian.jira.avatar.Avatar;
+import com.atlassian.jira.avatar.Avatar.Type;
+import com.atlassian.jira.avatar.AvatarManager;
+import com.atlassian.jira.avatar.AvatarService;
+import com.atlassian.crowd.embedded.api.UserWithAttributes;
+
public final class RoomsServlet extends HttpServlet
{
+ private static final Logger log = LoggerFactory.getLogger(RoomsServlet.class);
+
private final RoomService roomService;
private TemplateRenderer templateRenderer;
private OmGateway omGateway;
private UserManager userManager;
private com.atlassian.jira.user.util.UserManager jiraUserManager;
private String roomURL;
+ protected final VelocityRequestContextFactory requestContextFactory;
+
+ private final AvatarManager avatarManager;
+
+
private static final String LIST_BROWSER_TEMPLATE = "/templates/omrooms/list.vm";
private static final String NEW_BROWSER_TEMPLATE = "/templates/omrooms/new.vm";
private static final String EDIT_BROWSER_TEMPLATE = "/templates/omrooms/edit.vm";
private static final String ENTER_BROWSER_TEMPLATE = "/templates/omrooms/enter.vm";
- public RoomsServlet(RoomService roomService, TemplateRenderer templateRenderer, OmGateway omGateway, com.atlassian.jira.user.util.UserManager jiraUserManager, UserManager userManager)
+ public RoomsServlet(VelocityRequestContextFactory requestContextFactory, AvatarManager avatarManager, RoomService roomService, TemplateRenderer templateRenderer, OmGateway omGateway, com.atlassian.jira.user.util.UserManager jiraUserManager, UserManager userManager)
{
this.roomService = checkNotNull(roomService);
this.templateRenderer = templateRenderer;
this.omGateway = omGateway;
this.jiraUserManager = jiraUserManager;
this.userManager = userManager;
+ this.avatarManager = avatarManager;
+ this.requestContextFactory = requestContextFactory;
}
+ public String getCanonicalBaseUrl() {
+ return this.requestContextFactory.getJiraVelocityRequestContext().getCanonicalBaseUrl();
+ }
private User getCurrentUser(HttpServletRequest req) {
// To get the current user, we first get the username from the session.
// Then we pass that over to the jiraUserManager in order to get an
- // actual User object.
- //return jiraUserManager.getUser(userManager.getRemoteUsername(req));
+ // actual User object.
return jiraUserManager.getUserObject(userManager.getRemoteUsername(req));
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
{
- User user = getCurrentUser(req);
+ User currentUser = getCurrentUser(req);
+ System.out.println("currentUser: "+currentUser.getName());
+ User currentUser2 = ComponentManager.getInstance().getJiraAuthenticationContext().getLoggedInUser();
+ System.out.println("currentUser2: "+currentUser2.getName());
if ("y".equals(req.getParameter("new"))) {
- // Renders new.vm template if the "new" parameter is passed
-
+ // Renders new.vm template if the "new" parameter is passed
// Create an empty context map to pass into the render method
Map<String, Object> context = Maps.newHashMap();
// Make sure to set the contentType otherwise bad things happen
@@ -79,67 +109,64 @@ public final class RoomsServlet extends
templateRenderer.render(NEW_BROWSER_TEMPLATE, context, res.getWriter());
}else if("y".equals(req.getParameter("edit"))){
- // Renders edit.vm template if the "edit" parameter is passed
-
- Integer id = Integer.valueOf(req.getParameter("key"));
-// Boolean isAllowedRecording = Boolean.valueOf(req.getParameter("isAllowedRecording"));
-// Boolean isAudioOnly = Boolean.valueOf(req.getParameter("isAudioOnly"));
-// Boolean isModeratedRoom = Boolean.valueOf(req.getParameter("isModeratedRoom"));
-// String roomName = req.getParameter("roomname");
-// Long numberOfParticipent = Long.valueOf(req.getParameter("numberOfParticipent"));
-// Long roomType = Long.valueOf(req.getParameter("roomType"));
-// Long roomId = Long.valueOf(req.getParameter("roomId"));
-
-// Room room = roomService.update(id, isAllowedRecording, isAudioOnly, isModeratedRoom, name, numberOfParticipent, roomType);
-
+ // Renders edit.vm template if the "edit" parameter is passed
+ Integer id = Integer.valueOf(req.getParameter("key"));
Room room = roomService.getRoom(id);
Map<String, Object> context = Maps.newHashMap();
- context.put("room", room);
-// context.put("isAllowedRecording", isAllowedRecording);
-// context.put("isAudioOnly", isAudioOnly);
-// context.put("isModeratedRoom", isModeratedRoom);
-// context.put("roomName", roomName);
-// context.put("numberOfParticipent", numberOfParticipent);
-// context.put("roomType", roomType);
-// context.put("roomId", roomId);
+ context.put("room", room);
res.setContentType("text/html;charset=utf-8");
// Render the template with the issue inside the context
- templateRenderer.render(EDIT_BROWSER_TEMPLATE, context, res.getWriter());
-
+ templateRenderer.render(EDIT_BROWSER_TEMPLATE, context, res.getWriter());
}else if("y".equals(req.getParameter("delete"))){
Integer id = Integer.valueOf(req.getParameter("key"));
roomService.delete(id);
res.sendRedirect(req.getContextPath() + "/plugins/servlet/openmeetingsrooms");
- }else if("y".equals(req.getParameter("enter"))){
- String iframe_d;
+ }else if("y".equals(req.getParameter("enter"))){
try {
if(omGateway.loginUser()){
-// roomId = omGateway.setUserObjectAndGenerateRoomHash(
-// username,
-// firstname,
-// lastname,
-// profilePictureUrl,
-// email,
-// externalUserId,
-// externalUserType,
-// room_id,
-// becomeModeratorAsInt,
-// showAudioVideoTestAsInt);
+ //authContext.getUser().getName();
+ //com.atlassian.jira.ComponentManager.getInstance().getJiraAuthenticationContext().getUser();
+
+ Long directoryId = currentUser.getDirectoryId();
+ String firsname = currentUser.getDisplayName();
+ String email = currentUser.getEmailAddress();
+ Long userId = new Date().getTime();
+ String username = currentUser.getName();
+ int becomeModeratorAsInt = 1;
+ int showAudioVideoTestAsInt = 1;
+
+
+ System.out.println("directoryId: "+directoryId);
+ System.out.println("username: "+username);
+
+ String avatarId = this.avatarManager.getDefaultAvatarId(Avatar.Type.USER).toString();
+ //URI avatarUrl = avatarService.getAvatarURL(currentUser, avatarId, Avatar.Size.SMALL);
+ //String profilePictureUrl = avatarUrl.toString();
+ String profilePictureUrl = this.getCanonicalBaseUrl() + "/secure/projectavatar?avatarId=" + avatarId + "&size=small";
+
+
+
+// String userEmail;
+// UserProfile userProfile = userService.getUserProfile(reviewData.getAuthor().getUserName());
+// if (userProfile != null) {
+// userEmail = userProfile.getEmail();
+// }
+
Long roomId = Long.valueOf(req.getParameter("roomId"));
- String roomHash = omGateway.setUserObjectAndGenerateRoomHash(
- "username",
- "firstname",
- "lastname",
- "profilePictureUrl",
- "email@test.de",
- 1L,
- "externalUserType",
- roomId,
- 1,
- 1);
+ String roomHash = omGateway.setUserObjectAndGenerateRoomHash(username,
+ firsname,
+ "",
+ profilePictureUrl,
+ email,
+ userId,
+ "jira",
+ roomId,
+ becomeModeratorAsInt,
+ showAudioVideoTestAsInt);
+
if(!roomHash.isEmpty()){
@@ -152,11 +179,7 @@ public final class RoomsServlet extends
"&secureHash=" +roomHash+
"&language=1"+
"&lzproxied=solo";
-
-
-// printf("<iframe src='%s' width='%s' height='600px' />",$iframe_d,
-// "100%");
-
+
}
}
@@ -173,10 +196,7 @@ public final class RoomsServlet extends
// TODO Auto-generated catch block
e.printStackTrace();
}
-
- // Render the list of issues (list.vm) if no params are passed in
- //List<Room> rooms = roomService.all();
- //List<Room> rooms = roomService.allNotDeleted();
+
Map<String, Object> context = Maps.newHashMap();
context.put("roomURL", this.roomURL);
@@ -185,8 +205,8 @@ public final class RoomsServlet extends
templateRenderer.render(ENTER_BROWSER_TEMPLATE, context, res.getWriter());
}else {
// Render the list of issues (list.vm) if no params are passed in
- //List<Room> rooms = roomService.all();
- List<Room> rooms = roomService.allNotDeleted();
+ //List<Room> rooms = roomService.allNotDeleted();
+ List<Room> rooms = roomService.allNotDeletedByUserName(currentUser.getName());
Map<String, Object> context = Maps.newHashMap();
context.put("rooms", rooms);
res.setContentType("text/html;charset=utf-8");
@@ -199,9 +219,12 @@ public final class RoomsServlet extends
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
{
- User user = getCurrentUser(req);
+ User currentUser = getCurrentUser(req);
+ System.out.println("currentUser: "+currentUser.getName());
+ User currentUser2 = ComponentManager.getInstance().getJiraAuthenticationContext().getLoggedInUser();
//Second variant to get current user object.
//User user2 = (User) ComponentManager.getInstance().getJiraAuthenticationContext().getUser();
+ System.out.println("currentUser22: "+currentUser2);
if ("y".equals(req.getParameter("edit"))) {
@@ -289,24 +312,12 @@ public final class RoomsServlet extends
e.printStackTrace();
}
- roomService.add(isAllowedRecording, isAudioOnly, isModeratedRoom, roomName, numberOfParticipent, roomType, roomId, user.getDirectoryId());
+ roomService.add(isAllowedRecording, isAudioOnly, isModeratedRoom, roomName, numberOfParticipent, roomType, roomId, currentUser.getName());
//roomService.add(description, true, true, true, "name", 4L, 1L);
res.sendRedirect(req.getContextPath() + "/plugins/servlet/openmeetingsrooms");
- }
-
-// final String description = req.getParameter("task");
-// final String isAllowedRecording = req.getParameter("isAllowedRecording");
-// final String isAudioOnly = req.getParameter("isAudioOnly");
-// final String isModeratedRoom = req.getParameter("isModeratedRoom");
-// final String name = req.getParameter("name");
-// final Long numberOfParticipent = Long.valueOf(req.getParameter("numberOfParticipent"));
-// final Long roomType = Long.valueOf(req.getParameter("roomType"));
-
- //roomService.add(isAllowedRecording, isAudioOnly, isModeratedRoom, name, numberOfParticipent, roomType);
- //roomService.add(true, true, true, "name", 4L, 1L);
+ }
- //res.sendRedirect(req.getContextPath() + "/plugins/servlet/openmeetingsrooms");
}
}
\ No newline at end of file
Modified: incubator/openmeetings/branches/jira-plugin/src/main/resources/atlassian-plugin.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/resources/atlassian-plugin.xml?rev=1293032&r1=1293031&r2=1293032&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/resources/atlassian-plugin.xml (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/resources/atlassian-plugin.xml Thu Feb 23 23:44:09 2012
@@ -12,7 +12,7 @@
<label key="OpenMeetings Setup"/>
</web-section>
<web-item key="om_config" section="integrations_section/om_config_section">
- <label>Server Setup</label>
+ <label>OpenMeetings Setup</label>
<link linkId="admin_link" absolute="false">/plugins/servlet/openmeetingsadmin</link>
</web-item>
<web-section key="my_links_section" name="My Links Main Section" location="my_links_link" weight="10">
Modified: incubator/openmeetings/branches/jira-plugin/src/main/resources/i18n.properties
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/resources/i18n.properties?rev=1293032&r1=1293031&r2=1293032&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/resources/i18n.properties (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/resources/i18n.properties Thu Feb 23 23:44:09 2012
@@ -2,4 +2,45 @@
openmeetings.admin.label=OpenMeetings Admin
openmeetings.admin.name.label=Name
openmeetings.admin.time.label=Time
-openmeetings.admin.save.label=Save
\ No newline at end of file
+openmeetings.admin.save.label=Save
+
+openmeetings.rooms.conference.label=Conference
+openmeetings.rooms.audience.label=Audience
+openmeetings.rooms.restricted.label=Restricted
+openmeetings.rooms.interview.label=Interview
+
+openmeetings.rooms.edit.conference.label=Conference (max 20 Users recommended, Democratic)
+openmeetings.rooms.edit.audience.label=Audience (max 50 Users recommended, Moderated)
+openmeetings.rooms.edit.restricted.label=Restricted (max 150 Users recommended, Moderated)
+openmeetings.rooms.edit.interview.label=Interview (Only 2 Users, no Whiteboard, Record Audio/Video, Moderated)
+
+
+openmeetings.rooms.yes.label=Yes
+openmeetings.rooms.no.label=No
+
+openmeetings.rooms.roomid.label=RoomId
+openmeetings.rooms.roomname.label=Roomname
+openmeetings.rooms.roomtype.label=Roomtype
+openmeetings.rooms.participent.label=Paricipent
+openmeetings.rooms.ismoderated.label=Is Moderated
+openmeetings.rooms.isaudio.label=Is Audio Only
+
+openmeetings.rooms.roomlist.label=Room List
+openmeetings.rooms.edit.label=Edit
+openmeetings.rooms.delete.label=Delete
+openmeetings.rooms.createnewroom.label=Create New Room
+openmeetings.rooms.create.label=Create
+
+openmeetings.rooms.edit.titel.label=Edit Room
+openmeetings.rooms.cancel.label=Cancel
+
+openmeetings.rooms.enter.label=Link to room
+
+openmeetings.config.titel.label=Edit OpenMeetings Configuration
+openmeetings.config.server.label=Edit Server Configuration
+openmeetings.config.url.label=URL
+openmeetings.config.port.label=Port
+openmeetings.config.username.label=Username
+openmeetings.config.userpass.label=Userpass
+openmeetings.config.key.label=Key
+
Modified: incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/config/adminedit.vm
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/config/adminedit.vm?rev=1293032&r1=1293031&r2=1293032&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/config/adminedit.vm (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/config/adminedit.vm Thu Feb 23 23:44:09 2012
@@ -1,13 +1,13 @@
<html>
<head>
- <title>Edit OpenMeetings Configuration</title>
+ <title>$i18n.getText("openmeetings.config.titel.label")</title>
<meta name="decorator" content="atl.general">
</head>
<body class="page-type-admin">
<div class="content-container">
<div class="content-body">
- <h1>Edit issue omConfig.getKey()</h1>
+ <h1>$i18n.getText("openmeetings.config.server.label") $omConfig.getKey()</h1>
#if ($errors.size()>0)
<div class="aui-message error shadowed">
@@ -20,54 +20,53 @@
</div>
<!-- .aui-message -->
#end
-
<div class="create-issue-panel">
- <form method="post" id="h" action="openmeetingsconfig" class="aui">
+ <form method="post" id="h" action="openmeetingsadmin" class="aui">
<input type="hidden" name="edit" value="y">
- <input type="hidden" name="key" value="omConfig.getKey()">
+ <input type="hidden" name="key" value="$omConfig.getKey()">
<div class="field-group">
<label for="h-furl">
- URL
+ $i18n.getText("openmeetings.config.url.label")
<span class="aui-icon icon-required"></span>
<span class="content">required</span>
</label>
- <input id="h-furl" class="text long-field" type="text" name="url" value="omConfig.getOmUrl()">
+ <input id="h-furl" class="text long-field" type="text" name="url" value="$!omConfig.getOmUrl()">
</div>
<div class="field-group">
<label for="h-fport">
- Port
+ $i18n.getText("openmeetings.config.port.label")
<span class="aui-icon icon-required"></span>
<span class="content">required</span>
</label>
- <textarea id="h-fport" name="port">omConfig.getOmPort()</textarea>
+ <textarea id="h-fport" name="port">$!omConfig.getOmPort()</textarea>
</div>
<div class="field-group">
<label for="h-fusername">
- User Name
+ $i18n.getText("openmeetings.config.username.label")
<span class="aui-icon icon-required"></span>
<span class="content">required</span>
</label>
- <textarea id="h-fusername" name="username">omConfig.getOmUserName()</textarea>
+ <textarea id="h-fusername" name="username">$!omConfig.getOmUserName()</textarea>
</div>
<div class="field-group">
<label for="h-fdescription">
- User Pass
+ $i18n.getText("openmeetings.config.userpass.label")
<span class="aui-icon icon-required"></span>
<span class="content">required</span>
</label>
- <textarea id="h-fuserpass" name="userpass">omConfig.getOmUserPass()</textarea>
- </div>
+ <textarea id="h-fuserpass" name="userpass">$!omConfig.getOmUserPass()</textarea>
+ </div>
<div class="field-group">
<label for="h-fdescription">
- Key
+ $i18n.getText("openmeetings.config.key.label")
<span class="aui-icon icon-required"></span>
<span class="content">required</span>
</label>
- <textarea id="h-fkey" name="description">omConfig.getOmKey()</textarea>
+ <textarea id="h-fkey" name="description">$!omConfig.getOmKey()</textarea>
</div>
<div class="buttons">
- <input class="button" type="submit" value="Update">
- <a href="openmeetingscrud">Cancel</a>
+ <input class="button" type="submit" value="$i18n.getText("openmeetings.admin.save.label")">
+ <a href="$requestContext.baseUrl/plugins">$i18n.getText("openmeetings.rooms.cancel.label")</a>
</div>
</form>
</div>
Modified: incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/config/omconfig.vm
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/config/omconfig.vm?rev=1293032&r1=1293031&r2=1293032&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/config/omconfig.vm (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/config/omconfig.vm Thu Feb 23 23:44:09 2012
@@ -11,7 +11,7 @@
<form method="post" id="h" action="openmeetingsadmin" class="aui">
<div class="field-group">
<label for="h-furl">
- URL
+ $i18n.getText("openmeetings.config.url.label")
<span class="aui-icon icon-required"></span>
<span class="content">required</span>
</label>
@@ -19,7 +19,7 @@
</div>
<div class="field-group">
<label for="h-fport">
- Port
+ $i18n.getText("openmeetings.config.port.label")
<span class="aui-icon icon-required"></span>
<span class="content">required</span>
</label>
@@ -27,7 +27,7 @@
</div>
<div class="field-group">
<label for="h-fusername">
- Username
+ $i18n.getText("openmeetings.config.username.label")
<span class="aui-icon icon-required"></span>
<span class="content">required</span>
</label>
@@ -35,7 +35,7 @@
</div>
<div class="field-group">
<label for="h-fuserpass">
- Userpass
+ $i18n.getText("openmeetings.config.userpass.label")
<span class="aui-icon icon-required"></span>
<span class="content">required</span>
</label>
@@ -43,15 +43,15 @@
</div>
<div class="field-group">
<label for="h-fkey">
- Key
+ $i18n.getText("openmeetings.config.key.label")
<span class="aui-icon icon-required"></span>
<span class="content">required</span>
</label>
<input id="h-fkey" class="text long-field" type="text" name="key" value=$key>
</div>
<div class="buttons">
- <input class="button" type="submit" value="Save">
- <a href="/secure/AdminSummary.jspa">Cancel</a>
+ <input class="button" type="submit" value="$i18n.getText("openmeetings.admin.save.label")">
+ <a href="$requestContext.baseUrl/secure/AdminSummary.jspa">$i18n.getText("openmeetings.rooms.cancel.label")</a>
</div>
</form>
</div>
Modified: incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/customfields/room-select-list/view.vm
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/customfields/room-select-list/view.vm?rev=1293032&r1=1293031&r2=1293032&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/customfields/room-select-list/view.vm (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/customfields/room-select-list/view.vm Thu Feb 23 23:44:09 2012
@@ -1,4 +1,3 @@
#if ($value)
-##$!value.toString()
- <a href="$requestContext.baseUrl/plugins/servlet/openmeetingsrooms?enter=y&roomId=$textutils.htmlEncode($value.toString())">Link to room</a>
+ <a href="$requestContext.baseUrl/plugins/servlet/openmeetingsrooms?enter=y&roomId=$textutils.htmlEncode($value.toString())">$i18n.getText("openmeetings.rooms.enter.label")</a>
#end
\ No newline at end of file
Modified: incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/omrooms/edit.vm
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/omrooms/edit.vm?rev=1293032&r1=1293031&r2=1293032&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/omrooms/edit.vm (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/omrooms/edit.vm Thu Feb 23 23:44:09 2012
@@ -1,13 +1,13 @@
<html>
<head>
- <title>Edit Room — Room Edit</title>
+ <title>$i18n.getText("openmeetings.rooms.edit.titel.label")</title>
<meta name="decorator" content="atl.general">
</head>
<body class="page-type-admin">
<div class="content-container">
<div class="content-body">
- <h1>Edit Room $room.getName()</h1>
+ <h1>$i18n.getText("openmeetings.rooms.edit.titel.label"): $room.getName()</h1>
#if ($errors.size()>0)
<div class="aui-message error shadowed">
@@ -19,9 +19,7 @@
#end
</div>
<!-- .aui-message -->
- #end
-
- <h1>Create Room</h1>
+ #end
<div class="create-issue-panel">
<form method="post" id="h" action="openmeetingsrooms" class="aui">
@@ -40,11 +38,10 @@
Roomtype
</label>
<select name="roomType" id="om-roomtype" style="width: 30%;">
- <option value="1">Conference</option>
- <option value="2" #if ("$room.getRoomType()" == "2")selected#end>Interview</option>
- <option value="3" #if ("$room.getRoomType()" == "3")selected#end>20</option>
- <option value="4" #if ("$room.getRoomType()" == "4")selected#end>30</option>
- <option value="5" #if ("$room.getRoomType()" == "5")selected#end>60</option>
+ <option value="1" #if ("$room.getRoomType()" == "2")selected#end>$i18n.getText("openmeetings.rooms.edit.conference.label")</option>
+ <option value="2" #if ("$room.getRoomType()" == "2")selected#end>$i18n.getText("openmeetings.rooms.edit.audience.label")</option>
+ <option value="3" #if ("$room.getRoomType()" == "3")selected#end>$i18n.getText("openmeetings.rooms.edit.restricted.label")</option>
+ <option value="4" #if ("$room.getRoomType()" == "4")selected#end>$i18n.getText("openmeetings.rooms.edit.interview.label")</option>
</select>
</div>
<div class="field-group">
@@ -57,6 +54,8 @@
<option value="20" #if ("$room.getNumberOfParticipent()" == "20")selected#end>20</option>
<option value="30" #if ("$room.getNumberOfParticipent()" == "30")selected#end>30</option>
<option value="60" #if ("$room.getNumberOfParticipent()" == "60")selected#end>60</option>
+ <option value="100" #if ("$room.getNumberOfParticipent()" == "100")selected#end>100</option>
+ <option value="150" #if ("$room.getNumberOfParticipent()" == "150")selected#end>150</option>
</select>
</div>
<div class="field-group">
@@ -64,8 +63,8 @@
Is moderated
</label>
<select name="isModeratedRoom" id="om-is-moderated" style="width: 30%;">
- <option value="false" #if ("$room.getIsModeratedRoom()" == "false")selected#end>No</option>
- <option value="true" #if ("$room.getIsModeratedRoom()" == "true")selected#end>Yes</option>
+ <option value="false" #if ("$room.getIsModeratedRoom()" == "false")selected#end>$i18n.getText("openmeetings.rooms.no.label")</option>
+ <option value="true" #if ("$room.getIsModeratedRoom()" == "true")selected#end>$i18n.getText("openmeetings.rooms.yes.label")</option>
</select>
</div>
<div class="field-group">
@@ -73,8 +72,8 @@
Is audio only
</label>
<select name="isAudioOnly" id="om-is-moderated" style="width: 30%;">
- <option value="false" #if ("$room.getIsAudioOnly()" == "false")selected#end>No</option>
- <option value="true" #if ("$room.getIsAudioOnly()" == "true")selected#end>Yes</option>
+ <option value="false" #if ("$room.getIsAudioOnly()" == "false")selected#end>$i18n.getText("openmeetings.rooms.no.label")</option>
+ <option value="true" #if ("$room.getIsAudioOnly()" == "true")selected#end>$i18n.getText("openmeetings.rooms.yes.label")</option>
</select>
</div>
<div class="field-group">
@@ -82,12 +81,12 @@
Allow Recording
</label>
<select name="isAllowedRecording" id="om-allow-recording" style="width: 30%;">
- <option value="false" #if ("$room.getIsAllowedRecording()" == "false")selected#end>No</option>
- <option value="true" #if ("$room.getIsAllowedRecording()" == "true")selected#end>Yes</option>
+ <option value="false" #if ("$room.getIsAllowedRecording()" == "false")selected#end>$i18n.getText("openmeetings.rooms.no.label")</option>
+ <option value="true" #if ("$room.getIsAllowedRecording()" == "true")selected#end>$i18n.getText("openmeetings.rooms.yes.label")</option>
</select>
</div>
<div class="buttons">
- <input class="button" type="submit" value="Save">
+ <input class="button" type="submit" value=$i18n.getText("openmeetings.admin.save.label")>
<a href="openmeetingsrooms">Cancel</a>
</div>
</form>
Modified: incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/omrooms/list.vm
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/omrooms/list.vm?rev=1293032&r1=1293031&r2=1293032&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/omrooms/list.vm (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/omrooms/list.vm Thu Feb 23 23:44:09 2012
@@ -1,6 +1,6 @@
<html>
<head>
- <title>All Rooms — Room List</title>
+ <title>$i18n.getText("openmeetings.rooms.roomlist.label")</title>
<meta name="decorator" content="atl.general">
<script>
AJS.$(document).ready(function() {
@@ -28,7 +28,6 @@
<div class="content-body">
<h1>You've Got #if($rooms.size()==0)<span style="color:red">NO</span>#end Rooms!</h1>
-
#if ($errors.size()>0)
<div class="aui-message error shadowed">
#foreach($error in $errors)
@@ -46,37 +45,51 @@
<table class="aui">
<thead>
<tr>
- <th>RoomId</th>
- <th>Roomname</th>
- <th>Roomtype</th>
- <th>Participent</th>
- <th>Moderator</th>
- <th>Audio</th>
+ ##<th>$i18n.getText("openmeetings.rooms.roomid.label")</th>
+ <th>$i18n.getText("openmeetings.rooms.roomname.label")</th>
+ <th>$i18n.getText("openmeetings.rooms.roomtype.label")</th>
+ <th>$i18n.getText("openmeetings.rooms.participent.label")</th>
+ <th>$i18n.getText("openmeetings.rooms.ismoderated.label")</th>
+ <th>$i18n.getText("openmeetings.rooms.isaudio.label")</th>
<th></th>
</tr>
</thead>
<tbody>
#foreach( $room in $rooms )
<tr>
- <td>$room.getRoomId()</td>
+ ##<td>$room.getRoomId()</td>
<td>$room.getName()</td>
<td>
- #if($room.getRoomType())
- $room.getRoomType()
- #end
+ #if($room.getRoomType() == 1)
+ $i18n.getText("openmeetings.rooms.conference.label")
+ #elseif($room.getRoomType() == 2)
+ $i18n.getText("openmeetings.rooms.audience.label")
+ #elseif($room.getRoomType() == 3)
+ $i18n.getText("openmeetings.rooms.restricted.label")
+ #elseif($room.getRoomType() == 4)
+ $i18n.getText("openmeetings.rooms.interview.label")
+ #end
</td>
<td>
$room.getNumberOfParticipent()
</td>
<td>
- $room.getIsModeratedRoom()
+ #if($room.getIsModeratedRoom() == true)
+ $i18n.getText("openmeetings.rooms.yes.label")
+ #else
+ $i18n.getText("openmeetings.rooms.no.label")
+ #end
</td>
<td>
- $room.getIsAudioOnly()
+ #if( $room.getIsAudioOnly() == true)
+ $i18n.getText("openmeetings.rooms.yes.label")
+ #else
+ $i18n.getText("openmeetings.rooms.no.label")
+ #end
</td>
<td>
- <a href="openmeetingsrooms?edit=y&key=$room.getID()">Edit</a>
- <a href="openmeetingsrooms?delete=y&key=$room.getID()" class="delete-room" data-key="$room.getID()">Delete</a>
+ <a href="openmeetingsrooms?edit=y&key=$room.getID()">$i18n.getText("openmeetings.rooms.edit.label")</a>
+ <a href="openmeetingsrooms?delete=y&key=$room.getID()" class="delete-room" data-key="$room.getID()">$i18n.getText("openmeetings.rooms.delete.label")</a>
</td>
</tr>
#end
@@ -86,7 +99,7 @@
#end
<form method="get" action="openmeetingsrooms" class="aui">
<input type="hidden" name="new" value="y">
- <input type="submit" class="button" value="Create new room">
+ <input type="submit" class="button" value=$i18n.getText("openmeetings.rooms.createnewroom.label")>
</form>
</div>
</div>
Modified: incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/omrooms/new.vm
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/omrooms/new.vm?rev=1293032&r1=1293031&r2=1293032&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/omrooms/new.vm (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/omrooms/new.vm Thu Feb 23 23:44:09 2012
@@ -1,6 +1,6 @@
<html>
<head>
- <title>Create Issue — Issue CRUD Tutorial</title>
+ <title>$i18n.getText("openmeetings.rooms.createnewroom.label")</title>
<meta name="decorator" content="atl.general">
</head>
<body class="page-type-admin">
@@ -24,11 +24,10 @@
Roomtype
</label>
<select name="roomType" id="om-roomtype" style="width: 30%;">
- <option value="1">Conference</option>
- <option value="2" #if ("$cdman.cacheTimeout" == "600000")selected#end>Interview</option>
- <option value="3" #if ("$cdman.cacheTimeout" == "1200000")selected#end>20</option>
- <option value="4" #if ("$cdman.cacheTimeout" == "1800000")selected#end>30</option>
- <option value="5" #if ("$cdman.cacheTimeout" == "3600000")selected#end>60</option>
+ <option value="1">$i18n.getText("openmeetings.rooms.edit.conference.label")</option>
+ <option value="2">$i18n.getText("openmeetings.rooms.edit.audience.label")</option>
+ <option value="3">$i18n.getText("openmeetings.rooms.edit.restricted.label")</option>
+ <option value="4">$i18n.getText("openmeetings.rooms.edit.interview.label")</option>
</select>
</div>
<div class="field-group">
@@ -36,11 +35,13 @@
Nr. of Participent
</label>
<select name="numberOfParticipent" id="om-participent" style="width: 30%;">
- <option value="5" #if ("$cdman.cacheTimeout" == "300000")selected#end>5</option>
- <option value="10" #if ("$cdman.cacheTimeout" == "600000")selected#end>10</option>
- <option value="20" #if ("$cdman.cacheTimeout" == "1200000")selected#end>20</option>
- <option value="30" #if ("$cdman.cacheTimeout" == "1800000")selected#end>30</option>
- <option value="60" #if ("$cdman.cacheTimeout" == "3600000")selected#end>60</option>
+ <option value="5">5</option>
+ <option value="10">10</option>
+ <option value="20">20</option>
+ <option value="30">30</option>
+ <option value="60">60</option>
+ <option value="100">100</option>
+ <option value="150">150</option>
</select>
</div>
<div class="field-group">
@@ -48,8 +49,8 @@
Is moderated
</label>
<select name="isModeratedRoom" id="om-is-moderated" style="width: 30%;">
- <option value="false" #if ("$cdman.cacheTimeout" == "300000")selected#end>No</option>
- <option value="true" #if ("$cdman.cacheTimeout" == "600000")selected#end>Yes</option>
+ <option value="false">$i18n.getText("openmeetings.rooms.no.label")</option>
+ <option value="true">$i18n.getText("openmeetings.rooms.yes.label")</option>
</select>
</div>
<div class="field-group">
@@ -57,8 +58,8 @@
Is audio only
</label>
<select name="isAudioOnly" id="om-is-moderated" style="width: 30%;">
- <option value="false" #if ("$cdman.cacheTimeout" == "300000")selected#end>No</option>
- <option value="true" #if ("$cdman.cacheTimeout" == "600000")selected#end>Yes</option>
+ <option value="false">$i18n.getText("openmeetings.rooms.no.label")</option>
+ <option value="true">$i18n.getText("openmeetings.rooms.yes.label")</option>
</select>
</div>
<div class="field-group">
@@ -66,13 +67,13 @@
Allow Recording
</label>
<select name="isAllowedRecording" id="om-allow-recording" style="width: 30%;">
- <option value="false" #if ("$cdman.cacheTimeout" == "300000")selected#end>No</option>
- <option value="true" #if ("$cdman.cacheTimeout" == "600000")selected#end>Yes</option>
+ <option value="false">$i18n.getText("openmeetings.rooms.no.label")</option>
+ <option value="true">$i18n.getText("openmeetings.rooms.yes.label")</option>
</select>
</div>
<div class="buttons">
- <input class="button" type="submit" value="Create">
- <a href="openmeetingsrooms">Cancel</a>
+ <input class="button" type="submit" value="$i18n.getText("openmeetings.rooms.create.label")">
+ <a href="openmeetingsrooms">$i18n.getText("openmeetings.rooms.cancel.label")</a>
</div>
</form>
</div>