[kune-commits] r1871 - in trunk: script src/main/java/cc/kune/core/client/i18n src/main/java/cc/kune/core/public src/main/java/cc/kune/domain src/main/webapp
Vicente J. Ruiz Jurado
vjrj_ at ourproject.org
Mon May 21 01:23:25 CEST 2012
Author: vjrj_
Date: 2012-05-21 01:23:25 +0200 (Mon, 21 May 2012)
New Revision: 1871
Added:
trunk/script/liquibase-compare.sh
Modified:
trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java
trunk/src/main/java/cc/kune/core/public/mante.html
trunk/src/main/java/cc/kune/domain/I18nLanguage.java
trunk/src/main/java/cc/kune/domain/License.java
trunk/src/main/java/cc/kune/domain/ToolConfiguration.java
trunk/src/main/java/cc/kune/domain/User.java
trunk/src/main/webapp/ws.html
Log:
NEW - # 273: Some http usage breaks SSL
http://kune.ourproject.org/issues/ticket/273
Added: trunk/script/liquibase-compare.sh
===================================================================
--- trunk/script/liquibase-compare.sh (rev 0)
+++ trunk/script/liquibase-compare.sh 2012-05-20 23:23:25 UTC (rev 1871)
@@ -0,0 +1,13 @@
+. script/mvn-vars.sh
+java -jar $M2_REPO/org/liquibase/liquibase-core/1.8.1/liquibase-core-1.8.1.jar \
+ --driver=com.mysql.jdbc.Driver \
+ --classpath=$M2_REPO/mysql/mysql-connector-java/5.0.5/mysql-connector-java-5.0.5.jar \
+ --url=jdbc:mysql://localhost/kune_dev \
+ --username=kune \
+ --password=db4kune \
+ diffChangeLog \
+ --baseUrl=jdbc:mysql://localhost/kune_prod \
+ --baseUsername=kune \
+ --basePassword=db4kune
+# later version referenceUrl, etc
+# diff instead of diffChangeLog
\ No newline at end of file
Property changes on: trunk/script/liquibase-compare.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2012-05-20 21:38:34 UTC (rev 1870)
+++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2012-05-20 23:23:25 UTC (rev 1871)
@@ -170,14 +170,16 @@
* String value of the new locale to go to.
*/
private void changeLanguageInUrl(final String newLocale) {
- final String hash = WindowUtils.getLocation().getHash();
- final String query = WindowUtils.getLocation().getQueryString();
+ Location location = WindowUtils.getLocation();
+ final String hash = location.getHash();
+ final String query = location.getQueryString();
+ final String protocol = location.getProtocol();
final String newUrl = I18nUrlUtils.changeLang(query + (TextUtils.notEmpty(hash) ? hash : ""),
newLocale);
Log.info("Locale current query: " + query);
Log.info("Locale current hash: " + hash);
Log.info("Locale new Url: " + newUrl);
- changeHref("http://" + WindowUtils.getLocation().getHost() + newUrl);
+ changeHref(protocol + "//" + location.getHost() + newUrl);
}
public void changeToLanguageIfNecessary(final String wantedLang, final String wantedLangEnglishName,
Modified: trunk/src/main/java/cc/kune/core/public/mante.html
===================================================================
--- trunk/src/main/java/cc/kune/core/public/mante.html 2012-05-20 21:38:34 UTC (rev 1870)
+++ trunk/src/main/java/cc/kune/core/public/mante.html 2012-05-20 23:23:25 UTC (rev 1871)
@@ -4,8 +4,7 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<title>System Down for Maintenance</title>
<link rel="shortcut icon" href="/favicon.ico" />
- <link rel="stylesheet" type="text/css"
- href="http://yui.yahooapis.com/2.8.0r4/build/reset/reset-min.css">
+ <link rel="stylesheet" type="text/css" href="css/reset.css">
<!-- FIXME: make something local -->
<script src="//ajax.googleapis.com/ajax/libs/webfont/1/webfont.js"></script>
<script>
@@ -15,13 +14,9 @@
}
});
</script>
- <link
- href='http://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold,bolditalic'
- rel='stylesheet' type='text/css'>
- <link type="text/css" rel="stylesheet" href="kune-common.css">
- <link type="text/css" rel="stylesheet"
- href="fontface/ubuntufontface.css">
- <link type="text/css" rel="stylesheet" href="ws.css">
+ <link href='css/reset.css' rel='stylesheet' type='text/css'>
+ <link type="text/css" rel="stylesheet" href="ws/kune-common.css">
+ <link type="text/css" rel="stylesheet" href="ws/ws.css">
<style type="text/css">
@@ -150,9 +145,9 @@
~<br/>
Estamos realizando mantenimiento de nuestros equipos. Perdonad las molestias.</strong>
- <span id="k-mante-bottom"> Note: if you need more technical info,
+ <div id="k-mante-bottom"> Note: if you need more technical info,
<a href="http://bit.ly/pAxNVB">
- join irc channel #kune on freenode</a></span>
+ join irc channel #kune on freenode</a></div>
</div>
<!-- div k-mante-row -->
Modified: trunk/src/main/java/cc/kune/domain/I18nLanguage.java
===================================================================
--- trunk/src/main/java/cc/kune/domain/I18nLanguage.java 2012-05-20 21:38:34 UTC (rev 1870)
+++ trunk/src/main/java/cc/kune/domain/I18nLanguage.java 2012-05-20 23:23:25 UTC (rev 1871)
@@ -19,6 +19,7 @@
*/
package cc.kune.domain;
+import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -83,7 +84,8 @@
@Column(name = "iso_639_3", length = 3, unique = true)
private String iso6393;
- @Column(name = "macro_language")
+ @Basic
+ @Column(name = "macro_language", columnDefinition = "BIT", length = 1)
private Boolean macroLanguage;
@Field(index = Index.YES, store = Store.NO)
Modified: trunk/src/main/java/cc/kune/domain/License.java
===================================================================
--- trunk/src/main/java/cc/kune/domain/License.java 2012-05-20 21:38:34 UTC (rev 1870)
+++ trunk/src/main/java/cc/kune/domain/License.java 2012-05-20 23:23:25 UTC (rev 1871)
@@ -19,6 +19,7 @@
*/
package cc.kune.domain;
+import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -38,11 +39,19 @@
@Column(nullable = false)
private String imageUrl;
-
+
+ @Basic
+ @Column(columnDefinition = "BIT", length = 1)
private boolean isCC;
-
+
+ @Basic
+ @Column(columnDefinition = "BIT", length = 1)
private boolean isCopyleft;
+
+ @Basic
+ @Column(columnDefinition = "BIT", length = 1)
private boolean isDeprecated;
+
@Column(unique = true)
private String longName;
private String rdf;
Modified: trunk/src/main/java/cc/kune/domain/ToolConfiguration.java
===================================================================
--- trunk/src/main/java/cc/kune/domain/ToolConfiguration.java 2012-05-20 21:38:34 UTC (rev 1870)
+++ trunk/src/main/java/cc/kune/domain/ToolConfiguration.java 2012-05-20 23:23:25 UTC (rev 1871)
@@ -19,7 +19,9 @@
*/
package cc.kune.domain;
+import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
@@ -30,6 +32,8 @@
@Table(name = "tool_configurations")
public class ToolConfiguration {
+ @Basic
+ @Column(columnDefinition = "BIT", length = 1)
private boolean enabled;
@Id
@GeneratedValue
Modified: trunk/src/main/java/cc/kune/domain/User.java
===================================================================
--- trunk/src/main/java/cc/kune/domain/User.java 2012-05-20 21:38:34 UTC (rev 1870)
+++ trunk/src/main/java/cc/kune/domain/User.java 2012-05-20 23:23:25 UTC (rev 1871)
@@ -95,7 +95,9 @@
@Enumerated(EnumType.STRING)
private EmailNotificationFrequency emailNotifFreq;
-
+
+ @Basic
+ @Column(columnDefinition = "BIT", length = 1)
private Boolean emailVerified;
@Id
Modified: trunk/src/main/webapp/ws.html
===================================================================
--- trunk/src/main/webapp/ws.html 2012-05-20 21:38:34 UTC (rev 1870)
+++ trunk/src/main/webapp/ws.html 2012-05-20 23:23:25 UTC (rev 1871)
@@ -51,7 +51,7 @@
})();
</script>
<link
- href='http://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold,bolditalic'
+ href='https://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold,bolditalic'
rel='stylesheet' type='text/css'>
<link type="text/css" rel="stylesheet" href="css/reset.css">
<link type="text/css" rel="stylesheet" href="ws/gxt/css/gxt-all.css">
More information about the kune-commits
mailing list