[kune-commits] r1317 - in trunk/src/main/java/cc/kune: common common/client/actions/gwtui common/public core/client/sitebar core/client/state core/public docs/client/viewers domain msgs wave
Vicente J. Ruiz Jurado
vjrj_ at ourproject.org
Mon Apr 18 19:25:11 CEST 2011
Author: vjrj_
Date: 2011-04-18 19:25:02 +0200 (Mon, 18 Apr 2011)
New Revision: 1317
Modified:
trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml
trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java
trunk/src/main/java/cc/kune/common/public/kune-common.css
trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java
trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java
trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java
trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java
trunk/src/main/java/cc/kune/core/public/ws.css
trunk/src/main/java/cc/kune/docs/client/viewers/DocViewerPanel.java
trunk/src/main/java/cc/kune/docs/client/viewers/DocViewerPanel.ui.xml
trunk/src/main/java/cc/kune/docs/client/viewers/FolderViewerPresenter.java
trunk/src/main/java/cc/kune/domain/Comment.java
trunk/src/main/java/cc/kune/domain/Container.java
trunk/src/main/java/cc/kune/domain/Content.java
trunk/src/main/java/cc/kune/msgs/KuneMsgs.gwt.xml
trunk/src/main/java/cc/kune/wave/KuneWave.gwt.xml
Log:
More work in docs
Modified: trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml
===================================================================
--- trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml 2011-04-18 11:45:11 UTC (rev 1316)
+++ trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml 2011-04-18 17:25:02 UTC (rev 1317)
@@ -2,12 +2,6 @@
<module>
<!-- Inherit the core Web Toolkit stuff. -->
<inherits name='com.google.gwt.user.User' />
- <!-- Inherit the default GWT style sheet. You can change -->
- <!-- the theme of your GWT application by uncommenting -->
- <!-- any one of the following lines. -->
- <!-- <inherits name='com.google.gwt.user.theme.standard.Standard'/> -->
- <!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
- <!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> -->
<!-- Other module inherits -->
<!-- Specify the app entry point class. -->
<!-- <entry-point class='cc.kune.msgs.client.KuneMessagesSampleEntryPoint'
Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2011-04-18 11:45:11 UTC (rev 1316)
+++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2011-04-18 17:25:02 UTC (rev 1317)
@@ -73,7 +73,7 @@
} else {
button = new Button();
}
- button.addStyleName("oc-button");
+ button.addStyleName("k-button");
button.addStyleName("k-btn");
button.addStyleName("k-5corners");
layout();
Modified: trunk/src/main/java/cc/kune/common/public/kune-common.css
===================================================================
--- trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-04-18 11:45:11 UTC (rev 1316)
+++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-04-18 17:25:02 UTC (rev 1317)
@@ -160,7 +160,7 @@
margin: 5px;
}
-.k-dialog-btn,.k-btn {
+.k-dialog-btn {
text-shadow: 1px 1px 1px #FFFFFF;
font-weight: bold;
-moz-user-select: none;
Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java 2011-04-18 11:45:11 UTC (rev 1316)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java 2011-04-18 17:25:02 UTC (rev 1317)
@@ -52,7 +52,7 @@
@Inject
public SitebarNewGroupLink(final SitebarNewGroupAction action) {
super(action);
- setStyles("k-no-backimage, k-btn-sitebar, k-fl");
+ setStyles("k-no-backimage, k-btn-sitebar, k-fl, k-noborder, k-nobackcolor");
setParent(SitebarActionsPresenter.RIGHT_TOOLBAR);
}
}
Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java 2011-04-18 11:45:11 UTC (rev 1316)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java 2011-04-18 17:25:02 UTC (rev 1317)
@@ -63,7 +63,7 @@
// setParent(SitebarActionsPresenter.RIGHT_TOOLBAR);
setId(SITE_SIGN_IN);
setVisible(!session.isLogged());
- setStyles("k-no-backimage, k-btn-sitebar, k-fl");
+ setStyles("k-no-backimage, k-btn-sitebar, k-fl, k-noborder, k-nobackcolor");
setParent(SitebarActionsPresenter.RIGHT_TOOLBAR);
session.onUserSignIn(true, new UserSignInHandler() {
@Override
Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java 2011-04-18 11:45:11 UTC (rev 1316)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java 2011-04-18 17:25:02 UTC (rev 1317)
@@ -135,7 +135,7 @@
setId(SITE_SIGN_OUT);
setParent(SitebarActionsPresenter.RIGHT_TOOLBAR);
setVisible(session.isLogged());
- setStyles("k-no-backimage, k-btn-sitebar, k-fl");
+ setStyles("k-no-backimage, k-btn-sitebar, k-fl, k-noborder, k-nobackcolor");
session.onUserSignIn(true, new UserSignInHandler() {
@Override
public void onUserSignIn(final UserSignInEvent event) {
Modified: trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java 2011-04-18 11:45:11 UTC (rev 1316)
+++ trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java 2011-04-18 17:25:02 UTC (rev 1317)
@@ -42,7 +42,7 @@
this.server = server;
this.eventBus = eventBus;
this.cacheMap = new HashMap<StateToken, StateAbstractDTO>();
- useCache = true;
+ useCache = false;
}
@Override
Modified: trunk/src/main/java/cc/kune/core/public/ws.css
===================================================================
--- trunk/src/main/java/cc/kune/core/public/ws.css 2011-04-18 11:45:11 UTC (rev 1316)
+++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-04-18 17:25:02 UTC (rev 1317)
@@ -844,7 +844,7 @@
white-space: nowrap;
}
*/
-.k-sn-mainpanel .x-btn button,.k-sn-mainpanel button {
+.k-sn-mainpanel .x-btn button,.k-sn-mainpanel button, button.k-button {
font: 13px 'Ubuntu', arial;
border: 2px solid #CCCCCC;
cursor: pointer;
@@ -858,7 +858,7 @@
border-radius: 6px;
vertical-align: middle;
line-height: 2em !important;
- height: 26px !important;
+ /* height: 26px !important; */
font-weight: bold;
/*
font-size:small;
@@ -867,13 +867,14 @@
padding-left: 25px !important; */
}
-.k-sn-mainpanel .x-btn button:hover,.k-sn-mainpanel button:hover {
+.k-sn-mainpanel .x-btn button:hover,.k-sn-mainpanel button:hover, .k-button button:hover {
border: 2px orange solid;
background: #f0f0f0;
color: #855585;
}
-.k-sn-mainpanel .x-btn button:active,.k-sn-mainpanel button:active {
+.k-sn-mainpanel .x-btn button:active,.k-sn-mainpanel button:active, .k-button
+ button:active {
border-top-color: #ffffff;
background: #ffffff;
}
Modified: trunk/src/main/java/cc/kune/docs/client/viewers/DocViewerPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/docs/client/viewers/DocViewerPanel.java 2011-04-18 11:45:11 UTC (rev 1316)
+++ trunk/src/main/java/cc/kune/docs/client/viewers/DocViewerPanel.java 2011-04-18 17:25:02 UTC (rev 1317)
@@ -1,43 +1,20 @@
package cc.kune.docs.client.viewers;
-import org.waveprotocol.box.webclient.client.ClientIdGenerator;
-import org.waveprotocol.box.webclient.client.RemoteViewServiceMultiplexer;
-import org.waveprotocol.box.webclient.client.Session;
-import org.waveprotocol.box.webclient.client.SimpleWaveStore;
-import org.waveprotocol.box.webclient.client.StagesProvider;
-import org.waveprotocol.box.webclient.client.WaveWebSocketClient;
-import org.waveprotocol.box.webclient.search.WaveStore;
-import org.waveprotocol.box.webclient.widget.loading.LoadingIndicator;
-import org.waveprotocol.wave.client.account.ProfileManager;
-import org.waveprotocol.wave.client.account.impl.ProfileManagerImpl;
-import org.waveprotocol.wave.client.widget.common.ImplPanel;
-import org.waveprotocol.wave.model.id.IdGenerator;
-import org.waveprotocol.wave.model.wave.ParticipantId;
-import org.waveprotocol.wave.model.waveref.InvalidWaveRefException;
-import org.waveprotocol.wave.model.waveref.WaveRef;
-import org.waveprotocol.wave.util.escapers.GwtWaverefEncoder;
-
import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection;
-import cc.kune.common.client.errors.UIException;
import cc.kune.common.client.ui.UiUtils;
import cc.kune.core.shared.dto.StateContentDTO;
import cc.kune.docs.client.viewers.DocViewerPresenter.DocViewerView;
import cc.kune.gspace.client.GSpaceArmor;
import cc.kune.wave.client.WaveClientManager;
-import cc.kune.wave.client.WebClient;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.Element;
import com.google.gwt.safehtml.shared.SafeHtmlUtils;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.DeckPanel;
import com.google.gwt.user.client.ui.InlineHTML;
import com.google.gwt.user.client.ui.InlineLabel;
import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget;
-import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.Widget;
import com.google.inject.Inject;
import com.gwtplatform.mvp.client.ViewImpl;
@@ -48,29 +25,29 @@
private static DocsViewerPanelUiBinder uiBinder = GWT.create(DocsViewerPanelUiBinder.class);
- private RemoteViewServiceMultiplexer channel;
+ // private RemoteViewServiceMultiplexer channel;
@UiField
DeckPanel deck;
private final GSpaceArmor gsArmor;
- private IdGenerator idGenerator;
- private final Element loading = new LoadingIndicator().getElement();
+ // private IdGenerator idGenerator;
+ // private final Element loading = new LoadingIndicator().getElement();
@UiField
InlineHTML onlyViewPanel;
- private ProfileManager profiles;
+ // private ProfileManager profiles;
/** The wave panel, if a wave is open. */
- private StagesProvider wave;
- private final WaveClientManager waveClientManager;
+ // private StagesProvider wave;
+ // private final WaveClientManager waveClientManager;
// @UiField
// FramedPanel waveFrame;
- @UiField
- ImplPanel waveHolder;
- private final WaveStore waveStore = new SimpleWaveStore();
+ // @UiField
+ // ImplPanel waveHolder;
+ // private final WaveStore waveStore = new SimpleWaveStore();
private final Widget widget;
@Inject
public DocViewerPanel(final GSpaceArmor wsArmor, final WaveClientManager waveClientManager) {
this.gsArmor = wsArmor;
- this.waveClientManager = waveClientManager;
+ // this.waveClientManager = waveClientManager;
widget = uiBinder.createAndBindUi(this);
}
@@ -85,6 +62,7 @@
docContainer.add(widget);
}
+ @Override
public void clear() {
onlyViewPanel.setHTML("");
gsArmor.getSubheaderToolbar().clear();
@@ -97,26 +75,27 @@
clear();
}
- private WaveRef getWaveRef(final String waveRefS) {
- try {
- return GwtWaverefEncoder.decodeWaveRefFromPath(waveRefS);
- } catch (final InvalidWaveRefException e) {
- throw new UIException("Invalid waveref: " + waveRefS);
- }
- }
+ // private WaveRef getWaveRef(final String waveRefS) {
+ // try {
+ // return GwtWaverefEncoder.decodeWaveRefFromPath(waveRefS);
+ // } catch (final InvalidWaveRefException e) {
+ // throw new UIException("Invalid waveref: " + waveRefS);
+ // }
+ // }
+ //
+ // private void initWaveClientIfNeeded() {
+ // if (channel == null) {
+ // final WaveWebSocketClient webSocket = new
+ // WaveWebSocketClient(WebClient.useSocketIO(),
+ // WebClient.getWebSocketBaseUrl(GWT.getModuleBaseURL()));
+ // webSocket.connect();
+ // channel = new RemoteViewServiceMultiplexer(webSocket,
+ // new ParticipantId(Session.get().getAddress()).getAddress());
+ // profiles = new ProfileManagerImpl();
+ // idGenerator = ClientIdGenerator.create();
+ // }
+ // }
- private void initWaveClientIfNeeded() {
- if (channel == null) {
- final WaveWebSocketClient webSocket = new WaveWebSocketClient(WebClient.useSocketIO(),
- WebClient.getWebSocketBaseUrl(GWT.getModuleBaseURL()));
- webSocket.connect();
- channel = new RemoteViewServiceMultiplexer(webSocket,
- new ParticipantId(Session.get().getAddress()).getAddress());
- profiles = new ProfileManagerImpl();
- idGenerator = ClientIdGenerator.create();
- }
- }
-
@Override
public void setActions(final GuiActionDescCollection actions) {
gsArmor.getSubheaderToolbar().clear();
@@ -132,35 +111,40 @@
if (editable) {
// initWaveClientIfNeeded();
// setEditableWaveContent(state.getWaveRef(), false);
- waveHolder.clear();
- waveHolder.add(new Label(state.getContent() + " (but here goes the Wave editor -we are testing it-)"));
+ // waveHolder.clear();
+ // waveHolder.add(new Label(state.getContent() +
+ // " (but here goes the Wave editor -we are testing it-)"));
onlyViewPanel.setHTML(SafeHtmlUtils.fromTrustedString(state.getContent()));
} else {
onlyViewPanel.setHTML(SafeHtmlUtils.fromTrustedString(state.getContent()));
}
- deck.showWidget(editable ? 0 : 1);
+ // deck.showWidget(editable ? 0 : 1);
+ deck.showWidget(1);
}
-
- public void setEditableWaveContent(final String waveRefS, final boolean isNewWave) {
- final WaveRef waveRef = getWaveRef(waveRefS);
-
- if (wave != null) {
- wave.destroy();
- wave = null;
- }
-
- // Release the display:none.
- // UIObject.setVisible(waveFrame.getElement(), true);
- waveHolder.getElement().appendChild(loading);
- final Element holder = waveHolder.getElement().appendChild(Document.get().createDivElement());
- final StagesProvider wave = new StagesProvider(holder, waveHolder, waveRef, channel, idGenerator, profiles,
- waveStore, isNewWave);
- this.wave = wave;
- wave.load(new Command() {
- @Override
- public void execute() {
- loading.removeFromParent();
- }
- });
- }
+ //
+ // private void setEditableWaveContent(final String waveRefS, final boolean
+ // isNewWave) {
+ // final WaveRef waveRef = getWaveRef(waveRefS);
+ //
+ // if (wave != null) {
+ // wave.destroy();
+ // wave = null;
+ // }
+ //
+ // // Release the display:none.
+ // // UIObject.setVisible(waveFrame.getElement(), true);
+ // waveHolder.getElement().appendChild(loading);
+ // final Element holder =
+ // waveHolder.getElement().appendChild(Document.get().createDivElement());
+ // final StagesProvider wave = new StagesProvider(holder, waveHolder,
+ // waveRef, channel, idGenerator, profiles,
+ // waveStore, isNewWave);
+ // this.wave = wave;
+ // wave.load(new Command() {
+ // @Override
+ // public void execute() {
+ // loading.removeFromParent();
+ // }
+ // });
+ // }
}
Modified: trunk/src/main/java/cc/kune/docs/client/viewers/DocViewerPanel.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/docs/client/viewers/DocViewerPanel.ui.xml 2011-04-18 11:45:11 UTC (rev 1316)
+++ trunk/src/main/java/cc/kune/docs/client/viewers/DocViewerPanel.ui.xml 2011-04-18 17:25:02 UTC (rev 1317)
@@ -6,6 +6,7 @@
.wavePanel {
margin: 0 0 0 0;
}
+
.waveHolder {
position: absolute;
top: 0;
@@ -15,11 +16,13 @@
}
</ui:style>
<g:HTMLPanel width="100%" height="100%">
- <g:DeckPanel ui:field="deck" addStyleNames="k-doc-content-deck">
-<!-- <f:FramedPanel ui:field="waveFrame" addStyleNames="{style.wavePanel}"> -->
-<!-- </f:FramedPanel> -->
- <w:ImplPanel ui:field="waveHolder" addStyleNames="{style.waveHolder}" />
- <g:InlineHTML ui:field="onlyViewPanel" />
- </g:DeckPanel>
+ <g:DeckPanel ui:field="deck" addStyleNames="k-doc-content-deck">
+ <!-- <f:FramedPanel ui:field="waveFrame" addStyleNames="{style.wavePanel}"> -->
+ <!-- </f:FramedPanel> -->
+ <!-- <w:ImplPanel ui:field="waveHolder" addStyleNames="{style.waveHolder}"
+ /> -->
+ <g:InlineHTML ui:field="delete" />
+ <g:InlineHTML ui:field="onlyViewPanel" />
+ </g:DeckPanel>
</g:HTMLPanel>
</ui:UiBinder>
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/docs/client/viewers/FolderViewerPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/docs/client/viewers/FolderViewerPresenter.java 2011-04-18 11:45:11 UTC (rev 1316)
+++ trunk/src/main/java/cc/kune/docs/client/viewers/FolderViewerPresenter.java 2011-04-18 17:25:02 UTC (rev 1317)
@@ -118,16 +118,19 @@
}
private void createChildItems(final ContainerDTO container, final AccessRights containerRights) {
- NotifyUser.info("Size: " + container.getContents().size() + " siblings: " + container.getChilds().size());
- for (final ContentSimpleDTO content : container.getContents()) {
- addItem(content.getTitle(), content.getTypeId(), content.getMimeType(), content.getStatus(),
- content.getStateToken(), content.getStateToken().copy().clearDocument(), content.getRights());
+ if (container.getContents().size() + container.getChilds().size() == 0) {
+ // FIXME
+ } else {
+ for (final ContentSimpleDTO content : container.getContents()) {
+ addItem(content.getTitle(), content.getTypeId(), content.getMimeType(), content.getStatus(),
+ content.getStateToken(), content.getStateToken().copy().clearDocument(), content.getRights());
+ }
+ for (final ContainerSimpleDTO childFolder : container.getChilds()) {
+ addItem(childFolder.getName(), childFolder.getTypeId(), null, ContentStatus.publishedOnline,
+ childFolder.getStateToken(),
+ childFolder.getStateToken().copy().setFolder(childFolder.getParentFolderId()), containerRights);
+ }
}
- for (final ContainerSimpleDTO siblingFolder : container.getChilds()) {
- addItem(siblingFolder.getName(), siblingFolder.getTypeId(), null, ContentStatus.publishedOnline,
- siblingFolder.getStateToken(),
- siblingFolder.getStateToken().copy().setFolder(siblingFolder.getParentFolderId()), containerRights);
- }
}
@Override
Modified: trunk/src/main/java/cc/kune/domain/Comment.java
===================================================================
--- trunk/src/main/java/cc/kune/domain/Comment.java 2011-04-18 11:45:11 UTC (rev 1316)
+++ trunk/src/main/java/cc/kune/domain/Comment.java 2011-04-18 17:25:02 UTC (rev 1317)
@@ -38,6 +38,8 @@
import javax.persistence.Table;
import javax.persistence.Transient;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
import org.hibernate.search.annotations.DocumentId;
import org.hibernate.search.annotations.Field;
import org.hibernate.search.annotations.Index;
@@ -48,22 +50,31 @@
@Table(name = "comment")
public class Comment {
- @Id
- @GeneratedValue
- @DocumentId
- private Long id;
+ @IndexedEmbedded
+ @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE })
+ private List<User> abuseInformers;
+ @IndexedEmbedded
+ @OneToOne(cascade = { CascadeType.PERSIST, CascadeType.MERGE })
+ private User author;
+
+ @Fetch(FetchMode.JOIN)
+ @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+ private Set<Comment> childs;
+
@ManyToOne
@JoinColumn
@IndexedEmbedded
private Content content;
- @Basic(optional = false)
- private Long publishedOn;
+ @Id
+ @GeneratedValue
+ @DocumentId
+ private Long id;
@IndexedEmbedded
- @OneToOne(cascade = { CascadeType.PERSIST, CascadeType.MERGE })
- private User author;
+ @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE })
+ private List<User> negativeVoters;
// Parent/Child pattern:
// http://www.hibernate.org/hib_docs/reference/en/html/example-parentchild.html
@@ -72,21 +83,13 @@
@JoinColumn
private Comment parent;
- @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
- private Set<Comment> childs;
-
@IndexedEmbedded
@ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE })
private List<User> positiveVoters;
- @IndexedEmbedded
- @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE })
- private List<User> negativeVoters;
+ @Basic(optional = false)
+ private Long publishedOn;
- @IndexedEmbedded
- @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE })
- private List<User> abuseInformers;
-
@Field(index = Index.TOKENIZED, store = Store.NO)
private String text;
Modified: trunk/src/main/java/cc/kune/domain/Container.java
===================================================================
--- trunk/src/main/java/cc/kune/domain/Container.java 2011-04-18 11:45:11 UTC (rev 1316)
+++ trunk/src/main/java/cc/kune/domain/Container.java 2011-04-18 17:25:02 UTC (rev 1317)
@@ -41,6 +41,8 @@
import javax.persistence.Table;
import javax.persistence.Transient;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
import org.hibernate.search.annotations.ContainedIn;
import org.hibernate.search.annotations.DocumentId;
import org.hibernate.search.annotations.Field;
@@ -63,6 +65,7 @@
@OneToOne(cascade = CascadeType.ALL)
private AccessLists accessLists;
+ @Fetch(FetchMode.JOIN)
@OrderBy("createdOn DESC")
@OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
private Set<Container> childs;
@@ -70,6 +73,7 @@
@OneToMany(cascade = CascadeType.ALL)
private List<ContainerTranslation> containerTranslations;
+ @Fetch(FetchMode.JOIN)
@ContainedIn
@OrderBy("createdOn DESC")
@OneToMany(mappedBy = "container", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
Modified: trunk/src/main/java/cc/kune/domain/Content.java
===================================================================
--- trunk/src/main/java/cc/kune/domain/Content.java 2011-04-18 11:45:11 UTC (rev 1316)
+++ trunk/src/main/java/cc/kune/domain/Content.java 2011-04-18 17:25:02 UTC (rev 1317)
@@ -46,6 +46,8 @@
import javax.persistence.Transient;
import javax.persistence.Version;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
import org.hibernate.search.annotations.ContainedIn;
import org.hibernate.search.annotations.DocumentId;
import org.hibernate.search.annotations.Indexed;
@@ -74,6 +76,7 @@
@ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE })
private List<User> authors;
+ @Fetch(FetchMode.JOIN)
@ContainedIn
@OneToMany(mappedBy = "content", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
private Set<Comment> comments;
Modified: trunk/src/main/java/cc/kune/msgs/KuneMsgs.gwt.xml
===================================================================
--- trunk/src/main/java/cc/kune/msgs/KuneMsgs.gwt.xml 2011-04-18 11:45:11 UTC (rev 1316)
+++ trunk/src/main/java/cc/kune/msgs/KuneMsgs.gwt.xml 2011-04-18 17:25:02 UTC (rev 1317)
@@ -2,17 +2,11 @@
<module>
<!-- Inherit the core Web Toolkit stuff. -->
<inherits name='com.google.gwt.user.User' />
- <inherits name="org.adamtacy.GWTEffects"></inherits>
+ <inherits name="org.adamtacy.GWTEffects" />
<inherits name="cc.kune.common.KuneCommon" />
- <!-- Inherit the default GWT style sheet. You can change -->
- <!-- the theme of your GWT application by uncommenting -->
- <!-- any one of the following lines. -->
- <!-- <inherits name='com.google.gwt.user.theme.standard.Standard'/> -->
- <!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
- <!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> -->
<!-- Other module inherits -->
<!-- Specify the app entry point class. -->
- <!-- <entry-point class='cc.kune.msgs.client.KuneMessagesSampleEntryPoint'
+ <!-- <entry-point class='cc.kune.msgs.client.KuneMessagesSampleEntryPoint'
/> -->
<!-- Specify the paths for translatable code -->
<source path='client' />
Modified: trunk/src/main/java/cc/kune/wave/KuneWave.gwt.xml
===================================================================
--- trunk/src/main/java/cc/kune/wave/KuneWave.gwt.xml 2011-04-18 11:45:11 UTC (rev 1316)
+++ trunk/src/main/java/cc/kune/wave/KuneWave.gwt.xml 2011-04-18 17:25:02 UTC (rev 1317)
@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module>
<inherits name='org.waveprotocol.box.webclient.WebClient' />
+ <!-- Stack emulation is too slow to use in production. -->
+ <set-property name="compiler.emulatedStack" value="false" />
+ <!-- Turn off logging, because it's really slow. -->
+ <!-- <set-property name="loglevel" value="none" /> -->
+
<source path="client" />
<public path="public" />
</module>
More information about the kune-commits
mailing list