Author: solomax
Date: Wed Feb 25 06:01:57 2015
New Revision: 1662170
URL: http://svn.apache.org/r1662170
Log:
Minor issues are fixed, copy/paste is reduced
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css
openmeetings/trunk/singlewebapp/pom.xml
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java?rev=1662170&r1=1662169&r2=1662170&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
Wed Feb 25 06:01:57 2015
@@ -78,10 +78,10 @@ public class LdapConfigDao implements ID
log.debug("addLdapConfig :2: " + insertedby);
ldapConfig = em.merge(ldapConfig);
- Long ldapConfigId = ldapConfig.getId();
+ Long id = ldapConfig.getId();
- if (ldapConfigId != null) {
- return ldapConfigId;
+ if (id != null) {
+ return id;
} else {
throw new Exception("Could not store
SOAPLogin");
}
@@ -99,10 +99,10 @@ public class LdapConfigDao implements ID
ldapConfig.setInserted(new Date());
ldapConfig = em.merge(ldapConfig);
- Long ldapConfigId = ldapConfig.getId();
+ Long id = ldapConfig.getId();
- if (ldapConfigId != null) {
- return ldapConfigId;
+ if (id != null) {
+ return id;
} else {
throw new Exception("Could not store
SOAPLogin");
}
@@ -113,12 +113,12 @@ public class LdapConfigDao implements ID
return null;
}
- public Long updateLdapConfig(Long ldapConfigId, String name,
+ public Long updateLdapConfig(Long id, String name,
Boolean addDomainToUserName, String configFileName,
String domain,
Long updatedby, Boolean isActive) {
try {
- LdapConfig ldapConfig = get(ldapConfigId);
+ LdapConfig ldapConfig = get(id);
if (ldapConfig == null) {
return -1L;
@@ -139,9 +139,9 @@ public class LdapConfigDao implements ID
log.debug("updateLdapConfig :2: " + updatedby);
ldapConfig = em.merge(ldapConfig);
- ldapConfigId = ldapConfig.getId();
+ id = ldapConfig.getId();
- return ldapConfigId;
+ return id;
} catch (Exception ex2) {
log.error("[updateLdapConfig]: ", ex2);
@@ -149,11 +149,11 @@ public class LdapConfigDao implements ID
return -1L;
}
- public LdapConfig get(long ldapConfigId) {
+ public LdapConfig get(long id) {
try {
TypedQuery<LdapConfig> query =
em.createNamedQuery("getLdapConfigById", LdapConfig.class);
- query.setParameter("id", ldapConfigId);
+ query.setParameter("id", id);
LdapConfig ldapConfig = null;
try {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html?rev=1662170&r1=1662169&r2=1662170&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
Wed Feb 25 06:01:57 2015
@@ -45,7 +45,7 @@
<table class="adminListTable">
<tbody
wicket:id="listContainer">
<tr wicket:id="ldapList">
- <td
class="three_column_layout_column1"><div
class="three_column_layout_divcolumn1"><span
wicket:id="ldapConfigId"></span></div></td>
+ <td
class="three_column_layout_column1"><div
class="three_column_layout_divcolumn1"><span wicket:id="id"></span></div></td>
<td
class="three_column_layout_column2"><div
class="three_column_layout_divcolumn2"><span wicket:id="name"></span></div></td>
<td
class="three_column_layout_column3"><div
class="three_column_layout_divcolumn3"><span
wicket:id="configFileName"></span></div></td>
</tr>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1662170&r1=1662169&r2=1662170&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
Wed Feb 25 06:01:57 2015
@@ -59,7 +59,7 @@ public class LdapsPanel extends AdminPan
@Override
protected void populateItem(final Item<LdapConfig>
item) {
final LdapConfig lc = item.getModelObject();
- item.add(new Label("ldapConfigId", "" +
lc.getId()));
+ item.add(new Label("id", "" + lc.getId()));
item.add(new Label("name", "" + lc.getName()));
item.add(new Label("configFileName", "" +
lc.getConfigFileName()));
item.add(new AjaxEventBehavior("onclick") {
@@ -86,7 +86,7 @@ public class LdapsPanel extends AdminPan
}
};
DataViewContainer<LdapConfig> container = new
DataViewContainer<LdapConfig>(listContainer, dataView, navigator);
- container.addLink(new OmOrderByBorder<LdapConfig>("orderById",
"ldapConfigId", container))
+ container.addLink(new OmOrderByBorder<LdapConfig>("orderById",
"id", container))
.addLink(new OmOrderByBorder<LdapConfig>("orderByName",
"name", container))
.addLink(new OmOrderByBorder<LdapConfig>("orderByFile",
"configFileName", container));
add(container.getLinks());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java?rev=1662170&r1=1662169&r2=1662170&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
Wed Feb 25 06:01:57 2015
@@ -18,68 +18,45 @@
*/
package org.apache.openmeetings.web.app;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-
import org.apache.openmeetings.db.entity.user.User.Type;
import org.apache.wicket.authentication.strategy.DefaultAuthenticationStrategy;
import org.apache.wicket.util.string.Strings;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
public class OmAuthenticationStrategy extends DefaultAuthenticationStrategy {
- /** The separator used to concatenate the username and password */
- private static final String VALUE_SEPARATOR = "-sep-";
private static final String COOKIE_KEY = "LoggedIn";
- private static final Logger log =
Red5LoggerFactory.getLogger(OmAuthenticationStrategy.class, webAppRootKey);
- /** The cookie name to store the username/password/type/domain */
- private final String cookieKey;
public OmAuthenticationStrategy() {
super(COOKIE_KEY);
- cookieKey = COOKIE_KEY;
}
/**
- * @see org.apache.wicket.authentication.IAuthenticationStrategy#load()
+ * @see DefaultAuthenticationStrategy#decode(String value)
+ * Additionally decodes stored login type and domain
*/
@Override
- public String[] load() {
- String value = getCookieUtils().load(cookieKey);
- if (Strings.isEmpty(value) == false) {
- try {
- value = getCrypt().decryptUrlSafe(value);
- } catch (RuntimeException e) {
- log.info("Error decrypting login cookie: {}.
The cookie will be deleted. Possible cause is that a "
- + "session-relative encryption
key was used to encrypt this cookie while this decryption attempt "
- + "is happening in a different
session, eg user coming back to the application after session expiration",
- cookieKey);
- getCookieUtils().remove(cookieKey);
- value = null;
+ protected String[] decode(String value) {
+ if (!Strings.isEmpty(value)) {
+ String username = null;
+ String password = null;
+ String type = null;
+ String domainId = null;
+
+ String[] values = value.split(VALUE_SEPARATOR);
+ if (values.length > 0 && !Strings.isEmpty(values[0])) {
+ username = values[0];
}
- if (!Strings.isEmpty(value)) {
- String username = null;
- String password = null;
- String type = null;
- String domainId = null;
-
- String[] values = value.split(VALUE_SEPARATOR);
- if (values.length > 0 &&
!Strings.isEmpty(values[0])) {
- username = values[0];
- }
- if (values.length > 1 &&
!Strings.isEmpty(values[1])) {
- password = values[1];
- }
- if (values.length > 2 &&
!Strings.isEmpty(values[2])) {
- type = values[2];
- }
- if (values.length > 3 &&
!Strings.isEmpty(values[3])) {
- domainId = values[3];
- }
-
- return new String[] { username, password, type,
domainId };
+ if (values.length > 1 && !Strings.isEmpty(values[1])) {
+ password = values[1];
+ }
+ if (values.length > 2 && !Strings.isEmpty(values[2])) {
+ type = values[2];
+ }
+ if (values.length > 3 && !Strings.isEmpty(values[3])) {
+ domainId = values[3];
}
- }
+ return new String[] { username, password, type,
domainId };
+ }
return null;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1662170&r1=1662169&r2=1662170&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
Wed Feb 25 06:01:57 2015
@@ -230,7 +230,7 @@ public class SignInDialog extends Abstra
domain = ldaps.get(selectedLdap < ldaps.size() &&
selectedLdap > 0 ? selectedLdap : 0);
add(new WebMarkupContainer("ldap")
.add(new DropDownChoice<LdapConfig>("domain",
new PropertyModel<LdapConfig>(SignInDialog.this, "domain")
- , ldaps, new
ChoiceRenderer<LdapConfig>("name", "ldapConfigId"))).setVisible(ldaps.size() >
1));
+ , ldaps, new
ChoiceRenderer<LdapConfig>("name", "id"))).setVisible(ldaps.size() > 1));
add(new CheckBox("rememberMe", new
PropertyModel<Boolean>(SignInDialog.this,
"rememberMe")).setOutputMarkupId(true));
add(new AjaxButton("submit") { //FAKE button so
"submit-on-enter" works as expected
private static final long serialVersionUID = 1L;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css?rev=1662170&r1=1662169&r2=1662170&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css
Wed Feb 25 06:01:57 2015
@@ -51,6 +51,9 @@ html, body {
max-height: 30px;
overflow-y: hidden;
}
+#menu .ui-menubar.ui-widget-header.ui-helper-clearfix, #roomMenu
.ui-menubar.ui-widget-header.ui-helper-clearfix {
+ border-right: 0;
+}
.ui-menubar .ui-menu {
width: 250px;
}
@@ -76,9 +79,10 @@ html, body {
font-size: 1em;
color: #FF0000;
height: 30px;
+ border: 0;
}
#busy_indicator span {
- margin-top: 5px;
+ vertical-align: sub;
}
.clickable {
cursor: pointer;
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1662170&r1=1662169&r2=1662170&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Wed Feb 25 06:01:57 2015
@@ -41,7 +41,7 @@
<maven.javadoc.version>2.10.1</maven.javadoc.version>
<maven.surefire.version>2.18.1</maven.surefire.version>
<maven-site.version>3.4</maven-site.version>
- <wicket.version>7.0.0-M5</wicket.version>
+ <wicket.version>7.0.0-SNAPSHOT</wicket.version>
<wicketju.version>7.0.0-SNAPSHOT</wicketju.version>
<wickets.version>7.0.0-M5</wickets.version>
<red5-server.version>1.0.5-RELEASE</red5-server.version>
