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 16:18:40 UTC
svn commit: r1293287 - in
/incubator/openmeetings/branches/jira-plugin/src/main:
java/org/openmeetings/jira/plugin/ao/omrooms/
java/org/openmeetings/jira/plugin/servlet/ resources/
resources/templates/config/
Author: eschwert
Date: Fri Feb 24 15:18:39 2012
New Revision: 1293287
URL: http://svn.apache.org/viewvc?rev=1293287&view=rev
Log:
OPENMEETINGS-60 redirect to login, configuration template improvements
Removed:
incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/config/adminedit.vm
incubator/openmeetings/branches/jira-plugin/src/main/resources/templates/config/adminnew.vm
Modified:
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/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/omconfig.vm
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=1293287&r1=1293286&r2=1293287&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 Fri Feb 24 15:18:39 2012
@@ -48,6 +48,16 @@ public final class RoomServiceImpl imple
{
return newArrayList(ao.find(Room.class, Query.select().where("IS_DELETED LIKE ?", false).limit(10)));
}
+
+ @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));
+
+ }
@Override
public Room update(Integer id, boolean isAllowedRecording,
@@ -83,15 +93,5 @@ 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/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=1293287&r1=1293286&r2=1293287&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 Fri Feb 24 15:18:39 2012
@@ -11,6 +11,7 @@ import org.openmeetings.jira.plugin.ao.a
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.atlassian.crowd.embedded.api.User;
+import com.atlassian.sal.api.auth.LoginUriProvider;
import com.atlassian.sal.api.user.UserManager;
import com.atlassian.templaterenderer.TemplateRenderer;
import com.google.common.collect.Maps;
@@ -22,22 +23,24 @@ public class AdminServlet extends HttpSe
private final UserManager userManager;
private TemplateRenderer templateRenderer;
private com.atlassian.jira.user.util.UserManager jiraUserManager;
+ private final LoginUriProvider loginUriProvider;
- private OmPluginSettings omPluginSettings;
-
+ private OmPluginSettings omPluginSettings;
private static final String OM_CONFIG_TEMPLATE = "/templates/config/omconfig.vm";
public AdminServlet(com.atlassian.jira.user.util.UserManager jiraUserManager,
TemplateRenderer templateRenderer,
UserManager userManager,
- OmPluginSettings omPluginSettings)
+ OmPluginSettings omPluginSettings,
+ LoginUriProvider loginUriProvider)
{
this.userManager = userManager;
this.templateRenderer = templateRenderer;
this.jiraUserManager = jiraUserManager;
//this.pluginSettingsFactory = pluginSettingsFactory;
this.omPluginSettings = omPluginSettings;
+ this.loginUriProvider = loginUriProvider;
}
@@ -50,6 +53,9 @@ public class AdminServlet extends HttpSe
{
redirectToLogin(request, response);
return;
+ }else if(username == null){
+ redirectToLogin(request, response);
+ return;
}
/////////
@@ -103,16 +109,7 @@ public class AdminServlet extends HttpSe
}
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- Map params = request.getParameterMap();
-
- User user = getCurrentUser(request);
-
- if ("y".equals(request.getParameter("edit"))) {
-
-
- response.sendRedirect(request.getContextPath() + "secure/AdminSummary.jspa");
-
- } else {
+
String url = request.getParameter("url");
String port = request.getParameter("port");
String userpass = request.getParameter("userpass");
@@ -123,19 +120,17 @@ public class AdminServlet extends HttpSe
omPluginSettings.storeSomeInfo("port", port);
omPluginSettings.storeSomeInfo("userpass", userpass);
omPluginSettings.storeSomeInfo("username", username);
- omPluginSettings.storeSomeInfo("key", key);
-
+ omPluginSettings.storeSomeInfo("key", key);
- response.sendRedirect(request.getContextPath() + "/plugins/servlet/openmeetingsadmin");
- }
+ //response.sendRedirect(request.getContextPath() + "/plugins/servlet/openmeetingsadmin");
+ response.sendRedirect(request.getContextPath() + "/secure/AdminSummary.jspa");
+
}
-
-
private void redirectToLogin(HttpServletRequest request, HttpServletResponse response) throws IOException
{
- //response.sendRedirect(loginUriProvider.getLoginUri(getUri(request)).toASCIIString());
+ response.sendRedirect(loginUriProvider.getLoginUri(getUri(request)).toASCIIString());
}
private URI getUri(HttpServletRequest request)
@@ -147,31 +142,6 @@ public class AdminServlet extends HttpSe
builder.append(request.getQueryString());
}
return URI.create(builder.toString());
- }
+ }
- 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));
- }
-
-// public void storeSomeInfo(String key, String value) {
-// // createGlobalSettings is nice and fast, so there's no need to cache it (it's memoised when necessary).
-// pluginSettingsFactory.createGlobalSettings().put("openmeetings:" + key, value);
-//
-// }
-//
-// public Object getSomeInfo(String key) {
-// return pluginSettingsFactory.createGlobalSettings().get("openmeetings:" + key);
-// }
-//
-// public void storeSomeInfo(String projectKey, String key, String value) {
-// // createSettingsForKey is nice and fast, so there's no need to cache it (it's memoised when necessary).
-// pluginSettingsFactory.createSettingsForKey(projectKey).put("openmeetings:" + key, value);
-// }
-//
-// public Object getSomeInfo(String projectKey, String key) {
-// return pluginSettingsFactory.createSettingsForKey(projectKey).get("openmeetings:" + key);
-// }
}
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=1293287&r1=1293286&r2=1293287&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 Fri Feb 24 15:18:39 2012
@@ -4,6 +4,7 @@ package org.openmeetings.jira.plugin.ser
import static com.google.common.base.Preconditions.checkNotNull;
import java.io.IOException;
+import java.net.URI;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -41,8 +42,7 @@ public final class RoomsServlet extends
private com.atlassian.jira.user.util.UserManager jiraUserManager;
private String roomURL;
protected final VelocityRequestContextFactory requestContextFactory;
- private OmPluginSettings omPluginSettings;
-
+ private OmPluginSettings omPluginSettings;
private final AvatarManager avatarManager;
@@ -61,7 +61,7 @@ public final class RoomsServlet extends
this.userManager = userManager;
this.avatarManager = avatarManager;
this.requestContextFactory = requestContextFactory;
- this.omPluginSettings = omPluginSettings;
+ this.omPluginSettings = omPluginSettings;
}
@@ -76,13 +76,13 @@ public final class RoomsServlet extends
return jiraUserManager.getUserObject(userManager.getRemoteUsername(req));
}
+
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
{
User currentUser = getCurrentUser(req);
//User currentUser2 = ComponentManager.getInstance().getJiraAuthenticationContext().getLoggedInUser();
-
-
+
if ("y".equals(req.getParameter("new"))) {
// Renders new.vm template if the "new" parameter is passed
// Create an empty context map to pass into the render method
@@ -187,7 +187,6 @@ public final class RoomsServlet extends
//User currentUser2 = ComponentManager.getInstance().getJiraAuthenticationContext().getLoggedInUser();
//User user2 = (User) ComponentManager.getInstance().getJiraAuthenticationContext().getUser();
-
if ("y".equals(req.getParameter("edit"))) {
Boolean isAllowedRecording = Boolean.valueOf(req.getParameter("isAllowedRecording"));
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=1293287&r1=1293286&r2=1293287&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 Fri Feb 24 15:18:39 2012
@@ -5,11 +5,13 @@
<description>${project.description}</description>
<version>${project.version}</version>
<vendor name="${project.organization.name}" url="${project.organization.url}"/>
- <!--<param name="configure.url">/secure/OmConfig.jspa</param>-->
+ <!--<application-version min="4.0" max="5.0"/>-->
<param name="configure.url">/plugins/servlet/openmeetingsadmin</param>
</plugin-info>
+
<web-section key="om_config_section" location="integrations_section">
<label key="OpenMeetings Setup"/>
+ <condition class="com.atlassian.jira.plugin.webfragment.conditions.UserIsAdminCondition"/>
</web-section>
<web-item key="om_config" section="integrations_section/om_config_section">
<label>OpenMeetings Setup</label>
@@ -31,30 +33,38 @@
<label>Create Room</label>
<link linkId="create_room_link" absolute="false">/plugins/servlet/openmeetingsrooms?new=y</link>/>
</web-item>
+
<servlet name="Openmeetings admin" i18n-name-key="openmeetings-admin.name" key="openmeetings-admin" class="org.openmeetings.jira.plugin.servlet.AdminServlet">
<description key="openmeetings-admin.description">The Openmeetings Admin Plugin</description>
<url-pattern>/openmeetingsadmin</url-pattern>
+ <condition class="com.atlassian.jira.plugin.webfragment.conditions.UserIsAdminCondition"/>
</servlet>
<servlet name="Openmeetings Rooms" i18n-name-key="openmeetings-room.name" key="openmeetings-room" class="org.openmeetings.jira.plugin.servlet.RoomsServlet">
<description key="openmeetings-room.description">The Openmeetings Rooms Plugin</description>
<url-pattern>/openmeetingsrooms</url-pattern>
</servlet>
+
<resource type="i18n" name="i18n" location="atlassian-plugin"/>
+
<component-import key="templateRenderer" interface="com.atlassian.templaterenderer.TemplateRenderer"/>
- <component-import key="userManager" interface="com.atlassian.sal.api.user.UserManager"/>
+ <component-import key="userManager" interface="com.atlassian.sal.api.user.UserManager"/>
+
<customfield-type name="Room Select List" i18n-name-key="room-select-list.name" key="room-select-list" class="org.openmeetings.jira.plugin.jira.customfields.RoomSelectList">
<description key="room-select-list.description">The Room Select List Plugin allow to select one OpenMeetings room from roomlist.</description>
<resource name="view" type="velocity" location="/templates/customfields/room-select-list/view.vm"/>
<resource name="edit" type="velocity" location="/templates/customfields/room-select-list/edit.vm"/>
</customfield-type>
+
<!--AO to persist chosen admin configuration -->
<ao key="openmeetings-ao-module">
<description>The module configuring the Active Objects service used by JIRA-OPENMEETINGS plugin</description>
<entity>org.openmeetings.jira.plugin.ao.omrooms.Room</entity>
</ao>
+
<component-import key="ao" name="Active Objects components" interface="com.atlassian.activeobjects.external.ActiveObjects">
<description>Access to the Active Objects service</description>
</component-import>
+ <component-import key="loginUriProvider" interface="com.atlassian.sal.api.auth.LoginUriProvider" />
<component-import key="pluginSettingsFactory" interface="com.atlassian.sal.api.pluginsettings.PluginSettingsFactory"/>
<component key="tx-processor" name="Transactional Annotation Processor" class="com.atlassian.activeobjects.external.TransactionalAnnotationProcessor">
<decription>Processes @Transactional annotations.</decription>
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=1293287&r1=1293286&r2=1293287&view=diff
==============================================================================
--- incubator/openmeetings/branches/jira-plugin/src/main/resources/i18n.properties (original)
+++ incubator/openmeetings/branches/jira-plugin/src/main/resources/i18n.properties Fri Feb 24 15:18:39 2012
@@ -33,9 +33,10 @@ 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.rooms.enter.label=Link to Web-Conferencing
openmeetings.config.titel.label=Edit OpenMeetings Configuration
+openmeetings.config.titel.h1.label=OpenMeetings Configuration
openmeetings.config.server.label=Edit Server Configuration
openmeetings.config.url.label=URL
openmeetings.config.port.label=Port
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=1293287&r1=1293286&r2=1293287&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 Fri Feb 24 15:18:39 2012
@@ -1,12 +1,14 @@
<html>
<head>
<title>OpenMeetings Admin — </title>
- <meta name="decorator" content="atl.general">
+ <meta name="decorator" content="atl.admin">
</head>
<body class="page-type-admin">
+<div class="admin-headers">
+ <h1 id="admin-page-heading">$i18n.getText("openmeetings.config.titel.h1.label")</h1>
+</div>
<div class="content-container">
- <div class="content-body">
- <h1>OpenMeetings Configuration</h1>
+ <div class="content-body">
<div class="create-issue-panel">
<form method="post" id="h" action="openmeetingsadmin" class="aui">
<div class="field-group">
@@ -39,7 +41,7 @@
<span class="aui-icon icon-required"></span>
<span class="content">required</span>
</label>
- <input id="h-fuserpass" class="text long-field" type="text" name="userpass" value=$userpass>
+ <input id="h-fuserpass" class="text long-field" type="password" name="userpass" value=$userpass>
</div>
<div class="field-group">
<label for="h-fkey">
@@ -51,7 +53,7 @@
</div>
<div class="buttons">
<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>
+ <!-- <a href=$requestContext.baseUrl()"/secure/AdminSummary.jspa">$i18n.getText("openmeetings.rooms.cancel.label")</a>-->
</div>
</form>
</div>