December 2010 - kune-commits - lists.ourproject.org

r1177 - trunk
by Vicente J. Ruiz Jurado 29 Dec '10

29 Dec '10

Author: vjrj_ Date: 2010-12-29 04:43:22 +0100 (Wed, 29 Dec 2010) New Revision: 1177 Modified: trunk/ Log: remove war dir Property changes on: trunk ___________________________________________________________________ Name: svn:ignore - pmd-eclipse.log .pmd www-test screenlog.0 bin client public target Main-compile bin .settings .gwt-cache repository derby.log star-yellow-grey.png run.sh tomcat .classpath gwt-out synccss.sh .externalToolBuilders .project .wtpmodules www testRepository kune-OLD-jcr KuneApp.launch KuneApp NOSERVER.launch old_src org.ourproject.kune.app.Kune org.ourproject.kune.iml org.ourproject.kune.ipr org.ourproject.kune.iws nbproject hibernate.reveng.xml .gwt-tmp target-eclipse .checkstyle .classpath-bien pom.xml.* .gwt + pmd-eclipse.log .pmd www-test screenlog.0 bin client public target Main-compile bin .settings .gwt-cache repository derby.log star-yellow-grey.png run.sh tomcat .classpath gwt-out synccss.sh .externalToolBuilders .project .wtpmodules www testRepository kune-OLD-jcr KuneApp.launch KuneApp NOSERVER.launch old_src org.ourproject.kune.app.Kune org.ourproject.kune.iml org.ourproject.kune.ipr org.ourproject.kune.iws nbproject hibernate.reveng.xml .gwt-tmp target-eclipse .checkstyle .classpath-bien pom.xml.* .gwt .jdee_sources .jdee_classpath prj.el .factorypath

1 0

r1176 - trunk
by Vicente J. Ruiz Jurado 29 Dec '10

29 Dec '10

Author: vjrj_ Date: 2010-12-29 04:43:07 +0100 (Wed, 29 Dec 2010) New Revision: 1176 Removed: trunk/war/ Log: remove war dir

1 0

r1175 - in trunk/src/main: java/cc/kune/core/client/sitebar/logo java/org/ourproject/kune/app/server/wave resources
by Vicente J. Ruiz Jurado 29 Dec '10

29 Dec '10

Author: vjrj_ Date: 2010-12-29 04:37:12 +0100 (Wed, 29 Dec 2010) New Revision: 1175 Added: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoUiHandlers.java trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.ui.xml trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomAttachmentServlet.java trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomFetchServlet.java trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomServerModule.java trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomSessionManagerImpl.java trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomSettingsBinder.java trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomUserRegistrationServlet.java trunk/src/main/resources/wave-server.properties Log: NEW - # 10: Wave server code update http://kune.ourproject.org/issues/ticket/10 NEW - # 9: Roo partial use/integration http://kune.ourproject.org/issues/ticket/9 Added: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoUiHandlers.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoUiHandlers.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoUiHandlers.java 2010-12-29 03:37:12 UTC (rev 1175) @@ -0,0 +1,7 @@ +package cc.kune.core.client.sitebar.logo; + +import com.gwtplatform.mvp.client.UiHandlers; + +public interface SiteLogoUiHandlers extends UiHandlers { + void onClick(); +} \ No newline at end of file Added: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.ui.xml (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.ui.xml 2010-12-29 03:37:12 UTC (rev 1175) @@ -0,0 +1,10 @@ +<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> +<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" + xmlns:g="urn:import:com.google.gwt.user.client.ui"> + <ui:style> + .important { + font-weight: bold; + } + </ui:style> + <g:Image ui:field="logo" addStyleNames="k-floatright k-pointer" /> +</ui:UiBinder> \ No newline at end of file Added: trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomAttachmentServlet.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomAttachmentServlet.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomAttachmentServlet.java 2010-12-29 03:37:12 UTC (rev 1175) @@ -0,0 +1,107 @@ +/** + * Copyright 2010 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.ourproject.kune.app.server.wave; + +import java.io.IOException; + +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.waveprotocol.box.server.persistence.AttachmentStore; +import org.waveprotocol.box.server.persistence.AttachmentStore.AttachmentData; +import org.waveprotocol.wave.util.logging.Log; + +import com.google.inject.Inject; + +/** + * An attachment servlet is a simple servlet that serves up attachments from a + * provided store. + */ +public class CustomAttachmentServlet extends HttpServlet { + private static final Log LOG = Log.get(CustomAttachmentServlet.class); + + private final AttachmentStore store; + + @Inject + public CustomAttachmentServlet(AttachmentStore store) { + this.store = store; + } + + /** + * Get the attachment id from the URL in the request. + * + * @param request + * @return the id of the referenced attachment. + */ + private static String getAttachmentIdFromRequest(HttpServletRequest request) { + if (request.getPathInfo().length() == 0) { + return ""; + } + + // Discard the leading '/' in the pathinfo. Whats left will be the + // attachment id. + return request.getPathInfo().substring(1); + } + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { + // TODO: Authenticate that the user has permission to access the + // attachment. + + String attachmentId = getAttachmentIdFromRequest(request); + if (attachmentId.length() == 0) { + response.sendError(HttpServletResponse.SC_NOT_FOUND); + return; + } + + AttachmentData data = store.getAttachment(attachmentId); + + if (data == null) { + response.sendError(HttpServletResponse.SC_NOT_FOUND); + return; + } + + response.setContentType("text/html"); + response.setStatus(HttpServletResponse.SC_OK); + response.setContentLength((int) data.getContentSize()); + response.setDateHeader("Last-Modified", data.getLastModifiedDate().getTime()); + data.writeDataTo(response.getOutputStream()); + + LOG.info("Fetched attachment with id '" + attachmentId + "'"); + } + + @Override + protected void doPut(final HttpServletRequest request, final HttpServletResponse response) throws IOException { + // TODO: Authenticate the attachment data + + String attachmentId = getAttachmentIdFromRequest(request); + if (attachmentId.length() == 0) { + response.sendError(HttpServletResponse.SC_NOT_FOUND); + return; + } + + store.storeAttachment(attachmentId, request.getInputStream()); + + response.setContentType("text/html"); + response.setStatus(HttpServletResponse.SC_OK); + response.getWriter().write("<html><body><h1>Data written</h1></body></html>"); + + LOG.info("Added attachment with id '" + attachmentId + "'"); + } +} Added: trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomFetchServlet.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomFetchServlet.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomFetchServlet.java 2010-12-29 03:37:12 UTC (rev 1175) @@ -0,0 +1,186 @@ +/** + * Copyright 2010 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.ourproject.kune.app.server.wave; + +import java.io.IOException; + +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.waveprotocol.box.common.comms.WaveClientRpc.DocumentSnapshot; +import org.waveprotocol.box.common.comms.WaveClientRpc.WaveViewSnapshot; +import org.waveprotocol.box.common.comms.WaveClientRpc.WaveletSnapshot; +import org.waveprotocol.box.server.authentication.SessionManager; +import org.waveprotocol.box.server.frontend.WaveletSnapshotAndVersion; +import org.waveprotocol.box.server.rpc.ProtoSerializer; +import org.waveprotocol.box.server.waveserver.WaveletProvider; +import org.waveprotocol.box.server.waveserver.WaveletStateException; +import org.waveprotocol.wave.model.id.WaveletId; +import org.waveprotocol.wave.model.id.WaveletName; +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.jvm.JavaWaverefEncoder; +import org.waveprotocol.wave.util.logging.Log; + +import com.google.common.annotations.VisibleForTesting; +import com.google.inject.Inject; +import com.google.protobuf.MessageLite; + +/** + * A servlet for static fetching of wave data. Typically, the servlet will be + * hosted on /fetch/*. A document, a wavelet, or a whole wave can be specified + * in the URL. + * + * Valid request formats are: Fetch a wave: GET /fetch/wavedomain.com/waveid + * Fetch a wavelet: GET /fetch/wavedomain.com/waveid/waveletdomain.com/waveletid + * Fetch a document: GET + * /fetch/wavedomain.com/waveid/waveletdomain.com/waveletid/b+abc123 + * + * The format of the returned information is the protobuf-JSON format used by + * the websocket interface. + */ +public class CustomFetchServlet extends HttpServlet { + private static final Log LOG = Log.get(CustomFetchServlet.class); + + @Inject + public CustomFetchServlet(WaveletProvider waveletProvider, ProtoSerializer serializer, SessionManager sessionManager) { + this.waveletProvider = waveletProvider; + this.serializer = serializer; + this.sessionManager = sessionManager; + } + + private final ProtoSerializer serializer; + private final WaveletProvider waveletProvider; + private final SessionManager sessionManager; + + /** + * Create an http response to the fetch query. Main entrypoint for this + * class. + */ + @Override + @VisibleForTesting + protected void doGet(HttpServletRequest req, HttpServletResponse response) throws IOException { + ParticipantId user = sessionManager.getLoggedInUser(req.getSession(false)); + + // This path will look like "/example.com/w+abc123/foo.com/conv+root + // Strip off the leading '/'. + String urlPath = req.getPathInfo().substring(1); + + // Extract the name of the wavelet from the URL + WaveRef waveref; + try { + waveref = JavaWaverefEncoder.decodeWaveRefFromPath(urlPath); + } catch (InvalidWaveRefException e) { + // The URL contains an invalid waveref. There's no document at this + // path. + response.sendError(HttpServletResponse.SC_NOT_FOUND); + return; + } + + renderSnapshot(waveref, user, response); + } + + private void serializeObjectToServlet(MessageLite message, HttpServletResponse dest) throws IOException { + if (message == null) { + // Snapshot is null. It would be nice to 404 here, but we can't let + // clients guess valid wavelet ids that they're not authorized to + // access. + dest.sendError(HttpServletResponse.SC_FORBIDDEN); + } else { + dest.setStatus(HttpServletResponse.SC_OK); + dest.setContentType("application/json"); + + // This is a hack to make sure the fetched data is fresh. + // TODO(josephg): Change this so that browsers can cache wave + // snapshots. Probably need: + // 'Cache-Control: must-revalidate, private' and an ETag with the + // wave[let]'s version. + dest.setHeader("Cache-Control", "no-store"); + + serializer.writeTo(dest.getWriter(), message); + } + } + + /** + * Render the requested waveref out to the HttpServletResponse dest. + * + * @param waveref + * The referenced wave. Could be a whole wave, a wavelet or just + * a document. + * @param dest + * The servlet response to render the snapshot out to. + * @throws IOException + */ + private void renderSnapshot(WaveRef waveref, ParticipantId requester, HttpServletResponse dest) throws IOException { + // TODO(josephg): Its currently impossible to fetch all wavelets inside + // a + // wave that are visible to the user. Until this is fixed, if no wavelet + // is + // specified we'll just return the conv+root. + WaveletId waveletId = waveref.hasWaveletId() ? waveref.getWaveletId() : WaveletId.of( + waveref.getWaveId().getDomain(), "conv+root"); + + WaveletName waveletName = WaveletName.of(waveref.getWaveId(), waveletId); + + try { + if (!waveletProvider.checkAccessPermission(waveletName, requester)) { + dest.sendError(HttpServletResponse.SC_FORBIDDEN); + return; + } + } catch (WaveletStateException e) { + throw new IOException(e); + } + + LOG.info("Fetching snapshot of wavelet " + waveletName); + WaveletSnapshotAndVersion snapshotAndV = waveletProvider.getSnapshot(waveletName); + + if (snapshotAndV != null) { + WaveletSnapshot snapshot = snapshotAndV.snapshot; + if (waveref.hasDocumentId()) { + // We have a wavelet id and document id. Find the document in + // the + // snapshot + // and return it. + DocumentSnapshot docSnapshot = null; + for (DocumentSnapshot ds : snapshot.getDocumentList()) { + if (ds.getDocumentId().equals(waveref.getDocumentId())) { + docSnapshot = ds; + break; + } + } + serializeObjectToServlet(docSnapshot, dest); + } else if (waveref.hasWaveletId()) { + // We have a wavelet id. Pull up the wavelet snapshot and return + // it. + serializeObjectToServlet(snapshot, dest); + } else { + // Wrap the conv+root we fetched earlier in a WaveSnapshot + // object and + // send it. + WaveViewSnapshot waveSnapshot = WaveViewSnapshot.newBuilder().setWaveId(waveref.getWaveId().serialise()).addWavelet( + snapshot).build(); + + serializeObjectToServlet(waveSnapshot, dest); + } + } else { + dest.sendError(HttpServletResponse.SC_FORBIDDEN); + } + } +} Added: trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomServerModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomServerModule.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomServerModule.java 2010-12-29 03:37:12 UTC (rev 1175) @@ -0,0 +1,119 @@ +package org.ourproject.kune.app.server.wave; + +/** + * Copyright 2009 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +import java.security.SecureRandom; +import java.util.Arrays; +import java.util.List; + +import javax.security.auth.login.Configuration; + +import org.eclipse.jetty.server.session.HashSessionManager; +import org.waveprotocol.box.server.CoreSettings; +import org.waveprotocol.box.server.authentication.SessionManager; +import org.waveprotocol.box.server.rpc.ProtoSerializer; +import org.waveprotocol.box.server.rpc.ServerRpcProvider; +import org.waveprotocol.box.server.waveserver.WaveServerImpl; +import org.waveprotocol.box.server.waveserver.WaveServerModule; +import org.waveprotocol.wave.federation.FederationHostBridge; +import org.waveprotocol.wave.federation.FederationRemoteBridge; +import org.waveprotocol.wave.federation.WaveletFederationListener; +import org.waveprotocol.wave.federation.WaveletFederationProvider; +import org.waveprotocol.wave.model.id.IdGenerator; +import org.waveprotocol.wave.model.id.IdGeneratorImpl; +import org.waveprotocol.wave.model.id.IdGeneratorImpl.Seed; +import org.waveprotocol.wave.model.id.TokenGenerator; +import org.waveprotocol.wave.model.id.TokenGeneratorImpl; + +import com.google.inject.AbstractModule; +import com.google.inject.Inject; +import com.google.inject.Provides; +import com.google.inject.Singleton; +import com.google.inject.TypeLiteral; +import com.google.inject.name.Named; +import com.google.inject.name.Names; + +/** + * Guice Module for the prototype Server. + * + * + */ +public class CustomServerModule extends AbstractModule { + private final boolean enableFederation; + + public CustomServerModule(boolean enableFederation) { + this.enableFederation = enableFederation; + } + + @Override + protected void configure() { + // Receive updates from the outside world, and push them into our local + // Wave + // Server. + bind(WaveletFederationListener.Factory.class).annotatedWith(FederationRemoteBridge.class).to( + WaveServerImpl.class); + + // Provide history and respond to submits about our own local waves. + bind(WaveletFederationProvider.class).annotatedWith(FederationHostBridge.class).to(WaveServerImpl.class); + + install(new WaveServerModule(enableFederation)); + TypeLiteral<List<String>> certs = new TypeLiteral<List<String>>() { + }; + bind(certs).annotatedWith(Names.named("certs")).toInstance(Arrays.<String> asList()); + + bind(ProtoSerializer.class).in(Singleton.class); + + bind(Configuration.class).toInstance(Configuration.getConfiguration()); + bind(SessionManager.class).to(CustomSessionManagerImpl.class).in(Singleton.class); + + bind(org.eclipse.jetty.server.SessionManager.class).to(HashSessionManager.class).in(Singleton.class); + + bind(ServerRpcProvider.class).in(Singleton.class); + } + + @Provides + @Singleton + @Inject + public IdGenerator provideIdGenerator((a)Named(CoreSettings.WAVE_SERVER_DOMAIN) String domain, Seed seed) { + return new IdGeneratorImpl(domain, seed); + } + + @Provides + @Singleton + public SecureRandom provideSecureRandom() { + return new SecureRandom(); + } + + @Provides + @Singleton + @Inject + public TokenGenerator provideTokenGenerator(SecureRandom random) { + return new TokenGeneratorImpl(random); + } + + @Provides + @Singleton + @Inject + public Seed provideSeed(final SecureRandom random) { + return new Seed() { + @Override + public String get() { + return Long.toString(Math.abs(random.nextLong()), 36); + } + }; + } +} \ No newline at end of file Added: trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomSessionManagerImpl.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomSessionManagerImpl.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomSessionManagerImpl.java 2010-12-29 03:37:12 UTC (rev 1175) @@ -0,0 +1,116 @@ +/** + * Copyright 2010 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.ourproject.kune.app.server.wave; + +import javax.servlet.http.HttpSession; + +import org.waveprotocol.box.server.account.AccountData; +import org.waveprotocol.box.server.authentication.SessionManager; +import org.waveprotocol.box.server.authentication.SessionManagerImpl; +import org.waveprotocol.box.server.persistence.AccountStore; +import org.waveprotocol.box.server.persistence.PersistenceException; +import org.waveprotocol.wave.model.wave.ParticipantId; +import org.waveprotocol.wave.util.escapers.PercentEscaper; +import org.waveprotocol.wave.util.logging.Log; + +import com.google.common.base.Preconditions; +import com.google.common.base.Strings; +import com.google.inject.Inject; + +/** + * Utility class for managing the session's authentication status. + * + * @author josephg(a)gmail.com (Joseph Gentle) + */ + +public class CustomSessionManagerImpl implements SessionManager { + private static final String USER_FIELD = "user"; + + private final AccountStore accountStore; + private final org.eclipse.jetty.server.SessionManager jettySessionManager; + + private static final Log LOG = Log.get(SessionManagerImpl.class); + + @Inject + public CustomSessionManagerImpl(AccountStore accountStore, + org.eclipse.jetty.server.SessionManager jettySessionManager) { + Preconditions.checkNotNull(accountStore, "Null account store"); + Preconditions.checkNotNull(jettySessionManager, "Null jetty session manager"); + this.accountStore = accountStore; + this.jettySessionManager = jettySessionManager; + } + + @Override + public ParticipantId getLoggedInUser(HttpSession session) { + if (session != null) { + return (ParticipantId) session.getAttribute(USER_FIELD); + } else { + return null; + } + } + + @Override + public AccountData getLoggedInAccount(HttpSession session) { + // Consider caching the account data in the session object. + ParticipantId user = getLoggedInUser(session); + if (user != null) { + try { + return accountStore.getAccount(user); + } catch (PersistenceException e) { + LOG.warning("Failed to retrieve account data for " + user, e); + return null; + } + } else { + return null; + } + } + + @Override + public void setLoggedInUser(HttpSession session, ParticipantId id) { + Preconditions.checkNotNull(session, "Session is null"); + Preconditions.checkNotNull(id, "Participant id is null"); + session.setAttribute(USER_FIELD, id); + } + + @Override + public void logout(HttpSession session) { + if (session != null) { + // This function should also remove any other bound fields in the + // session + // object. + session.removeAttribute(USER_FIELD); + } + } + + @Override + public String getLoginUrl(String redirect) { + if (Strings.isNullOrEmpty(redirect)) { + return SIGN_IN_URL; + } else { + PercentEscaper escaper = new PercentEscaper(PercentEscaper.SAFEQUERYSTRINGCHARS_URLENCODER, false); + String queryStr = "?r=" + escaper.escape(redirect); + return SIGN_IN_URL + queryStr; + } + } + + @Override + public HttpSession getSessionFromToken(String token) { + Preconditions.checkNotNull(token); + return jettySessionManager.getHttpSession(token); + } +} Added: trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomSettingsBinder.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomSettingsBinder.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomSettingsBinder.java 2010-12-29 03:37:12 UTC (rev 1175) @@ -0,0 +1,195 @@ +/* + * Copyright (C) 2009 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ourproject.kune.app.server.wave; + +import java.lang.reflect.Field; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.configuration.CompositeConfiguration; +import org.apache.commons.configuration.ConfigurationException; +import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration.SystemConfiguration; +import org.waveprotocol.wave.util.settings.Setting; + +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.inject.AbstractModule; +import com.google.inject.Module; +import com.google.inject.TypeLiteral; +import com.google.inject.name.Names; + +/** + * A property file parsing system that converts a given settings class into a + * Guice module with injectable + * + * @Named parameters. + * + * Originally based on some CLI work by arb(a)google.com (Anthony Baxter). + * Refactored by tad.glines(a)gmail.com (Tad Glines) to use Commons + * Configuration and add support for List<String>. + */ +public class CustomSettingsBinder { + + /** + * Used to validate that a type is supported. Some types may have generic + * parameters that need to be checked. + */ + private interface SettingTypeValidator { + boolean check(Type type); + } + + private static final Map<Type, SettingTypeValidator> supportedSettingTypes; + + /** + * This default validator just returns true. + */ + private static final SettingTypeValidator DEFAULT_TYPE_VALIDATOR = new SettingTypeValidator() { + @Override + public boolean check(Type type) { + return true; + } + }; + + /** + * This validator checks to make sure the {@link List}'s generic parameter + * is also supported. + */ + private static final SettingTypeValidator LIST_TYPE_VALIDATOR = new SettingTypeValidator() { + @Override + public boolean check(Type type) { + if (type instanceof ParameterizedType) { + Type[] args = ((ParameterizedType) type).getActualTypeArguments(); + if (args.length == 1) { + // At the moment only List<String> is supported. + if (args[0] == String.class) { + return true; + } + } + } + return false; + } + }; + + static { + ImmutableMap.Builder<Type, SettingTypeValidator> builder = ImmutableMap.builder(); + builder.put(int.class, DEFAULT_TYPE_VALIDATOR); + builder.put(boolean.class, DEFAULT_TYPE_VALIDATOR); + builder.put(String.class, DEFAULT_TYPE_VALIDATOR); + builder.put(List.class, LIST_TYPE_VALIDATOR); + supportedSettingTypes = builder.build(); + } + + /** + * Bind configuration parameters into Guice Module. + * + * @return a Guice module configured with setting support. + * @throws ConfigurationException + * on configuration error + */ + public static Module bindSettings(String propertyFile, Class<?>... settingsArg) throws ConfigurationException { + final CompositeConfiguration config = new CompositeConfiguration(); + config.addConfiguration(new SystemConfiguration()); + config.addConfiguration(new PropertiesConfiguration(propertyFile)); + + List<Field> fields = new ArrayList<Field>(); + for (Class<?> settings : settingsArg) { + fields.addAll(Arrays.asList(settings.getDeclaredFields())); + } + + // Reflect on settings class and absorb settings + final Map<Setting, Field> settings = new LinkedHashMap<Setting, Field>(); + for (Field field : fields) { + if (!field.isAnnotationPresent(Setting.class)) { + continue; + } + + // Validate target type + SettingTypeValidator typeHelper = supportedSettingTypes.get(field.getType()); + if (typeHelper == null || !typeHelper.check(field.getGenericType())) { + throw new IllegalArgumentException(field.getType() + " is not one of the supported setting types"); + } + + Setting setting = field.getAnnotation(Setting.class); + settings.put(setting, field); + } + + // Now validate them + List<String> missingProperties = new ArrayList<String>(); + for (Setting setting : settings.keySet()) { + if (setting.defaultValue().isEmpty()) { + if (!config.containsKey(setting.name())) { + missingProperties.add(setting.name()); + } + } + } + if (missingProperties.size() > 0) { + StringBuilder error = new StringBuilder(); + error.append("The following required properties are missing from the server configuration: "); + error.append(Joiner.on(", ").join(missingProperties)); + throw new ConfigurationException(error.toString()); + } + + // bundle everything up in an injectable guice module + return new AbstractModule() { + + @Override + protected void configure() { + // We must iterate the settings a third time when binding. + // Note: do not collapse these loops as that will damage + // early error detection. The runtime is still O(n) in setting + // count. + for (Map.Entry<Setting, Field> entry : settings.entrySet()) { + Class<?> type = entry.getValue().getType(); + Setting setting = entry.getKey(); + + if (int.class.equals(type)) { + Integer defaultValue = null; + if (!setting.defaultValue().isEmpty()) { + defaultValue = Integer.parseInt(setting.defaultValue()); + } + bindConstant().annotatedWith(Names.named(setting.name())).to( + config.getInteger(setting.name(), defaultValue)); + } else if (boolean.class.equals(type)) { + Boolean defaultValue = null; + if (!setting.defaultValue().isEmpty()) { + defaultValue = Boolean.parseBoolean(setting.defaultValue()); + } + bindConstant().annotatedWith(Names.named(setting.name())).to( + config.getBoolean(setting.name(), defaultValue)); + } else if (String.class.equals(type)) { + bindConstant().annotatedWith(Names.named(setting.name())).to( + config.getString(setting.name(), setting.defaultValue())); + } else { + String[] value = config.getStringArray(setting.name()); + if (value.length == 0 && !setting.defaultValue().isEmpty()) { + value = setting.defaultValue().split(","); + } + bind(new TypeLiteral<List<String>>() { + }).annotatedWith(Names.named(setting.name())).toInstance(ImmutableList.copyOf(value)); + } + } + } + }; + } +} Added: trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomUserRegistrationServlet.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomUserRegistrationServlet.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/app/server/wave/CustomUserRegistrationServlet.java 2010-12-29 03:37:12 UTC (rev 1175) @@ -0,0 +1,147 @@ +/** + * Copyright 2010 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.ourproject.kune.app.server.wave; + +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.waveprotocol.box.server.CoreSettings; +import org.waveprotocol.box.server.account.HumanAccountDataImpl; +import org.waveprotocol.box.server.authentication.HttpRequestBasedCallbackHandler; +import org.waveprotocol.box.server.authentication.PasswordDigest; +import org.waveprotocol.box.server.gxp.UserRegistrationPage; +import org.waveprotocol.box.server.persistence.AccountStore; +import org.waveprotocol.box.server.persistence.PersistenceException; +import org.waveprotocol.box.server.rpc.AuthenticationServlet; +import org.waveprotocol.wave.model.wave.InvalidParticipantAddress; +import org.waveprotocol.wave.model.wave.ParticipantId; +import org.waveprotocol.wave.util.logging.Log; + +import com.google.gxp.base.GxpContext; +import com.google.inject.Inject; +import com.google.inject.name.Named; + +/** + * The user registration servlet allows new users to register accounts. + * + * @author josephg(a)gmail.com (Joseph Gentle) + */ +public class CustomUserRegistrationServlet extends HttpServlet { + private final AccountStore accountStore; + private final String domain; + + private final Log LOG = Log.get(CustomUserRegistrationServlet.class); + + @Inject + public CustomUserRegistrationServlet(AccountStore accountStore, + @Named(CoreSettings.WAVE_SERVER_DOMAIN) String domain) { + this.accountStore = accountStore; + this.domain = domain; + } + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException { + writeRegistrationPage("", AuthenticationServlet.RESPONSE_STATUS_NONE, req.getLocale(), resp); + } + + @SuppressWarnings("unchecked") + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { + String message = tryCreateUser(req.getParameter(HttpRequestBasedCallbackHandler.ADDRESS_FIELD), + req.getParameter(HttpRequestBasedCallbackHandler.PASSWORD_FIELD)); + String responseType = AuthenticationServlet.RESPONSE_STATUS_SUCCESS; + + if (message != null) { + resp.setStatus(HttpServletResponse.SC_FORBIDDEN); + responseType = AuthenticationServlet.RESPONSE_STATUS_FAILED; + } else { + message = "Registration complete."; + resp.setStatus(HttpServletResponse.SC_OK); + } + + writeRegistrationPage(message, responseType, req.getLocale(), resp); + } + + /** + * Try to create a user with the provided username and password. On error, + * returns a string containing an error message. On success, returns null. + */ + private String tryCreateUser(String username, String password) { + String message = null; + ParticipantId id = null; + + try { + // First, some cleanup on the parameters. + if (username == null) { + return "Username portion of address cannot be less than 2 characters"; + } + username = username.trim().toLowerCase(); + if (username.contains(ParticipantId.DOMAIN_PREFIX)) { + id = ParticipantId.of(username); + } else { + id = ParticipantId.of(username + ParticipantId.DOMAIN_PREFIX + domain); + } + if (id.getAddress().indexOf("@") < 2) { + return "Username portion of address cannot be less than 2 characters"; + } + String[] usernameSplit = id.getAddress().split("@"); + if (usernameSplit.length != 2 || !usernameSplit[0].matches("[\\w\\.]+")) { + return "Only letters (a-z), numbers (0-9), and periods (.) are allowed in Username"; + } + if (!id.getDomain().equals(domain)) { + return "You can only create users at the " + domain + " domain"; + } + } catch (InvalidParticipantAddress e) { + return "Invalid username"; + } + + try { + if (accountStore.getAccount(id) != null) { + return "Account already exists"; + } + } catch (PersistenceException e) { + LOG.severe("Failed to retreive account data for " + id, e); + return "An unexpected error occured while trying to retrieve account status"; + } + + if (password == null) { + // Register the user with an empty password. + password = ""; + } + + HumanAccountDataImpl account = new HumanAccountDataImpl(id, new PasswordDigest(password.toCharArray())); + try { + accountStore.putAccount(account); + } catch (PersistenceException e) { + LOG.severe("Failed to create new account for " + id, e); + return "An unexpected error occured while trying to create the account"; + } + + return null; + } + + private void writeRegistrationPage(String message, String responseType, Locale locale, HttpServletResponse dest) + throws IOException { + dest.setContentType("text/html"); + UserRegistrationPage.write(dest.getWriter(), new GxpContext(locale), domain, message, responseType); + } +} Added: trunk/src/main/resources/wave-server.properties =================================================================== --- trunk/src/main/resources/wave-server.properties (rev 0) +++ trunk/src/main/resources/wave-server.properties 2010-12-29 03:37:12 UTC (rev 1175) @@ -0,0 +1,61 @@ +# Core Configuration for the Wave in a Box server +# + +# Domain name of the wave server +wave_server_domain = local + +# A comma separated list of address on which to listen for connections. +# Each address is a comma separated host:port pair. +http_frontend_public_address = localhost:9898 +http_frontend_addresses = ${http_frontend_public_address} + +### Server-specific variables +### + +# Settings for the different persistence stores. Currently supported: memory, file, mongodb +signer_info_store_type = memory + +# The location where signer info certificate data is stored on disk. This should be changed. +# Note: This is only used when using the file signer info store. It is ignored +# for other data store types. +signer_info_store_directory = _certificates + +# Currently supported attachment types: mongodb, disk +attachment_store_type = disk + +# The location where attachments are stored on disk. This should be changed. +# Note: This is only used when using the disk attachment store. It is ignored +# for other data store types. +attachment_store_directory = _attachments + +# Currently supported account store types: fake, memory, file, mongodb +account_store_type = memory + +# The location where accounts are stored on disk. This should be changed. +# Note: This is only used when using the file account store. It is ignored +# for other data store types. +account_store_directory = _accounts + +# Currently supported delta store types: memory, file +delta_store_type = memory + +# The location where deltas are stored on disk. This should be changed. +# Note: This is only used when using the file delta store. It is ignored +# for other data store types. +delta_store_directory = _deltas + +# Set true to use Socket.IO instead of raw WebSockets in the webclient. +use_socketio = false + +# To enable federation, edit the server.federation.config file and uncomment the line below +#include = server.federation.config + +# These two parameters MUST appear in this file AFTER the above include of the +# federation config file. This is necesary so that the federation config file +# can override these two values. + +# Set true to disable the verification of signed deltas +waveserver_disable_verification = true + +# Set true to disable the verification of signers (certificates) +waveserver_disable_signer_verification = true

1 0

29 Dec '10

Author: vjrj_ Date: 2010-12-29 04:33:31 +0100 (Wed, 29 Dec 2010) New Revision: 1174 Added: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl2?\195?\167.java trunk/src/main/java/cc/kune/core/public/images/lic/ trunk/src/main/webapp/images trunk/src/main/webapp/javascripts trunk/src/main/webapp/stylesheets trunk/src/main/webapp/templates Removed: trunk/src/main/java/org/ourproject/kune/app/public/images/lic/ trunk/src/main/java/org/ourproject/kune/app/server/wave/WaveContainerListener.java trunk/src/main/java/org/ourproject/kune/app/server/wave/WaveInterceptorModule.java trunk/src/main/java/org/ourproject/kune/app/server/wave/WavePropertiesParser.java trunk/war/WEB-INF/gems/ trunk/war/WEB-INF/publicspace/ trunk/war/images trunk/war/javascripts trunk/war/stylesheets trunk/war/templates Modified: trunk/TODO trunk/pom.xml trunk/script/mvn-eclipse.sh trunk/src/main/java/cc/kune/Kune.gwt.xml trunk/src/main/java/cc/kune/core/client/CoreGinjector.java trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java trunk/src/main/java/cc/kune/core/client/rpcservices/AsyncCallbackSimple.java trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.java trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java trunk/src/main/java/cc/kune/core/client/ws/CorePlaceManager.java trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java trunk/src/main/java/org/ourproject/kune/rack/RackServletFilter.java trunk/src/main/resources/kune.properties Log: gwt wave server update /svnroot/kune/hooks/commit-email.pl: `/usr/bin/svnlook diff /svnroot/kune -r 1174' failed with this output: Modified: trunk/TODO =================================================================== --- trunk/TODO 2010-12-20 02:20:51 UTC (rev 1173) +++ trunk/TODO 2010-12-29 03:33:31 UTC (rev 1174) @@ -11,9 +11,15 @@ Use org-mode in emacs to easy manage this file * SHORT-TERM (URGENT) +** Wave integration + [ ] org.waveprotocol.box.webclient.WebClientProd + [ ] src/org/waveprotocol/box/server/ServerMain.java + [ ] pom.xml dep references ** Update Dev Guide *** Annotations generation http://code.google.com/p/gwt-platform/wiki/BoilerplateGeneration#Eclipse *** Add -startupUrl to your GWT Run launch with /ws/?locale=en&log_level=INFO (or similar) +*** When you compile/run gwt web-app from eclipse, select target/kune-CURRENT-VERSION as War directory selection +*** src/main/webapp in GWTDesigner??? ** new UI library (gwt-ext is dead) - mosaic, - gtx Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-20 02:20:51 UTC (rev 1173) +++ trunk/pom.xml 2010-12-29 03:33:31 UTC (rev 1174) @@ -205,7 +205,7 @@ <dependency> <groupId>com.google.code.guice</groupId> <artifactId>guice</artifactId> - <version>2.0.1</version> + <version>2.1-SNAPSHOT-r1160</version> </dependency> <dependency> <groupId>com.googlecode.gwt.inject</groupId> @@ -237,7 +237,7 @@ <dependency> <groupId>cc.kune.core.ws.armor</groupId> <artifactId>ws-armor</artifactId> - <version>0.0.8</version> + <version>0.0.9</version> </dependency> <dependency> <groupId>com.gwtplatform</groupId> @@ -499,9 +499,8 @@  <dependency> <groupId>org.waveprotocol</groupId> - <artifactId>kune-wave-server</artifactId> -  - <version>0.0.2.2</version> + <artifactId>waveinabox-server</artifactId> + <version>0.0.3.2</version> </dependency> <dependency> <groupId>commons-cli</groupId> @@ -521,62 +520,62 @@    +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice-assistedinject</artifactId> - <version>2.0</version> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>r07</version> </dependency> - <dependency> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - <version>0.9.94</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.gnu.inet</groupId> - <artifactId>libidn</artifactId> - <version>1.15</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - <version>2.1.0</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - <version>1.1.4c</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3_xpath</artifactId> - <version>1.1.4c</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - <version>1.0</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.wave-protocol</groupId> - <artifactId>xmpp</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.wave-protocol</groupId> - <artifactId>whack</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>com.google.common</groupId> - <artifactId>collect</artifactId> - <version>1.0-rc2</version> - </dependency> </dependencies> <distributionManagement> <repository> @@ -714,8 +713,8 @@ <groupId>org.codehaus.mojo</groupId> <artifactId>tomcat-maven-plugin</artifactId> <version>1.0</version> -<configuration> - <path>/</path> + <configuration> + <path>/</path> </configuration> </plugin> <plugin> @@ -726,9 +725,7 @@  <configuration> <webAppConfig> -  +  <contextPath>/</contextPath> </webAppConfig> <reload>manual</reload> @@ -815,39 +812,39 @@ <artifactId>maven-jar-plugin</artifactId> <version>2.2</version> <executions> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  <execution> <id>helloworldmodule</id> <phase>package</phase> @@ -890,14 +887,14 @@ <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>   -  -  -  -  -  -  -  -  +  +  +  +  +  +  +  +  <extensions> <extension> <groupId>org.apache.maven.wagon</groupId> Modified: trunk/script/mvn-eclipse.sh =================================================================== --- trunk/script/mvn-eclipse.sh 2010-12-20 02:20:51 UTC (rev 1173) +++ trunk/script/mvn-eclipse.sh 2010-12-29 03:33:31 UTC (rev 1174) @@ -1,3 +1,3 @@ -mvn eclipse:eclipse +mvn eclipse:eclipse -Dgwt.compiler.skip=true perl -p -i -e 's/<\/classpath>//g' .classpath echo -en " <classpathentry kind=\"con\" path=\"com.google.gwt.eclipse.core.GWT_CONTAINER\"/>\n</classpath>" >> .classpath Modified: trunk/src/main/java/cc/kune/Kune.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/Kune.gwt.xml 2010-12-20 02:20:51 UTC (rev 1173) +++ trunk/src/main/java/cc/kune/Kune.gwt.xml 2010-12-29 03:33:31 UTC (rev 1174) @@ -1,33 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.0.1/distro-source/core/…"> <module rename-to="ws"> - <inherits name="com.google.gwt.user.User" /> - <inherits name='com.google.gwt.logging.Logging' /> - <inherits name="cc.kune.core.Core" /> - <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java"/> -  -  - -  - <set-property name="gwt.logging.enabled" value="TRUE" /> - <set-property name="gwt.logging.logLevel" value="INFO" /> - <set-property name="gwt.logging.consoleHandler" value="ENABLED" /> - <set-property name="gwt.logging.developmentModeHandler" - value="ENABLED" /> - <set-property name="gwt.logging.firebugHandler" value="ENABLED" /> - <set-property name="gwt.logging.hasWidgetsHandler" value="DISABLED" /> - <set-property name="gwt.logging.popupHandler" value="DISABLED" /> - <set-property name="gwt.logging.systemHandler" value="ENABLED" /> - <set-property name="gwt.logging.simpleRemoteHandler" - value="DISABLED" /> - -  - -  -  -  - <set-property name="user.agent" value="safari,gecko1_8" /> -</module> + <inherits name="com.google.gwt.user.User" /> + <inherits name='com.google.gwt.logging.Logging' /> + <inherits name="cc.kune.core.Core" /> + <inherits name="com.calclab.suco.Suco" /> + <source path='client' + excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> +  +  +  + <set-property name="gwt.logging.enabled" value="TRUE" /> + <set-property name="gwt.logging.logLevel" value="INFO" /> + <set-property name="gwt.logging.consoleHandler" value="ENABLED" /> + <set-property name="gwt.logging.developmentModeHandler" + value="ENABLED" /> + <set-property name="gwt.logging.firebugHandler" value="ENABLED" /> + <set-property name="gwt.logging.hasWidgetsHandler" value="DISABLED" /> + <set-property name="gwt.logging.popupHandler" value="DISABLED" /> + <set-property name="gwt.logging.systemHandler" value="ENABLED" /> + <set-property name="gwt.logging.simpleRemoteHandler" + value="DISABLED" /> +  +  +  +  + <set-property name="user.agent" value="safari,gecko1_8" /> +</module> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/CoreGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinjector.java 2010-12-20 02:20:51 UTC (rev 1173) +++ trunk/src/main/java/cc/kune/core/client/CoreGinjector.java 2010-12-29 03:33:31 UTC (rev 1174) @@ -1,10 +1,13 @@ package cc.kune.core.client; import cc.kune.core.client.cookies.CookiesManager; +import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.notify.SpinerPresenter; import cc.kune.core.client.notify.UserNotifierPresenter; import cc.kune.core.client.sitebar.logo.SiteLogoPresenter; +import cc.kune.core.client.state.StateManager; import cc.kune.core.client.ws.CorePresenter; +import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.inject.client.AsyncProvider; import com.google.gwt.inject.client.GinModules; @@ -16,6 +19,8 @@ @GinModules({ CoreGinModule.class }) public interface CoreGinjector extends Ginjector { + ErrorHandler getErrorHandler(); + AsyncProvider<CorePresenter> getCorePresenter(); AsyncProvider<CookiesManager> getCookiesManager(); @@ -32,4 +37,8 @@ AsyncProvider<UserNotifierPresenter> getUserNotifierPresenter(); + I18nTranslationService getI18n(); + + StateManager getStateManager(); + } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java 2010-12-20 02:20:51 UTC (rev 1173) +++ trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java 2010-12-29 03:33:31 UTC (rev 1174) @@ -1,5 +1,7 @@ package cc.kune.core.client; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; + import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.GWT.UncaughtExceptionHandler; @@ -18,6 +20,7 @@ * * @see com.google.gwt.core.client.EntryPoint#onModuleLoad() */ + @Override public void onModuleLoad() { GWT.setUncaughtExceptionHandler(new UncaughtExceptionHandler() { @Override @@ -28,6 +31,7 @@ }); Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override public void execute() { onModuleLoadCont(); } @@ -39,7 +43,11 @@ */ public void onModuleLoadCont() { DelayedBindRegistry.bind(ginjector); + AsyncCallbackSimple.init(ginjector.getErrorHandler()); ginjector.getPlaceManager().revealCurrentPlace(); + ginjector.getI18n(); + ginjector.getUserNotifierPresenter(); + ginjector.getSpinerPresenter(); + ginjector.getStateManager(); } - } Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2010-12-20 02:20:51 UTC (rev 1173) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2010-12-29 03:33:31 UTC (rev 1174) @@ -37,6 +37,7 @@ import com.gwtplatform.mvp.client.proxy.PlaceManager; public class ErrorHandler { + private final Session session; private final I18nTranslationService i18n; private final Event0 onSessionExpired; Modified: trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2010-12-20 02:20:51 UTC (rev 1173) +++ trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2010-12-29 03:33:31 UTC (rev 1174) @@ -97,7 +97,6 @@ @Override public void execute() { hideInitialPanels(); - eventBus.fireEvent(new ProgressHideEvent()); } }); } Modified: trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java 2010-12-20 02:20:51 UTC (rev 1173) +++ trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java 2010-12-29 03:33:31 UTC (rev 1174) @@ -26,7 +26,7 @@ widget = uiBinder.createAndBindUi(this); popup = new PopupPanel(false, false); popup.add(widget); - popup.setPopupPosition(7, 0); + popup.setPopupPosition(0, 0); popup.setStyleName("k-spiner-popup"); popup.show(); } @@ -57,7 +57,7 @@ @Override public void show(String message) { if (message == null || message.isEmpty()) { - label.setText("Fixme"); + label.setText(""); } else { label.setText(message); } Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/AsyncCallbackSimple.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/AsyncCallbackSimple.java 2010-12-20 02:20:51 UTC (rev 1173) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/AsyncCallbackSimple.java 2010-12-29 03:33:31 UTC (rev 1174) @@ -22,15 +22,18 @@ import cc.kune.core.client.errors.ErrorHandler; import com.google.gwt.user.client.rpc.AsyncCallback; -import com.google.inject.Inject; public abstract class AsyncCallbackSimple<T> implements AsyncCallback<T> { - @Inject - private ErrorHandler errorHandler; + private static ErrorHandler errorHandler; + @Override public void onFailure(final Throwable caught) { errorHandler.process(caught); } + public static void init(ErrorHandler kuneErrorHandler) { + errorHandler = kuneErrorHandler; + } + } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java 2010-12-20 02:20:51 UTC (rev 1173) +++ trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java 2010-12-29 03:33:31 UTC (rev 1174) @@ -1,9 +1,13 @@ package cc.kune.core.client.sitebar.logo; import cc.kune.core.client.init.AppStartEvent; +import cc.kune.core.client.ws.CorePlaceManager; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.inject.Inject; import com.gwtplatform.mvp.client.EventBus; +import com.gwtplatform.mvp.client.HasUiHandlers; import com.gwtplatform.mvp.client.Presenter; import com.gwtplatform.mvp.client.View; import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; @@ -11,9 +15,12 @@ import com.gwtplatform.mvp.client.proxy.Proxy; import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent; -public class SiteLogoPresenter extends Presenter<SiteLogoPresenter.SiteLogoView, SiteLogoPresenter.SiteLogoProxy> { +public class SiteLogoPresenter extends Presenter<SiteLogoPresenter.SiteLogoView, SiteLogoPresenter.SiteLogoProxy> + implements SiteLogoUiHandlers { - public interface SiteLogoView extends View { + private final CorePlaceManager placeManager; + + public interface SiteLogoView extends View, HasUiHandlers<SiteLogoUiHandlers> { void setSiteLogoUrl(String siteLogoUrl); } @@ -22,8 +29,10 @@ } @Inject - public SiteLogoPresenter(EventBus eventBus, SiteLogoView view, SiteLogoProxy proxy) { + public SiteLogoPresenter(EventBus eventBus, SiteLogoView view, SiteLogoProxy proxy, CorePlaceManager placeManager) { super(eventBus, view, proxy); + this.placeManager = placeManager; + getView().setUiHandlers(this); } @Override @@ -35,4 +44,14 @@ public void onAppStart(AppStartEvent event) { getView().setSiteLogoUrl(event.getInitData().getSiteLogoUrl()); } + + @Override + public void onClick() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override + public void execute() { + // placeManager.revealDefaultPlace(); + } + }); + } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.java 2010-12-20 02:20:51 UTC (rev 1173) +++ trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.java 2010-12-29 03:33:31 UTC (rev 1174) @@ -1,49 +1,48 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ package cc.kune.core.client.sitebar.logo; +import cc.kune.core.client.sitebar.logo.SiteLogoPresenter.SiteLogoView; import cc.kune.core.ws.armor.client.WsArmor; +import com.google.gwt.core.client.GWT; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiHandler; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; -import com.gwtplatform.mvp.client.ViewImpl; +import com.gwtplatform.mvp.client.ViewWithUiHandlers; +import com.gwtplatform.mvp.client.proxy.PlaceManager; -public class SiteLogoViewImpl extends ViewImpl implements SiteLogoPresenter.SiteLogoView { +public class SiteLogoViewImpl extends ViewWithUiHandlers<SiteLogoUiHandlers> implements SiteLogoView { - private final Image siteLogoImg; + private static SiteLogoViewImplUiBinder uiBinder = GWT.create(SiteLogoViewImplUiBinder.class); + interface SiteLogoViewImplUiBinder extends UiBinder<Widget, SiteLogoViewImpl> { + } + @Inject - public SiteLogoViewImpl(WsArmor armor) { - siteLogoImg = new Image(); - siteLogoImg.addStyleName("k-floatright"); - armor.getSitebar().add(siteLogoImg); + public SiteLogoViewImpl(WsArmor armor, PlaceManager placeManager) { + armor.getSitebar().add(uiBinder.createAndBindUi(this)); } - @Override - public void setSiteLogoUrl(final String siteLogoUrl) { - siteLogoImg.setUrl(siteLogoUrl); + @UiField + Image logo; + + @UiHandler("logo") + void onLogoClick(ClickEvent event) { + if (getUiHandlers() != null) { + getUiHandlers().onClick(); + } } @Override public Widget asWidget() { - return siteLogoImg; + return logo; } + + @Override + public void setSiteLogoUrl(String siteLogoUrl) { + logo.setUrl(siteLogoUrl); + } } Copied: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl2?\195?\167.java (from rev 1172, trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.java) =================================================================== svnlook: Can't convert string from 'UTF-8' to native encoding: svnlook: --- trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl2?\195?\167.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl2?\195?\167.java 2010-12-29 03:33:31 UTC (rev 1174)

1 0

r1173 - in trunk: . src/main src/main/java/cc/kune/core/client/ws src/main/java/cc/kune/core/public src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink src/main/java/org/ourproject/kune/workspace/client/cnt src/main/webapp src/main/webapp/WEB-INF war/WEB-INF
by Vicente J. Ruiz Jurado 20 Dec '10

20 Dec '10

Author: vjrj_ Date: 2010-12-20 03:20:51 +0100 (Mon, 20 Dec 2010) New Revision: 1173 Added: trunk/src/main/webapp/ trunk/src/main/webapp/WEB-INF/ trunk/src/main/webapp/WEB-INF/gems/ trunk/src/main/webapp/WEB-INF/localhost.cer trunk/src/main/webapp/WEB-INF/localhost.key trunk/src/main/webapp/WEB-INF/publicspace/ trunk/src/main/webapp/WEB-INF/web.xml Removed: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/AbstractRichTextAreaTest.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/AbstractWysiwygClientTest.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/LinkInfoTest.java trunk/war/WEB-INF/localhost.cer trunk/war/WEB-INF/localhost.key trunk/war/WEB-INF/web.xml Modified: trunk/DEV-GUIDE trunk/pom.xml trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java trunk/src/main/java/cc/kune/core/public/ws.html trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/AbstractContentView.java trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java Log: NEW - # 9: Roo partial use/integration http://kune.ourproject.org/issues/ticket/9 (pom.xml & webapp refactor to follow standards) Modified: trunk/DEV-GUIDE =================================================================== --- trunk/DEV-GUIDE 2010-12-19 23:32:38 UTC (rev 1172) +++ trunk/DEV-GUIDE 2010-12-20 02:20:51 UTC (rev 1173) @@ -244,6 +244,11 @@ http://pmd.sourceforge.net/ http://pmd.sourceforge.net/eclipse/ +=== Identation === + +More than the eclipse code preferences we try to: +* Use spaces instead of tabs (for instance in xml, we try to use 2 spaces of identation) + ==Use of mylyn in eclipse== To use mylyn and to track the kune issues from eclipse, you have to add a "Web Repository" and select "ASM (gforge" with server: http://ourproject.org. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-19 23:32:38 UTC (rev 1172) +++ trunk/pom.xml 2010-12-20 02:20:51 UTC (rev 1173) @@ -1,910 +1,940 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>cc.kune</groupId> - <artifactId>kune</artifactId> - <packaging>war</packaging> - <version>0.0.7</version> - <name>kune</name> - <description> kune free/open/libre collaboration platform </description> - <url>http://kune.ourproject.org</url> - <properties> -  - <gwtVersion>2.1.0</gwtVersion> - <maven.compiler.source>1.6</maven.compiler.source> - <maven.compiler.target>1.6</maven.compiler.target> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <slf4j.version>1.6.1</slf4j.version> - <openjpa.version>2.0.1</openjpa.version> - </properties> - <dependencies> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-servlet</artifactId> - <version>${gwtVersion}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - <version>${gwtVersion}</version> - <scope>provided</scope> - </dependency> -  - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice</artifactId> - <version>2.0.1</version> - </dependency> - <dependency> - <groupId>com.googlecode.gwt.inject</groupId> - <artifactId>gin</artifactId> - <version>r137</version> - </dependency> - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice-servlet</artifactId> - <version>2.0.1</version> - </dependency> - <dependency> - <groupId>org.ourproject.common</groupId> - <artifactId>gwt-common</artifactId> - <version>0.0.3</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.extjs</groupId> - <artifactId>gxt</artifactId> - <version>2.2.1</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.cobogw.gwt</groupId> - <artifactId>cobogw</artifactId> - <version>1.3.1</version> - </dependency> - <dependency> - <groupId>cc.kune.core.ws.armor</groupId> - <artifactId>ws-armor</artifactId> - <version>0.0.7</version> - </dependency> - <dependency> - <groupId>com.gwtplatform</groupId> - <artifactId>gwtp</artifactId> - <version>0.4</version> - </dependency> -  - <dependency> - <groupId>com.gwtext</groupId> - <artifactId>gwtext</artifactId> - <version>2.0.5</version> - </dependency> - <dependency> - <groupId>com.gwtextux</groupId> - <artifactId>gwtextux</artifactId> - <version>0.4.0.924</version> - </dependency> - <dependency> - <groupId>com.allen_sauer.gwt.log.gwt-log</groupId> - <artifactId>gwt-log</artifactId> - <version>3.0.1</version> - </dependency> - <dependency> - <groupId>com.allen_sauer.gwt.voices.gwt-voices</groupId> - <artifactId>gwt-voices</artifactId> - <version>1.6.0</version> - </dependency> -  - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - <dependency> - <groupId>net.sf.dozer</groupId> - <artifactId>dozer</artifactId> - <version>4.0</version> - </dependency> - <dependency> - <groupId>com.calclab</groupId> - <artifactId>suco</artifactId> - <version>0.6.5</version> - </dependency> - <dependency> - <groupId>jmagick</groupId> - <artifactId>jmagick</artifactId> - <version>6.2.6-0</version> - </dependency> - <dependency> - <groupId>org.xwiki.platform</groupId> - <artifactId>xwiki-web-gwt-dom</artifactId> - <version>2.3-rc-1</version> -  -  -  - </dependency> -  - <dependency> - <groupId>com.calclab.emite</groupId> - <artifactId>emite</artifactId> - <version>0.4.7</version> - </dependency> - <dependency> - <groupId>org.jivesoftware.smack</groupId> - <artifactId>smack</artifactId> - <version>3.0.4</version> - </dependency> - <dependency> - <groupId>org.jivesoftware.smackx</groupId> - <artifactId>smackx</artifactId> - <version>3.0.4</version> - </dependency> - <dependency> - <groupId>org.jivesoftware.smackx.debugger</groupId> - <artifactId>smackx-debugger</artifactId> - <version>3.0.4</version> - </dependency> -  - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.1.13</version> - </dependency> -  - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>3.3.1.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>4.0.2.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.4.0.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - <version>3.3.0.ga</version> - </dependency> -  - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search</artifactId> - <version>3.1.0.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.4.0.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-tools</artifactId> - <version>3.2.3.GA</version> - </dependency> - <dependency> - <groupId>c3p0</groupId> - <artifactId>c3p0</artifactId> - <version>0.9.1.2</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>com.wideplay</groupId> - <artifactId>warp-persist</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> -  - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> -  - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${slf4j.version}</version> -  - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j.version}</version> -  - </dependency> -  - <dependency> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - <version>1.2.2</version> - </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>org.codehaus.jettison</groupId> - <artifactId>jettison</artifactId> - <version>1.0-RC2</version> - </dependency> - <dependency> - <groupId>net.sf.json-lib</groupId> - <artifactId>json-lib</artifactId> - <version>2.1</version> - <classifier>jdk15</classifier> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2</version> - </dependency> -  - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.1.1</version> - </dependency> -  - <dependency> - <groupId>org.liquibase</groupId> - <artifactId>liquibase-core</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>org.liquibase</groupId> - <artifactId>liquibase-plugin</artifactId> - <version>1.7.0.0</version> - </dependency> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> -  - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> - <version>1.6</version> - </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.0.20070617</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> -  - <scope>test</scope> - </dependency> -  -  -  -  -  -  -  - <dependency> - <groupId>org.jruby.rack</groupId> - <artifactId>jruby-rack</artifactId> - <version>1.0.3</version> -  - </dependency> -  - <dependency> - <groupId>org.waveprotocol</groupId> - <artifactId>kune-wave-server</artifactId> - <version>0.0.3.1</version> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.2</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> - <type>jar</type> - </dependency> -  -  -  -  -  -  - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice-assistedinject</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - <version>0.9.94</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.gnu.inet</groupId> - <artifactId>libidn</artifactId> - <version>1.15</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - <version>2.1.0</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - <version>1.1.4c</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3_xpath</artifactId> - <version>1.1.4c</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - <version>1.0</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.wave-protocol</groupId> - <artifactId>xmpp</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.wave-protocol</groupId> - <artifactId>whack</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>com.google.common</groupId> - <artifactId>collect</artifactId> - <version>1.0-rc2</version> - </dependency> - </dependencies> - <distributionManagement> - <repository> - <id>kune.ourproject.org</id> - <url>scpexe://kune.ourproject.org/home/groups/kune/htdocs/mavenrepo/</url> - </repository> - </distributionManagement> - <pluginRepositories> -  - <pluginRepository> - <id>jboss-public-repository-group</id> - <name>JBoss Public Maven Repository Group</name> - <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </pluginRepository> -  -  - <pluginRepository> - <id>Codehaus Snapshots</id> - <url>http://snapshots.repository.codehaus.org/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled>  - </releases> - </pluginRepository> - <pluginRepository> - <id>gwt-plugin-repo</id> - <url>http://google-web-toolkit.googlecode.com/svn/2.1.0.M3/gwt/maven</url> - <name>Google Web Toolkit Plugin Repository</name> - </pluginRepository> - <pluginRepository> - <id>maven2-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url>http://download.java.net/maven/2/</url> - <layout>default</layout> - </pluginRepository> - </pluginRepositories> - <repositories> - <repository> - <id>guice-maven</id> - <name>guice maven</name> - <url>http://guice-maven.googlecode.com/svn/trunk</url> - </repository> - <repository> - <id>Codehaus Snapshots</id> - <url>http://snapshots.repository.codehaus.org/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - <repository> - <id>jboss-public-repository-group</id> - <name>JBoss Public Maven Repository Group</name> - <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository> - <repository> - <id>mvp4g.googlecode.releases</id> - <name>Releases Repository for Mvp4g</name> - <url>http://mvp4g.googlecode.com/svn/maven2/releases/</url> - </repository> - <repository> - <id>ext-gxt</id> - <name>ext-gxt at jahia</name> - <url>http://maven.jahia.org/maven2/</url> - </repository> - <repository> - <id>ext-gxt</id> - <name>ext-gxt at jahia</name> - <url>http://maven.jahia.org/maven2/</url> - </repository> - <repository> - <id>cobogw</id> - <name>Cobogw repository at googlecode</name> - <url>http://cobogw.googlecode.com/svn/maven2</url> - </repository> - <repository> - <id>gwtp</id> - <name>gwtp repo</name> - <url>http://maven.gwt-platform.googlecode.com/hg/</url> - </repository> -  - <repository> - <id>dyndns-repo</id> - <url>http://maven.dyndns.org/2</url> - </repository> - <repository> - <id>gwt-maven</id> - <url> - http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>cc.kune</groupId> + <artifactId>kune</artifactId> + <packaging>war</packaging> + <version>0.0.7</version> + <name>kune</name> + <description> kune free/open/libre collaboration platform </description> + <url>http://kune.ourproject.org</url> + <properties> +  + <gwt.version>2.1.0</gwt.version> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.target>1.6</maven.compiler.target> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <slf4j.version>1.6.1</slf4j.version> + <openjpa.version>2.0.1</openjpa.version> + </properties> + <repositories> + <repository> + <id>guice-maven</id> + <name>guice maven</name> + <url>http://guice-maven.googlecode.com/svn/trunk</url> + </repository> + <repository> + <id>Codehaus Snapshots</id> + <url>http://snapshots.repository.codehaus.org/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + <repository> + <id>jboss-public-repository-group</id> + <name>JBoss Public Maven Repository Group</name> + <url>https://repository.jboss.org/nexus/content/groups/public-jboss/ </url> - </repository> - <repository> - <id>kune-maven</id> - <url>http://kune.ourproject.org/mavenrepo/</url> - </repository> - <repository> - <id>google-maven-snapshot-repository</id> - <name>Google Maven Snapshot Repository</name> - <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - <repository> - <id>openqa.org</id> - <name>Openqa Release Repository</name> - <url>http://archiva.openqa.org/repository/releases</url> - <layout>default</layout> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>openqa.org snapshots</id> - <name>Openqa Snapshot Repository</name> - <url>http://archiva.openqa.org/repository/snapshots</url> - <layout>default</layout> - <snapshots> - <enabled>true</enabled> - <updatePolicy>daily</updatePolicy> - <checksumPolicy>ignore</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - <repository> - <id>xwiki-releases</id> - <name>XWiki Maven2 Remote Repository for Releases</name> - <url>http://maven.xwiki.org/releases</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>xwiki</id> - <name>XWiki Repository</name> - <url>http://maven.xwiki.org/snapshots</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>daily</updatePolicy> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - </repository> - </repositories> - <issueManagement> - <system>kune issues list at ourproject.org</system> - <url>http://kune.ourproject.org/issues/</url> - </issueManagement> - <developers> - <developer> - <id>dani</id> - <name>Daniel Gómez Blasco</name> - <email>danigb(a)gmail.com</email> - </developer> - <developer> - <name>Samer Hassan</name> - <email>samer2004(a)gmail.com</email> - </developer> - <developer> - <name>Vicente J. Ruiz Jurado</name> - <email>vjrj(a)ourproject.org</email> - </developer> - </developers> - <scm> - <url>svn://scm.ourproject.org/svnroot/kune/trunk</url> - </scm> - <build> - <plugins> - <plugin> - <groupId>org.bsc.maven</groupId> - <artifactId>maven-processor-plugin</artifactId> - <version>1.3.7</version> - <executions> - <execution> - <id>process</id> - <goals> - <goal>process</goal> - </goals> - <phase>generate-sources</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.3</version> - <configuration> - <forkMode>pertest</forkMode> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> -  - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>gwt-maven-plugin</artifactId> - <version>2.1.0-1</version> - <executions> - <execution> - <configuration> -  - <soyc>false</soyc> - <style>OBF</style> - <inline>true</inline> - </configuration> - <goals> -  - <goal>compile</goal> -  - <goal>resources</goal> - </goals> - </execution> - </executions> - <configuration> - <runTarget>org.ourproject.kune.app.Kune/ws.html?log_level=DEBUG</runTarget> - <gwt.module>org.ourproject.kune.app.Kune</gwt.module> - </configuration> - </plugin> - <plugin> - <artifactId>maven-eclipse-plugin</artifactId> - <version>2.7</version> - <configuration> - <downloadSources>true</downloadSources> - <downloadJavadocs>false</downloadJavadocs> - <wtpversion>2.0</wtpversion> - </configuration> - </plugin> -  - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>7.2.1.v20101111</version> -  - <configuration> -  -  -  - <webAppSourceDirectory>war</webAppSourceDirectory> - <reload>manual</reload> - <scanIntervalSeconds>0</scanIntervalSeconds> - </configuration> - </plugin> -  - <plugin> - <groupId>org.liquibase</groupId> - <artifactId>liquibase-plugin</artifactId> - <version>1.7.0.0</version> - <executions> - <execution> - <phase>process-resources</phase> - <configuration> - <changeLogFile> - src/main/resources/db/liquibase_changelog.xml </changeLogFile> - <driver>com.mysql.jdbc.Driver</driver> - <url>jdbc:mysql://localhost/kune_dev</url> - <username>kune</username> - <password>db4kune</password> - <verbose>true</verbose> - </configuration> -  - <goals> - <goal>update</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> - <executions> - <execution> - <id>core</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>core</classifier> - <includes> - <include>**/KunePlatform.gwt.xml**</include> - <include>**/i18n/I18nTranslationService.**</include> - <include>**/i18n/I18nTranslationServiceMocked.** </include> - <include>**/TextUtils.**</include> - <include>**/IconLabelEditable.**</include> - <include>**/QuickTipsHelper.**</include> - <include>**/RichText.gwt.xml**</include> - <include>**/BasicDialog.**</include> - <include>**/HorizontalLine.**</include> - <include>**/AbstractLabel.**</include> - <include>**/IconLabel.**</include> - <include> **/EditableIconLabel.**</include> - <include> **/EditableClickListener.**</include> - <include>**/KuneStringUtils.**</include> - <include>**/IconHyperlink*.**</include> - <include>**/LabelWrapper*.**</include> - <include>**/KuneUiUtils.**</include> - <include>**/View.**</include> -  - </includes> - </configuration> - </execution> - <execution> - <id>helloworldmodule</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>helloworldmodule</classifier> - <includes> - <include>**/HelloWorld*</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>pertest</forkMode> -  - <skip>true</skip> - </configuration> - <executions> - <execution> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - </configuration> - </execution> - </executions> - </plugin> -  - </plugins> -  - <outputDirectory>war/WEB-INF/classes</outputDirectory> - <testOutputDirectory>war/WEB-INF/test-classes</testOutputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>src/main/java</directory> - </resource> - </resources> - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>1.0-beta-2</version> - </extension> - </extensions> - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>2.4</version> - <configuration> - <linkXref>true</linkXref> - <sourceEncoding>utf-8</sourceEncoding> - <minimumTokens>100</minimumTokens> - <targetJdk>1.5</targetJdk> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jdepend-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - </plugin> - </plugins> - </reporting> - <profiles> - <profile> -  - <id>m2eclipse</id> - <activation> - <property> - <name>!m2e.version</name> - </property> - </activation> -  - <dependencies> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-servlet</artifactId> - <version>${gwtVersion}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - <version>${gwtVersion}</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - </profiles> + <layout>default</layout> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + <repository> + <id>mvp4g.googlecode.releases</id> + <name>Releases Repository for Mvp4g</name> + <url>http://mvp4g.googlecode.com/svn/maven2/releases/</url> + </repository> + <repository> + <id>ext-gxt</id> + <name>ext-gxt at jahia</name> + <url>http://maven.jahia.org/maven2/</url> + </repository> + <repository> + <id>ext-gxt</id> + <name>ext-gxt at jahia</name> + <url>http://maven.jahia.org/maven2/</url> + </repository> + <repository> + <id>cobogw</id> + <name>Cobogw repository at googlecode</name> + <url>http://cobogw.googlecode.com/svn/maven2</url> + </repository> + <repository> + <id>gwtp</id> + <name>gwtp repo</name> + <url>http://maven.gwt-platform.googlecode.com/hg/</url> + </repository> + <repository> + <id>gwt-repo</id> + <url>http://google-web-toolkit.googlecode.com/svn/2.1.0/gwt/maven/</url> + <name>Google Web Toolkit Repository</name> + </repository> +  + <repository> + <id>dyndns-repo</id> + <url>http://maven.dyndns.org/2</url> + </repository> + <repository> + <id>kune-maven</id> + <url>http://kune.ourproject.org/mavenrepo/</url> + </repository> + <repository> + <id>google-maven-snapshot-repository</id> + <name>Google Maven Snapshot Repository</name> + <url>https://oss.sonatype.org/content/repositories/google-snapshots/ + </url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>openqa.org</id> + <name>Openqa Release Repository</name> + <url>http://archiva.openqa.org/repository/releases</url> + <layout>default</layout> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>openqa.org snapshots</id> + <name>Openqa Snapshot Repository</name> + <url>http://archiva.openqa.org/repository/snapshots</url> + <layout>default</layout> + <snapshots> + <enabled>true</enabled> + <updatePolicy>daily</updatePolicy> + <checksumPolicy>ignore</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + <repository> + <id>xwiki-releases</id> + <name>XWiki Maven2 Remote Repository for Releases</name> + <url>http://maven.xwiki.org/releases</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>xwiki</id> + <name>XWiki Repository</name> + <url>http://maven.xwiki.org/snapshots</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>daily</updatePolicy> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + </repository> + </repositories> + <pluginRepositories> +  + <pluginRepository> + <id>jboss-public-repository-group</id> + <name>JBoss Public Maven Repository Group</name> + <url>https://repository.jboss.org/nexus/content/groups/public-jboss/ + </url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </pluginRepository> +  +  + <pluginRepository> + <id>Codehaus Snapshots</id> + <url>http://snapshots.repository.codehaus.org/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled>  + </releases> + </pluginRepository> + <pluginRepository> + <id>maven2-repository.dev.java.net</id> + <name>Java.net Repository for Maven</name> + <url>http://download.java.net/maven/2/</url> + <layout>default</layout> + </pluginRepository> + <pluginRepository> + <id>gwt-plugin-repo</id> + <url>http://google-web-toolkit.googlecode.com/svn/2.1.0/gwt/maven/</url> + <name>Google Web Toolkit Plugin Repository</name> + </pluginRepository> + </pluginRepositories> + <dependencies> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <version>${gwt.version}</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwt.version}</version> + <scope>provided</scope> + </dependency> +  + <dependency> + <groupId>com.google.code.guice</groupId> + <artifactId>guice</artifactId> + <version>2.0.1</version> + </dependency> + <dependency> + <groupId>com.googlecode.gwt.inject</groupId> + <artifactId>gin</artifactId> + <version>r137</version> + </dependency> + <dependency> + <groupId>com.google.code.guice</groupId> + <artifactId>guice-servlet</artifactId> + <version>2.0.1</version> + </dependency> + <dependency> + <groupId>org.ourproject.common</groupId> + <artifactId>gwt-common</artifactId> + <version>0.0.3</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.extjs</groupId> + <artifactId>gxt</artifactId> + <version>2.2.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.cobogw.gwt</groupId> + <artifactId>cobogw</artifactId> + <version>1.3.1</version> + </dependency> + <dependency> + <groupId>cc.kune.core.ws.armor</groupId> + <artifactId>ws-armor</artifactId> + <version>0.0.8</version> + </dependency> + <dependency> + <groupId>com.gwtplatform</groupId> + <artifactId>gwtp</artifactId> + <version>0.4</version> + </dependency> +  + <dependency> + <groupId>com.gwtext</groupId> + <artifactId>gwtext</artifactId> + <version>2.0.5</version> + </dependency> + <dependency> + <groupId>com.gwtextux</groupId> + <artifactId>gwtextux</artifactId> + <version>0.4.0.924</version> + </dependency> + <dependency> + <groupId>com.allen_sauer.gwt.log.gwt-log</groupId> + <artifactId>gwt-log</artifactId> + <version>3.0.1</version> + </dependency> + <dependency> + <groupId>com.allen_sauer.gwt.voices.gwt-voices</groupId> + <artifactId>gwt-voices</artifactId> + <version>1.6.0</version> + </dependency> +  + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + <dependency> + <groupId>net.sf.dozer</groupId> + <artifactId>dozer</artifactId> + <version>4.0</version> + </dependency> + <dependency> + <groupId>com.calclab</groupId> + <artifactId>suco</artifactId> + <version>0.6.5</version> + </dependency> + <dependency> + <groupId>jmagick</groupId> + <artifactId>jmagick</artifactId> + <version>6.2.6-0</version> + </dependency> + <dependency> + <groupId>org.xwiki.platform</groupId> + <artifactId>xwiki-web-gwt-dom</artifactId> + <version>2.3-rc-1</version> +  +  +  + </dependency> +  + <dependency> + <groupId>com.calclab.emite</groupId> + <artifactId>emite</artifactId> + <version>0.4.7</version> + </dependency> + <dependency> + <groupId>org.jivesoftware.smack</groupId> + <artifactId>smack</artifactId> + <version>3.0.4</version> + </dependency> + <dependency> + <groupId>org.jivesoftware.smackx</groupId> + <artifactId>smackx</artifactId> + <version>3.0.4</version> + </dependency> + <dependency> + <groupId>org.jivesoftware.smackx.debugger</groupId> + <artifactId>smackx-debugger</artifactId> + <version>3.0.4</version> + </dependency> +  + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.1.13</version> + </dependency> +  + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.3.1.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>4.0.2.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.4.0.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-commons-annotations</artifactId> + <version>3.3.0.ga</version> + </dependency> +  + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search</artifactId> + <version>3.1.0.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.4.0.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-tools</artifactId> + <version>3.2.3.GA</version> + </dependency> + <dependency> + <groupId>c3p0</groupId> + <artifactId>c3p0</artifactId> + <version>0.9.1.2</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>com.wideplay</groupId> + <artifactId>warp-persist</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> +  + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> +  + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>${slf4j.version}</version> +  + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4j.version}</version> +  + </dependency> +  + <dependency> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + <version>1.2.2</version> + </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>org.codehaus.jettison</groupId> + <artifactId>jettison</artifactId> + <version>1.0-RC2</version> + </dependency> + <dependency> + <groupId>net.sf.json-lib</groupId> + <artifactId>json-lib</artifactId> + <version>2.1</version> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2</version> + </dependency> +  + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.1.1</version> + </dependency> +  + <dependency> + <groupId>org.liquibase</groupId> + <artifactId>liquibase-core</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>org.liquibase</groupId> + <artifactId>liquibase-plugin</artifactId> + <version>1.7.0.0</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> +  + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> + <version>1.6</version> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.0.20070617</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> +  + <scope>test</scope> + </dependency> +  +  +  +  +  +  +  + <dependency> + <groupId>org.jruby.rack</groupId> + <artifactId>jruby-rack</artifactId> + <version>1.0.3</version> +  + </dependency> +  + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>kune-wave-server</artifactId> +  + <version>0.0.2.2</version> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.2</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + <type>jar</type> + </dependency> +  +  +  +  +  +  + <dependency> + <groupId>com.google.code.guice</groupId> + <artifactId>guice-assistedinject</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + <version>0.9.94</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.gnu.inet</groupId> + <artifactId>libidn</artifactId> + <version>1.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>2.1.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + <version>1.1.4c</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3_xpath</artifactId> + <version>1.1.4c</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>aopalliance</groupId> + <artifactId>aopalliance</artifactId> + <version>1.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.wave-protocol</groupId> + <artifactId>xmpp</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>org.wave-protocol</groupId> + <artifactId>whack</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>com.google.common</groupId> + <artifactId>collect</artifactId> + <version>1.0-rc2</version> + </dependency> + </dependencies> + <distributionManagement> + <repository> + <id>kune.ourproject.org</id> + <url>scpexe://kune.ourproject.org/home/groups/kune/htdocs/mavenrepo/ + </url> + </repository> + </distributionManagement> + <issueManagement> + <system>kune issues list at ourproject.org</system> + <url>http://kune.ourproject.org/issues/</url> + </issueManagement> + <developers> + <developer> + <id>dani</id> + <name>Daniel Gómez Blasco</name> + <email>danigb(a)gmail.com</email> + </developer> + <developer> + <name>Samer Hassan</name> + <email>samer2004(a)gmail.com</email> + </developer> + <developer> + <name>Vicente J. Ruiz Jurado</name> + <email>vjrj(a)ourproject.org</email> + </developer> + </developers> + <scm> + <url>svn://scm.ourproject.org/svnroot/kune/trunk</url> + </scm> + <build> + <plugins> + <plugin> +  + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.1-beta-1</version> +  + </plugin> + <plugin> +  + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.1</version> + <configuration> + <source>1.6</source> + <target>1.6</target> +  + </configuration> + </plugin> + <plugin> +  + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.4.2</version> + <configuration> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + <plugin> +  + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.5</version> + <configuration> + <excludes> + <exclude>**/*_Roo_*</exclude> + </excludes> + <forkMode>pertest</forkMode> +  + <skip>true</skip> + </configuration> + <executions> + <execution> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + </configuration> + </execution> + </executions> + </plugin> + <plugin> +  + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-5</version> + <configuration> + <descriptorRefs> + <descriptorRef>jar-with-dependencies</descriptorRef> + </descriptorRefs> + </configuration> + </plugin> + <plugin> +  + <artifactId>maven-eclipse-plugin</artifactId> + <version>2.7</version> + <configuration> + <downloadSources>true</downloadSources> + <downloadJavadocs>false</downloadJavadocs> + <wtpversion>2.0</wtpversion> + <additionalBuildcommands> + <buildCommand> + <name>com.google.gwt.eclipse.core.gwtProjectValidator </name> + </buildCommand> + </additionalBuildcommands> + <additionalProjectnatures> + <projectnature>org.eclipse.ajdt.ui.ajnature</projectnature> + <projectnature>com.google.gwt.eclipse.core.gwtNature </projectnature> + </additionalProjectnatures> + </configuration> + </plugin> + <plugin> +  + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.5</version> + </plugin> + <plugin> +  + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-idea-plugin</artifactId> + <version>2.2</version> + <configuration> + <downloadSources>true</downloadSources> + <dependenciesAsLibraries>true</dependenciesAsLibraries> + </configuration> + </plugin> + <plugin> +  + <groupId>org.codehaus.mojo</groupId> + <artifactId>tomcat-maven-plugin</artifactId> + <version>1.0</version> +<configuration> + <path>/</path> + </configuration> + </plugin> + <plugin> +  + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>7.1.2.v20100523</version> +  + <configuration> + <webAppConfig> +  + <contextPath>/</contextPath> + </webAppConfig> + <reload>manual</reload> + <scanIntervalSeconds>0</scanIntervalSeconds> + </configuration> + </plugin> + <plugin> +  +  + <groupId>org.bsc.maven</groupId> + <artifactId>maven-processor-plugin</artifactId> + <version>1.3.7</version> + <executions> + <execution> + <id>process</id> + <goals> + <goal>process</goal> + </goals> + <phase>generate-sources</phase> + </execution> + </executions> + </plugin> + <plugin> +  + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <version>1.3.2.google</version> + <configuration> + <logLevel>INFO</logLevel> + <style>OBF</style> + <soyc>false</soyc> + <gwtVersion>${gwt.version}</gwtVersion> + <runTarget>/ws/ws.html?log_level=DEBUG</runTarget> + <hostedWebapp>${project.build.directory}/${project.build.finalName}</hostedWebapp> + <modules> + <module>${project.groupId}.Kune</module> + </modules> + <copyWebapp>true</copyWebapp> + </configuration> + <executions> + <execution> + <id>gwtcompile</id> + <phase>prepare-package</phase> + <goals> + <goal>compile</goal> +  +  + </goals> + </execution> + </executions> + </plugin> +  + <plugin> + <groupId>org.liquibase</groupId> + <artifactId>liquibase-plugin</artifactId> + <version>1.7.0.0</version> + <executions> + <execution> + <phase>process-resources</phase> + <configuration> + <changeLogFile> + src/main/resources/db/liquibase_changelog.xml </changeLogFile> + <driver>com.mysql.jdbc.Driver</driver> + <url>jdbc:mysql://localhost/kune_dev</url> + <username>kune</username> + <password>db4kune</password> + <verbose>true</verbose> + </configuration> +  + <goals> + <goal>update</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> + <executions> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <execution> + <id>helloworldmodule</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>helloworldmodule</classifier> + <includes> + <include>**/HelloWorld*</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  + </plugins> +  + <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory> +  +  +  +  +  +  +  +  +  +  + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>1.0-beta-2</version> + </extension> + </extensions> + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <version>2.4</version> + <configuration> + <linkXref>true</linkXref> + <sourceEncoding>utf-8</sourceEncoding> + <minimumTokens>100</minimumTokens> + <targetJdk>1.5</targetJdk> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jdepend-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + </plugin> + </plugins> + </reporting> </project> Modified: trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java 2010-12-19 23:32:38 UTC (rev 1172) +++ trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java 2010-12-20 02:20:51 UTC (rev 1173) @@ -7,7 +7,6 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.History; -import com.google.gwt.user.client.ui.InlineLabel; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; import com.gwtplatform.mvp.client.ViewImpl; @@ -30,8 +29,6 @@ this.armor = armor; GWT.<CoreResources> create(CoreResources.class).css().ensureInjected(); GWT.<WsArmorResources> create(WsArmorResources.class).style().ensureInjected(); - armor.getEntityHeader().add(new InlineLabel("Test - a, e, i, o, u")); - armor.getDocHeader().add(new InlineLabel("doc title")); History.addValueChangeHandler(stateManager); } Modified: trunk/src/main/java/cc/kune/core/public/ws.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.html 2010-12-19 23:32:38 UTC (rev 1172) +++ trunk/src/main/java/cc/kune/core/public/ws.html 2010-12-20 02:20:51 UTC (rev 1173) @@ -24,15 +24,14 @@ #kuneloading { position: absolute; left: 45%; - top: 40%;  + top: 40%; z-index: 20001; height: auto; border: solid 2px #ccc; -moz-border-radius: 10px; -webkit-border-radius: 10px; border-radius: 10px; - background: white; + background-color: white; } #kuneloading a { Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/AbstractRichTextAreaTest.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/AbstractRichTextAreaTest.java 2010-12-19 23:32:38 UTC (rev 1172) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/AbstractRichTextAreaTest.java 2010-12-20 02:20:51 UTC (rev 1173) @@ -1,147 +0,0 @@ -/* - * See the NOTICE file distributed with this work for additional - * information regarding copyright ownership. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.ourproject.kune.platf.client.ui.rte.insertlink; - -import org.ourproject.kune.platf.client.ui.rte.RichTextArea; -import org.xwiki.gwt.dom.client.Element; -import org.xwiki.gwt.dom.client.Range; -import org.xwiki.gwt.dom.client.Selection; - -import com.google.gwt.event.dom.client.HasLoadHandlers; -import com.google.gwt.event.dom.client.LoadEvent; -import com.google.gwt.event.dom.client.LoadHandler; -import com.google.gwt.user.client.Timer; -import com.google.gwt.user.client.ui.RootPanel; - -/** - * Base class for tests running on a rich text area. - * - * @version $Id$ - */ -public class AbstractRichTextAreaTest extends AbstractWysiwygClientTest implements LoadHandler { - /** - * The number of milliseconds we delay the test finish. This delay is needed - * because in some browsers the rich text area is initialized after a - * timeout. - */ - public static final int FINISH_DELAY = 400; - - /** - * The number of milliseconds we delay the test start. This delay is needed - * because in some browsers the rich text area is initialized after a - * timeout and we want to start the test after the rich text area is fully - * initialized. - */ - public static final int START_DELAY = 300; - - /** - * The rich text area on which we run the tests. - */ - protected RichTextArea rta; - - public void onLoad(final LoadEvent event) { - // http://wiki.codetalks.org/wiki/index.php/Docs/Keyboard_navigable_JS_widgets - // #Use_setTimeout_with_element.focus.28.29_to_set_focus - (new Timer() { - @Override - public void run() { - rta.setFocus(true); - } - }).schedule(1); - } - - /** - * Cleans the HTML input. This is needed in order to have uniform tests - * between Firefox and Internet Explorer. - * - * @param html - * The HTML fragment to be cleaned. - * @return The input string in lower case, stripped of new lines. - */ - protected String clean(final String html) { - return html.replaceAll("\r\n", "").toLowerCase(); - } - - /** - * @return The body element of the DOM document edited with the rich text - * area. - */ - protected Element getBody() { - return rta.getDocument().getBody().cast(); - } - - /** - * {@inheritDoc} - * - * @see AbstractWysiwygClientTest#gwtSetUp() - */ - @Override - protected void gwtSetUp() throws Exception { - super.gwtSetUp(); - - if (rta == null) { - rta = new RichTextArea(); - // Workaround till GWT provides a way to detect when the rich text - // area has finished loading. - if (rta.getBasicFormatter() instanceof HasLoadHandlers) { - ((HasLoadHandlers) rta.getBasicFormatter()).addLoadHandler(this); - } - } - RootPanel.get().add(rta); - } - - /** - * {@inheritDoc} - * - * @see AbstractWysiwygClientTest#gwtTearDown() - */ - @Override - protected void gwtTearDown() throws Exception { - super.gwtTearDown(); - - RootPanel.get().remove(rta); - } - - /** - * Removes the non-breaking spaces, {@code  }, from the given HTML. The - * is method is needed because the Selection implementation for Internet - * Explorer adds {@code  } when it cannot place the caret at the - * specified place. - * - * @param html - * the HTML fragment to be cleaned of non-breaking spaces - * @return the input HTML fragment without any non-breaking spaces - */ - protected String removeNonBreakingSpaces(final String html) { - return html.replace(" ", ""); - } - - /** - * Selects the given range. - * - * @param range - * The range to be selected. - */ - protected void select(final Range range) { - final Selection selection = rta.getDocument().getSelection(); - selection.removeAllRanges(); - selection.addRange(range); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/AbstractWysiwygClientTest.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/AbstractWysiwygClientTest.java 2010-12-19 23:32:38 UTC (rev 1172) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/AbstractWysiwygClientTest.java 2010-12-20 02:20:51 UTC (rev 1173) @@ -1,55 +0,0 @@ -/* - * See the NOTICE file distributed with this work for additional - * information regarding copyright ownership. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.ourproject.kune.platf.client.ui.rte.insertlink; - -import com.google.gwt.dom.client.Document; -import com.google.gwt.junit.client.GWTTestCase; - -/** - * Base class for all WYSIWYG client tests. It returns the name of the module in - * {@link #getModuleName()} so you don't have to do it in each test. - * - * @version $Id$ - */ -public abstract class AbstractWysiwygClientTest extends GWTTestCase { - /** - * {@inheritDoc} - * - * @see GWTTestCase#getModuleName() - */ - @Override - public String getModuleName() { - return "com.xpn.xwiki.wysiwyg.Wysiwyg"; - } - - /** - * {@inheritDoc} - * - * @see GWTTestCase#gwtSetUp() - */ - @Override - protected void gwtSetUp() throws Exception { - super.gwtSetUp(); - - // We have to remove the default body border because it affects the - // range detection in IE. - Document.get().getBody().getStyle().setProperty("borderStyle", "none"); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/LinkInfoTest.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/LinkInfoTest.java 2010-12-19 23:32:38 UTC (rev 1172) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/LinkInfoTest.java 2010-12-20 02:20:51 UTC (rev 1173) @@ -1,61 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.insertlink; - -import org.xwiki.gwt.dom.client.Element; -import org.xwiki.gwt.dom.client.Range; -import org.xwiki.gwt.dom.client.Selection; - -import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.Timer; - -public class LinkInfoTest extends AbstractRichTextAreaTest { - - private static final String TEXT = "somelink"; - private static final String HREF = "http://example.com"; - private static final String TITLE = "on over"; - private static final String _BLANK = "_blank"; - - public void doTestSimpleLink() { - String html = createHtmlLink(HREF, TITLE, _BLANK, TEXT); - rta.setHTML(html); - Log.debug(rta.getHTML()); - - Range range = rta.getDocument().createRange(); - range.setStart(getBody().getFirstChild(), 1); - range.setEnd(getBody().getFirstChild(), 1); - - Selection selection = rta.getDocument().getSelection(); - selection.removeAllRanges(); - selection.addRange(range); - - Element selectedAnchor = LinkExecutableUtils.getSelectedAnchor(rta); - - Log.info(selectedAnchor.getString()); - - LinkInfo linkParsed = LinkInfo.parse(getBody().getFirstChildElement()); - assertEquals(TEXT, linkParsed.getText()); - assertEquals(HREF, linkParsed.getHref()); - assertEquals(TITLE, linkParsed.getTitle()); - assertEquals(_BLANK, linkParsed.getTarget()); - } - - @Override - public String getModuleName() { - return "org.ourproject.kune.app.Kune"; - } - - public void testPlainTextSelectionWithoutModification() { - delayTestFinish(FINISH_DELAY); - (new Timer() { - @Override - public void run() { - doTestSimpleLink(); - finishTest(); - } - }).schedule(START_DELAY); - } - - private String createHtmlLink(String href, String title, String target, String text) { - return "<a title=\"" + title + "\" href=\"" + href + "\" target=\"" + target + "\">" + text + "</a>"; - } - -} Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/AbstractContentView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/AbstractContentView.java 2010-12-19 23:32:38 UTC (rev 1172) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/AbstractContentView.java 2010-12-20 02:20:51 UTC (rev 1173) @@ -19,15 +19,12 @@ */ package org.ourproject.kune.workspace.client.cnt; -import com.calclab.suco.client.events.Listener0; import com.google.gwt.user.client.ui.Widget; public interface AbstractContentView { public void setRawContent(final String content); - public void setWave(String waveId, Listener0 onLoaded); - void attach(); void detach(); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPanel.java 2010-12-19 23:32:38 UTC (rev 1172) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPanel.java 2010-12-20 02:20:51 UTC (rev 1173) @@ -27,8 +27,6 @@ import cc.kune.core.shared.i18n.I18nTranslationService; -import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.events.Listener0; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.HTML; @@ -36,9 +34,6 @@ import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; -import com.google.gwt.wave.client.WaveWidget; -import com.google.gwt.wave.client.event.WaveLoadEvent; -import com.google.gwt.wave.client.event.WaveLoadHandler; public abstract class FoldableContentPanel extends AbstractContentPanel implements AbstractContentView { @@ -57,6 +52,7 @@ messagePanel.addStyleName("kune-Margin-7-b"); } + @Override public void setContent(final String content, final boolean showPreviewMsg) { final VerticalPanel vp = createMessageVp(showPreviewMsg); final HTML html = new HTML(content); @@ -64,10 +60,12 @@ setWidgetAsContent(vp, true); } + @Override public void setInfo(final String info) { setLabel(info); } + @Override public void setInfoMessage(final String text) { final VerticalPanel vp = createMessageVp(true); messageLabel.setText(text); @@ -80,34 +78,38 @@ setWidget(label); } + @Override public void setNoPreview() { final VerticalPanel vp = createMessageVp(true); setNoPreviewLabelMsg(); setWidgetAsContent(vp, true); } + @Override public void setRawContent(final String content) { final HTML html = new HTML(content); setDefStyle(html); setContent(html); } - public void setWave(final String waveId, final Listener0 onLoaded) { - final WaveWidget waveWidget = new WaveWidget("http://wave.google.com/a/wavesandbox.com/"); - waveWidget.setUIConfig("white", "black", "arial, sans", "10pt"); - waveWidget.setHeight("100%"); - waveWidget.addWaveLoadHandler(new WaveLoadHandler() { - public void onWaveLoad(final WaveLoadEvent event) { - Log.info("Wave '" + event.getWaveId() + "' loaded!"); - onLoaded.onEvent(); - } - }); - waveWidget.loadWave(waveId); - setWidgetAsContent(waveWidget, false); - waveWidget.setToolbarVisible(true); - waveWidget.setEditMode(false); - } + // public void setWave(final String waveId, final Listener0 onLoaded) { + // final WaveWidget waveWidget = new + // WaveWidget("http://wave.google.com/a/wavesandbox.com/"); + // waveWidget.setUIConfig("white", "black", "arial, sans", "10pt"); + // waveWidget.setHeight("100%"); + // waveWidget.addWaveLoadHandler(new WaveLoadHandler() { + // public void onWaveLoad(final WaveLoadEvent event) { + // Log.info("Wave '" + event.getWaveId() + "' loaded!"); + // onLoaded.onEvent(); + // } + // }); + // waveWidget.loadWave(waveId); + // setWidgetAsContent(waveWidget, false); + // waveWidget.setToolbarVisible(true); + // waveWidget.setEditMode(false); + // } + @Override public void setWidgetAsContent(final Widget widget, final boolean setDefMargins) { if (setDefMargins) { widget.addStyleName(DEF_CONTENT_MARGINS_STYLE); @@ -115,6 +117,7 @@ setContent(widget); } + @Override public void showImage(final String imageUrl, final String imageResizedUrl, final boolean showPreviewMsg) { final VerticalPanel vp = createMessageVp(showPreviewMsg); final Image imgOrig = new Image(imageUrl); @@ -126,12 +129,14 @@ imgOrig.addStyleName("kune-pointer"); imgResized.addStyleName("kune-pointer"); imgResized.addClickHandler(new ClickHandler() { + @Override public void onClick(final ClickEvent event) { imgResized.removeFromParent(); vp.add(imgOrig); } }); imgOrig.addClickHandler(new ClickHandler() { + @Override public void onClick(final ClickEvent event) { imgOrig.removeFromParent(); vp.add(imgResized); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java 2010-12-19 23:32:38 UTC (rev 1172) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java 2010-12-20 02:20:51 UTC (rev 1173) @@ -23,7 +23,6 @@ import org.ourproject.kune.platf.client.actions.ActionRegistry; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.download.ImageSize; -import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; @@ -38,7 +37,6 @@ import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; public abstract class FoldableContentPresenter extends AbstractContentPresenter implements FoldableContent { @@ -52,7 +50,6 @@ private final Provider<MediaUtils> mediaUtils; private String uploadType; private String waveType; - private final Listener0 onWaveLoaded; public FoldableContentPresenter(final String toolName, final StateManager stateManager, final Session session, final ActionContentToolbar toolbar, final ActionRegistry<StateToken> actionRegistry, @@ -71,13 +68,6 @@ setState(state); } }); - onWaveLoaded = new Listener0() { - @Override - public void onEvent() { - NotifyUser.hideProgress(); - NotifyUser.info("Wave loaded"); - } - }; } public String getToolName() { @@ -110,7 +100,7 @@ if (typeId.equals(getUploadType())) { setUploadedContent(state); } else if (typeId.equals(getWaveType())) { - setWaveContent(state); + // setWaveContent(state); } else { setNormalContent(state); } @@ -202,10 +192,4 @@ view.setNoPreview(); } } - - private void setWaveContent(final StateContentDTO state) { - NotifyUser.showProgressLoading(); - final String waveId = getContentBody(state); - view.setWave(waveId, onWaveLoaded); - } } Copied: trunk/src/main/webapp/WEB-INF/gems (from rev 1171, trunk/war/WEB-INF/gems) Copied: trunk/src/main/webapp/WEB-INF/localhost.cer (from rev 1171, trunk/war/WEB-INF/localhost.cer) =================================================================== --- trunk/src/main/webapp/WEB-INF/localhost.cer (rev 0) +++ trunk/src/main/webapp/WEB-INF/localhost.cer 2010-12-20 02:20:51 UTC (rev 1173) @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIC7zCCAligAwIBAgIJAP5zJqYmGz7vMA0GCSqGSIb3DQEBBQUAMFkxCzAJBgNV +BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX +aWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0wOTA4MDUxMDI2 +MDBaFw0xMDA4MDUxMDI2MDBaMFkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21l +LVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNV +BAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0mHausYX +KTlrz/fdhYA/63L8PZFwjtqCEdUh+5BFSqFlE34uhwmoIFzZat5z80tAQGjyp1EL +Ai2BegqCOHWaeOKNnwSm93a31fMy6N4rygUgs2rCjVtz6yqMCBd7c9KENifMTWY0 +agIz6C4Pk+YLnkx7rrDGyW5/jaIKNrjFioUCAwEAAaOBvjCBuzAdBgNVHQ4EFgQU +Aob17ojAhUn47dxkKOogj+NWtxUwgYsGA1UdIwSBgzCBgIAUAob17ojAhUn47dxk +KOogj+NWtxWhXaRbMFkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRl +MSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMTCWxv +Y2FsaG9zdIIJAP5zJqYmGz7vMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD +gYEANGKOujn47HIf0rYEq0Z8mnzfUet+7AtzGjueLymKSRI9PGSdgtJd/C7lQEsD +bqzIb4gu8NDE5wJjcEOikrQ6jawK/ws6s/H+BCKtrefCmbaNsv3hmC4uaQfmCkiE +U3gN9MsqSncdzBX/5kXZn7gzS0j/KVukDOykjLAAsbp4Ad4= +-----END CERTIFICATE----- Copied: trunk/src/main/webapp/WEB-INF/localhost.key (from rev 1171, trunk/war/WEB-INF/localhost.key) =================================================================== --- trunk/src/main/webapp/WEB-INF/localhost.key (rev 0) +++ trunk/src/main/webapp/WEB-INF/localhost.key 2010-12-20 02:20:51 UTC (rev 1173) @@ -0,0 +1,16 @@ +-----BEGIN PRIVATE KEY----- +MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANJh2rrGFyk5a8/3 +3YWAP+ty/D2RcI7aghHVIfuQRUqhZRN+LocJqCBc2Wrec/NLQEBo8qdRCwItgXoK +gjh1mnjijZ8Epvd2t9XzMujeK8oFILNqwo1bc+sqjAgXe3PShDYnzE1mNGoCM+gu +D5PmC55Me66wxsluf42iCja4xYqFAgMBAAECgYEAuJ/JXQlEABh1JbAGxgaTkaN5 ++unslmDpro6U4Pht5p2WXzHn0PfHhIcXAfMwXD0YqK2w7OZxO7sFmj0opDWIlZ9t +H5ruSlV1YOEmuReeGqWJRNKEVnr6BXUFtEmTRZxF2XrxGEci71afH7EziC+uNYKm +53XPKvg4/qeHE+Ig+w0CQQD2GdwkHIRKvn2KyNrI0ag4uuX7tWDk2avkRpwnjRBk +E+Z7GYiXpwGZrJktJ2lbsc3r4pU6yEPmtdLah9DJrW93AkEA2tgxWtdwyFlosBj/ +h/Eq+VCVCLR+OtbDaD8IZ0cijHtnllL99XRivnOrLUeTQfWxaUM7Qoky3tk6p5Pw +Oxbs4wJBAIM/93Aq5UMXpMzHoidH6XeX9d/wM+TZUhtErTNKwFsfYeR1EawPnYLf +0jGKu13zzebnyL64373DatixZmCo5rECQFRNgAW8hGfJeXiMyLL3hlRwZFjsHsxP +uwrHbVdLodV4HFleMxKA+SDgsgpJTkLUgLlJ+uQQshYCnIO9i4dXt30CQBsJJ+pD +9DjZXSRvklLZBqpFnFMIi+jW12GQrpNb7HO16pZNdy+Ljc0b/YZL+6nAYjbwg30c +4X+49VVcDxiJMws= +-----END PRIVATE KEY----- Copied: trunk/src/main/webapp/WEB-INF/publicspace (from rev 1171, trunk/war/WEB-INF/publicspace) Copied: trunk/src/main/webapp/WEB-INF/web.xml (from rev 1171, trunk/war/WEB-INF/web.xml) =================================================================== --- trunk/src/main/webapp/WEB-INF/web.xml (rev 0) +++ trunk/src/main/webapp/WEB-INF/web.xml 2010-12-20 02:20:51 UTC (rev 1173) @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="utf-8"?> +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee +http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + version="2.5"> +  +  +  + <display-name>ws</display-name> + <description>kune workspace</description> +  + <welcome-file-list> + <welcome-file>ws.html</welcome-file> + </welcome-file-list> + <context-param> + <param-name>jruby.standalone</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>rails.root</param-name> + <param-value>/WEB-INF/publicspace/ + </param-value> + </context-param> + <context-param> + <param-name>files.prefix</param-name> + <param-value>/WEB-INF/publicspace/public + </param-value> + </context-param> + <context-param> + <param-name>rails.env</param-name> + <param-value>production</param-value> + </context-param> + <context-param> + <param-name>jruby.max.runtimes</param-name> + <param-value>1</param-value> + </context-param> + <context-param> + <param-name>public.root</param-name> + <param-value>/public/</param-value> + </context-param> + <filter> + <filter-name>RackFilter</filter-name> + <filter-class>org.jruby.rack.RackFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>RackFilter</filter-name> + <url-pattern>/public/*</url-pattern> + </filter-mapping> + <listener> + <listener-class>org.jruby.rack.rails.RailsServletContextListener</listener-class> + </listener> + <filter> + <filter-name>rack</filter-name> + <filter-class>org.ourproject.kune.rack.RackServletFilter</filter-class> + <init-param> + <param-name>org.ourproject.kune.rack.RackModule</param-name> + <param-value> + org.ourproject.kune.app.server.KuneRackModule + </param-value> + </init-param> + </filter> + <filter-mapping> + <filter-name>rack</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <servlet> + <servlet-name>Proxy</servlet-name> + <servlet-class>de.spieleck.servlets.ProxyServlet</servlet-class> + <init-param> + <param-name>remotePath</param-name> + <param-value>/http-bind/</param-value> + </init-param> + <init-param> + <param-name>remoteServer</param-name> + <param-value>localhost</param-value> + </init-param> + <init-param> + <param-name>remotePort</param-name> + <param-value>5280</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>Proxy</servlet-name> + <url-pattern>/http-bind/</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file Deleted: trunk/war/WEB-INF/localhost.cer =================================================================== --- trunk/war/WEB-INF/localhost.cer 2010-12-19 23:32:38 UTC (rev 1172) +++ trunk/war/WEB-INF/localhost.cer 2010-12-20 02:20:51 UTC (rev 1173) @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC7zCCAligAwIBAgIJAP5zJqYmGz7vMA0GCSqGSIb3DQEBBQUAMFkxCzAJBgNV -BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX -aWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0wOTA4MDUxMDI2 -MDBaFw0xMDA4MDUxMDI2MDBaMFkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21l -LVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNV -BAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0mHausYX -KTlrz/fdhYA/63L8PZFwjtqCEdUh+5BFSqFlE34uhwmoIFzZat5z80tAQGjyp1EL -Ai2BegqCOHWaeOKNnwSm93a31fMy6N4rygUgs2rCjVtz6yqMCBd7c9KENifMTWY0 -agIz6C4Pk+YLnkx7rrDGyW5/jaIKNrjFioUCAwEAAaOBvjCBuzAdBgNVHQ4EFgQU -Aob17ojAhUn47dxkKOogj+NWtxUwgYsGA1UdIwSBgzCBgIAUAob17ojAhUn47dxk -KOogj+NWtxWhXaRbMFkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRl -MSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMTCWxv -Y2FsaG9zdIIJAP5zJqYmGz7vMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD -gYEANGKOujn47HIf0rYEq0Z8mnzfUet+7AtzGjueLymKSRI9PGSdgtJd/C7lQEsD -bqzIb4gu8NDE5wJjcEOikrQ6jawK/ws6s/H+BCKtrefCmbaNsv3hmC4uaQfmCkiE -U3gN9MsqSncdzBX/5kXZn7gzS0j/KVukDOykjLAAsbp4Ad4= ------END CERTIFICATE----- Deleted: trunk/war/WEB-INF/localhost.key =================================================================== --- trunk/war/WEB-INF/localhost.key 2010-12-19 23:32:38 UTC (rev 1172) +++ trunk/war/WEB-INF/localhost.key 2010-12-20 02:20:51 UTC (rev 1173) @@ -1,16 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANJh2rrGFyk5a8/3 -3YWAP+ty/D2RcI7aghHVIfuQRUqhZRN+LocJqCBc2Wrec/NLQEBo8qdRCwItgXoK -gjh1mnjijZ8Epvd2t9XzMujeK8oFILNqwo1bc+sqjAgXe3PShDYnzE1mNGoCM+gu -D5PmC55Me66wxsluf42iCja4xYqFAgMBAAECgYEAuJ/JXQlEABh1JbAGxgaTkaN5 -+unslmDpro6U4Pht5p2WXzHn0PfHhIcXAfMwXD0YqK2w7OZxO7sFmj0opDWIlZ9t -H5ruSlV1YOEmuReeGqWJRNKEVnr6BXUFtEmTRZxF2XrxGEci71afH7EziC+uNYKm -53XPKvg4/qeHE+Ig+w0CQQD2GdwkHIRKvn2KyNrI0ag4uuX7tWDk2avkRpwnjRBk -E+Z7GYiXpwGZrJktJ2lbsc3r4pU6yEPmtdLah9DJrW93AkEA2tgxWtdwyFlosBj/ -h/Eq+VCVCLR+OtbDaD8IZ0cijHtnllL99XRivnOrLUeTQfWxaUM7Qoky3tk6p5Pw -Oxbs4wJBAIM/93Aq5UMXpMzHoidH6XeX9d/wM+TZUhtErTNKwFsfYeR1EawPnYLf -0jGKu13zzebnyL64373DatixZmCo5rECQFRNgAW8hGfJeXiMyLL3hlRwZFjsHsxP -uwrHbVdLodV4HFleMxKA+SDgsgpJTkLUgLlJ+uQQshYCnIO9i4dXt30CQBsJJ+pD -9DjZXSRvklLZBqpFnFMIi+jW12GQrpNb7HO16pZNdy+Ljc0b/YZL+6nAYjbwg30c -4X+49VVcDxiJMws= ------END PRIVATE KEY----- Deleted: trunk/war/WEB-INF/web.xml =================================================================== --- trunk/war/WEB-INF/web.xml 2010-12-19 23:32:38 UTC (rev 1172) +++ trunk/war/WEB-INF/web.xml 2010-12-20 02:20:51 UTC (rev 1173) @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee -http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - version="2.5"> -  -  -  - <display-name>ws</display-name> - <description>kune workspace</description> -  - <welcome-file-list> - <welcome-file>ws.html</welcome-file> - </welcome-file-list> - <context-param> - <param-name>jruby.standalone</param-name> - <param-value>true</param-value> - </context-param> - <context-param> - <param-name>rails.root</param-name> - <param-value>/WEB-INF/publicspace/ - </param-value> - </context-param> - <context-param> - <param-name>files.prefix</param-name> - <param-value>/WEB-INF/publicspace/public - </param-value> - </context-param> - <context-param> - <param-name>rails.env</param-name> - <param-value>production</param-value> - </context-param> - <context-param> - <param-name>jruby.max.runtimes</param-name> - <param-value>1</param-value> - </context-param> - <context-param> - <param-name>public.root</param-name> - <param-value>/public/</param-value> - </context-param> - <filter> - <filter-name>RackFilter</filter-name> - <filter-class>org.jruby.rack.RackFilter</filter-class> - </filter> - <filter-mapping> - <filter-name>RackFilter</filter-name> - <url-pattern>/public/*</url-pattern> - </filter-mapping> - <listener> - <listener-class>org.jruby.rack.rails.RailsServletContextListener</listener-class> - </listener> - <filter> - <filter-name>rack</filter-name> - <filter-class>org.ourproject.kune.rack.RackServletFilter</filter-class> - <init-param> - <param-name>org.ourproject.kune.rack.RackModule</param-name> - <param-value> - org.ourproject.kune.app.server.KuneRackModule - </param-value> - </init-param> - </filter> - <filter-mapping> - <filter-name>rack</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - <servlet> - <servlet-name>Proxy</servlet-name> - <servlet-class>de.spieleck.servlets.ProxyServlet</servlet-class> - <init-param> - <param-name>remotePath</param-name> - <param-value>/http-bind/</param-value> - </init-param> - <init-param> - <param-name>remoteServer</param-name> - <param-value>localhost</param-value> - </init-param> - <init-param> - <param-name>remotePort</param-name> - <param-value>5280</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>Proxy</servlet-name> - <url-pattern>/http-bind/</url-pattern> - </servlet-mapping> -</web-app> \ No newline at end of file

1 0

r1172 - in trunk: . src/main/java src/main/java/cc/kune src/main/java/cc/kune/core src/main/java/cc/kune/core/client src/main/java/cc/kune/core/client/init src/main/java/cc/kune/core/client/notify src/main/java/cc/kune/core/client/state src/main/java/cc/kune/core/client/ws src/main/java/cc/kune/core/public src/main/java/cc/kune/core/public/images src/main/java/cc/kune/domain/utils src/main/java/org/ourproject/kune/platf/server/manager src/main/java/org/ourproject/kune/platf/server/manager/imp
by Vicente J. Ruiz Jurado 19 Dec '10

19 Dec '10

Author: vjrj_ Date: 2010-12-20 00:32:38 +0100 (Mon, 20 Dec 2010) New Revision: 1172 Added: trunk/src/main/java/cc/kune/Kune.gwt.xml trunk/src/main/java/cc/kune/client/ trunk/src/main/java/cc/kune/core/client/state/UserSignIn.java trunk/src/main/java/cc/kune/core/client/state/UserSignOut.java trunk/src/main/java/cc/kune/core/public/images/kune-anim.gif trunk/src/main/java/cc/kune/domain/utils/ParticipationData.java trunk/src/main/java/cc/kune/domain/utils/UserBuddiesData.java trunk/src/main/java/cc/kune/public/ Removed: trunk/src/main/java/com/ trunk/src/main/java/org/ourproject/kune/platf/server/sn/ParticipationData.java trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java Modified: trunk/ trunk/pom.xml trunk/src/main/java/cc/kune/core/Core.gwt.xml trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java trunk/src/main/java/cc/kune/core/client/state/StateManager.java trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java trunk/src/main/java/cc/kune/core/client/ws/CorePlaceManager.java trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/public/ws.html trunk/src/main/java/cc/kune/domain/utils/SocialNetworkData.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java trunk/src/main/resources/dozerBeanMapping.xml trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java Log: NEW - # 9: Roo partial use/integration http://kune.ourproject.org/issues/ticket/9 Property changes on: trunk ___________________________________________________________________ Name: svn:ignore - pmd-eclipse.log .pmd www-test screenlog.0 bin client public target Main-compile bin .settings .gwt-cache repository derby.log star-yellow-grey.png run.sh tomcat .classpath gwt-out synccss.sh .externalToolBuilders .project .wtpmodules www testRepository kune-OLD-jcr KuneApp.launch KuneApp NOSERVER.launch old_src org.ourproject.kune.app.Kune org.ourproject.kune.iml org.ourproject.kune.ipr org.ourproject.kune.iws nbproject hibernate.reveng.xml .gwt-tmp target-eclipse .checkstyle .classpath-bien pom.xml.* + pmd-eclipse.log .pmd www-test screenlog.0 bin client public target Main-compile bin .settings .gwt-cache repository derby.log star-yellow-grey.png run.sh tomcat .classpath gwt-out synccss.sh .externalToolBuilders .project .wtpmodules www testRepository kune-OLD-jcr KuneApp.launch KuneApp NOSERVER.launch old_src org.ourproject.kune.app.Kune org.ourproject.kune.iml org.ourproject.kune.ipr org.ourproject.kune.iws nbproject hibernate.reveng.xml .gwt-tmp target-eclipse .checkstyle .classpath-bien pom.xml.* .gwt Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/pom.xml 2010-12-19 23:32:38 UTC (rev 1172) @@ -344,7 +344,7 @@ <dependency> <groupId>org.waveprotocol</groupId> <artifactId>kune-wave-server</artifactId> - <version>0.0.2.2</version> + <version>0.0.3.1</version> </dependency> <dependency> <groupId>commons-cli</groupId> Added: trunk/src/main/java/cc/kune/Kune.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/Kune.gwt.xml (rev 0) +++ trunk/src/main/java/cc/kune/Kune.gwt.xml 2010-12-19 23:32:38 UTC (rev 1172) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.0.1/distro-source/core/…"> +<module rename-to="ws"> + <inherits name="com.google.gwt.user.User" /> + <inherits name='com.google.gwt.logging.Logging' /> + <inherits name="cc.kune.core.Core" /> + <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java"/> +  +  + +  + <set-property name="gwt.logging.enabled" value="TRUE" /> + <set-property name="gwt.logging.logLevel" value="INFO" /> + <set-property name="gwt.logging.consoleHandler" value="ENABLED" /> + <set-property name="gwt.logging.developmentModeHandler" + value="ENABLED" /> + <set-property name="gwt.logging.firebugHandler" value="ENABLED" /> + <set-property name="gwt.logging.hasWidgetsHandler" value="DISABLED" /> + <set-property name="gwt.logging.popupHandler" value="DISABLED" /> + <set-property name="gwt.logging.systemHandler" value="ENABLED" /> + <set-property name="gwt.logging.simpleRemoteHandler" + value="DISABLED" /> + +  + +  +  +  + <set-property name="user.agent" value="safari,gecko1_8" /> +</module> Property changes on: trunk/src/main/java/cc/kune/Kune.gwt.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/Core.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/core/Core.gwt.xml 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/Core.gwt.xml 2010-12-19 23:32:38 UTC (rev 1172) @@ -26,8 +26,4 @@ <stylesheet src="fontface/stylesheet.css" />  <entry-point class="cc.kune.core.client.KuneEntryPoint" /> -  -  -  - <set-property name="user.agent" value="safari" /> </module> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -72,6 +72,7 @@ bind(Session.class).to(SessionDefault.class).in(Singleton.class); bind(I18nTranslationService.class).to(I18nUITranslationService.class).in(Singleton.class); bind(ErrorHandler.class).in(Singleton.class); + bind(StateManagerDefault.class).in(Singleton.class); bind(StateManager.class).to(StateManagerDefault.class).in(Singleton.class); bind(ContentProvider.class).to(ContentProviderDefault.class).in(Singleton.class); bind(HistoryWrapper.class).to(HistoryWrapperDefault.class).in(Singleton.class); Modified: trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -35,6 +35,7 @@ import com.google.gwt.user.client.Window.ClosingEvent; import com.google.gwt.user.client.Window.ClosingHandler; import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.ui.RootPanel; import com.google.inject.Inject; import com.gwtplatform.mvp.client.EventBus; @@ -79,8 +80,14 @@ eventBus.fireEvent(new ProgressHideEvent()); eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, "Error fetching initial data")); Log.debug(error.getMessage()); + hideInitialPanels(); } + private void hideInitialPanels() { + RootPanel.get("kuneinitialcurtain").setVisible(false); + RootPanel.get("kuneloading").setVisible(false); + } + @Override public void onSuccess(final InitDataDTO initData) { session.setInitData(initData); @@ -89,6 +96,7 @@ Scheduler.get().scheduleDeferred(new ScheduledCommand() { @Override public void execute() { + hideInitialPanels(); eventBus.fireEvent(new ProgressHideEvent()); } }); Modified: trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -9,6 +9,7 @@ import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.InlineLabel; +import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; import com.gwtplatform.mvp.client.EventBus; @@ -17,11 +18,17 @@ public class SpinerViewImpl extends PopupViewWithUiHandlers<UiHandlers> implements SpinerView { + private final PopupPanel popup; + @Inject protected SpinerViewImpl(EventBus eventBus, WsArmor armor) { super(eventBus); widget = uiBinder.createAndBindUi(this); - armor.getSitebar().add(widget); + popup = new PopupPanel(false, false); + popup.add(widget); + popup.setPopupPosition(7, 0); + popup.setStyleName("k-spiner-popup"); + popup.show(); } private static SpinerViewImplUiBinder uiBinder = GWT.create(SpinerViewImplUiBinder.class); @@ -39,12 +46,12 @@ @Override public Widget asWidget() { - return widget; + return popup; } @Override public void fade() { - panel.setVisible(false); + popup.hide(); } @Override @@ -54,6 +61,6 @@ } else { label.setText(message); } - panel.setVisible(true); + popup.show(); } } Modified: trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -46,6 +46,7 @@ import com.google.gwt.core.client.GWT; import com.google.inject.Inject; import com.google.inject.Provider; +import com.gwtplatform.mvp.client.EventBus; public class SessionDefault implements Session { private String userHash; @@ -60,9 +61,12 @@ private final Event<UserInfoDTO> onUserSignIn; private final Event0 onUserSignOut; private final Provider<UserServiceAsync> userServiceProvider; + private final EventBus eventBus; @Inject - public SessionDefault(final CookiesManager cookieManager, final Provider<UserServiceAsync> userServiceProvider) { + public SessionDefault(final CookiesManager cookieManager, final Provider<UserServiceAsync> userServiceProvider, + EventBus eventBus) { + this.eventBus = eventBus; this.userHash = cookieManager.getCurrentCookie(); this.userHash = userHash == null || userHash.equals("null") ? null : userHash; this.userServiceProvider = userServiceProvider; @@ -288,8 +292,10 @@ public void setCurrentUserInfo(final UserInfoDTO currentUserInfo) { this.currentUserInfo = currentUserInfo; if (currentUserInfo != null) { + eventBus.fireEvent(new UserSignInEvent(currentUserInfo)); onUserSignIn.fire(currentUserInfo); } else { + eventBus.fireEvent(new UserSignOutEvent()); onUserSignOut.fire(); } } Modified: trunk/src/main/java/cc/kune/core/client/state/StateManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -19,7 +19,6 @@ */ package cc.kune.core.client.state; - import cc.kune.core.client.actions.BeforeActionListener; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.SocialNetworkDataDTO; @@ -33,18 +32,23 @@ void addBeforeStateChangeListener(BeforeActionListener listener); + @Deprecated void addSiteToken(String token, Listener0 whenToken); void gotoToken(StateToken newToken); void gotoToken(String newToken); + @Deprecated void onGroupChanged(Listener2<String, String> listener); + @Deprecated void onSocialNetworkChanged(Listener<StateAbstractDTO> listener); + @Deprecated void onStateChanged(Listener<StateAbstractDTO> listener); + @Deprecated void onToolChanged(Listener2<String, String> listener); void reload(); Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -38,9 +38,9 @@ import com.calclab.suco.client.events.Listener2; import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; -import com.google.gwt.user.client.History; import com.google.inject.Inject; import com.gwtplatform.mvp.client.EventBus; +import com.gwtplatform.mvp.client.annotations.ProxyEvent; public class StateManagerDefault implements StateManager, ValueChangeHandler<String> { private final ContentProvider contentProvider; @@ -64,8 +64,6 @@ public StateManagerDefault(final ContentProvider contentProvider, final Session session, final HistoryWrapper history, final EventBus eventBus) { this.eventBus = eventBus; - // Put this outside here - History.addValueChangeHandler(this); this.contentProvider = contentProvider; this.session = session; this.history = history; @@ -75,27 +73,25 @@ this.onGroupChanged = new Event2<String, String>("onGroupChanged"); this.onToolChanged = new Event2<String, String>("onToolChanged"); this.onSocialNetworkChanged = new Event<StateAbstractDTO>("onSocialNetworkChanged"); - session.onUserSignIn(new Listener<UserInfoDTO>() { - @Override - public void onEvent(final UserInfoDTO parameter) { - if (previousToken == null) { - // starting up - reload(); - } else { - // do nothing, SigInPresent calls goto; - } - } - }); - session.onUserSignOut(new Listener0() { - @Override - public void onEvent() { - reload(); - } - }); siteTokens = new HashMap<String, Listener0>(); beforeStateChangeCollection = new BeforeActionCollection(); } + @ProxyEvent + public void onUserSignOut() { + reload(); + } + + @ProxyEvent + public void onUserSignIn(UserInfoDTO userInfo) { + if (previousToken == null) { + // starting up + reload(); + } else { + // do nothing, SigInPresent calls goto; + } + } + @Override public void addBeforeStateChangeListener(final BeforeActionListener listener) { beforeStateChangeCollection.add(listener); Added: trunk/src/main/java/cc/kune/core/client/state/UserSignIn.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/UserSignIn.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/UserSignIn.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -0,0 +1,12 @@ +package cc.kune.core.client.state; + +import cc.kune.core.shared.dto.UserInfoDTO; + +import com.gwtplatform.annotation.GenEvent; +import com.gwtplatform.annotation.Order; + +@GenEvent +public class UserSignIn { + @Order(1) + UserInfoDTO userInfo; +} Property changes on: trunk/src/main/java/cc/kune/core/client/state/UserSignIn.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/state/UserSignOut.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/UserSignOut.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/UserSignOut.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -0,0 +1,8 @@ +package cc.kune.core.client.state; + +import com.gwtplatform.annotation.GenEvent; + +@GenEvent +public class UserSignOut { + +} Property changes on: trunk/src/main/java/cc/kune/core/client/state/UserSignOut.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/ws/CorePlaceManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/CorePlaceManager.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/client/ws/CorePlaceManager.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -15,6 +15,6 @@ @Override public void revealDefaultPlace() { - revealPlace(new PlaceRequest("home")); + revealPlace(new PlaceRequest("")); } } Modified: trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -23,7 +23,7 @@ private final AppStarter appStarter; @ProxyCodeSplit - @NameToken("home") + @NameToken("") public interface CoreProxy extends ProxyPlace<CorePresenter> { } @@ -45,15 +45,7 @@ @Override protected void revealInParent() { - RevealRootLayoutContentEvent.fire(getEventBus(), this); - // getEventBus().fireEvent(new ProgressShowEvent("Something")); - // Timer timer = new Timer() { - // @Override - // public void run() { - // getEventBus().fireEvent(new ProgressHideEvent()); - // } - // }; - // // timer.schedule(4); + RevealRootLayoutContentEvent.fire(this, this); } } Modified: trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -1,10 +1,12 @@ package cc.kune.core.client.ws; import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.state.StateManagerDefault; import cc.kune.core.ws.armor.client.WsArmorImpl; import cc.kune.core.ws.armor.client.resources.WsArmorResources; import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.History; import com.google.gwt.user.client.ui.InlineLabel; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; @@ -24,12 +26,13 @@ * the body */ @Inject - public CoreViewImpl(final WsArmorImpl armor) { + public CoreViewImpl(final WsArmorImpl armor, StateManagerDefault stateManager) { this.armor = armor; GWT.<CoreResources> create(CoreResources.class).css().ensureInjected(); GWT.<WsArmorResources> create(WsArmorResources.class).style().ensureInjected(); armor.getEntityHeader().add(new InlineLabel("Test - a, e, i, o, u")); armor.getDocHeader().add(new InlineLabel("doc title")); + History.addValueChangeHandler(stateManager); } @Override Added: trunk/src/main/java/cc/kune/core/public/images/kune-anim.gif =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/images/kune-anim.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2010-12-19 23:32:38 UTC (rev 1172) @@ -337,17 +337,17 @@ .kLoadingPanel { background-color: #feb295; -webkit-border-bottom-left-radius: 4px; - -moz-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; border-bottom-left-radius: 4px; -webkit-border-bottom-right-radius: 4px; - -moz-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; border-bottom-right-radius: 4px; - -webkit-border-top-right-radius: 4px; - -moz-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-top-left-radius: 4px; - -moz-border-top-left-radius: 4px; - border-top-left-radius: 4px; +/* -webkit-border-top-right-radius: 4px;*/ +/* -moz-border-radius-topright: 4px;*/ +/* border-top-right-radius: 4px;*/ +/* -webkit-border-top-left-radius: 4px;*/ +/* -moz-border-radius-topleft: 4px;*/ +/* border-top-left-radius: 4px;*/ padding: 0 10px 0 7px; } Modified: trunk/src/main/java/cc/kune/core/public/ws.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.html 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/core/public/ws.html 2010-12-19 23:32:38 UTC (rev 1172) @@ -8,9 +8,60 @@ </head>   -<link href='http://fonts.googleapis.com/css?family=Inconsolata' rel='stylesheet' type='text/css'> +<link href='http://fonts.googleapis.com/css?family=Inconsolata' + rel='stylesheet' type='text/css'> +<style type="text/css"> +#kuneinitialcurtain { + position: absolute; + left: 0px; + top: 0px; + width: 100%; + height: 100%; + background-color: #F7EBE3; + z-index: 9999; +} + +#kuneloading { + position: absolute; + left: 45%; + top: 40%;  + z-index: 20001; + height: auto; + border: solid 2px #ccc; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + border-radius: 10px; + background: white; +} + +#kuneloading a { + color: #225588; +} + +#kuneloading .kuneloading-indicator { + color: #444; + font: bold 13px tahoma, arial, helvetica; + padding: 5px 5px 10px 5px; + margin: 0; + height: auto; +} + +#kuneloading-msg { + font: normal 10px arial, tahoma, sans-serif; +} +</style> + <body> <iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe> <iframe src="" id="__download" style="width: 0; height: 0; border: 0"></iframe> +<div id="kuneinitialcurtain"></div> +<div id="kuneloading"> +<div class="kuneloading-indicator"><img src="images/kune-anim.gif" + width="35" height="35" alt="kune-loading" + style="margin-right: 3px; float: left; vertical-align: top;" />kune         <br /> +<span id="kuneloading-msg">Starting...</span></div> +</div> + </body> -</html> \ No newline at end of file +</html> Copied: trunk/src/main/java/cc/kune/domain/utils/ParticipationData.java (from rev 1168, trunk/src/main/java/org/ourproject/kune/platf/server/sn/ParticipationData.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/utils/ParticipationData.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/utils/ParticipationData.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -0,0 +1,55 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.domain.utils; + +import java.util.List; + +import cc.kune.domain.Group; + +public class ParticipationData { + private List<Group> groupsIsAdmin; + private List<Group> groupsIsCollab; + + public ParticipationData() { + this(null, null); + } + + public ParticipationData(final List<Group> groupsIsAdmin, final List<Group> groupsIsCollab) { + this.groupsIsAdmin = groupsIsAdmin; + this.groupsIsCollab = groupsIsCollab; + } + + public List<Group> getGroupsIsAdmin() { + return groupsIsAdmin; + } + + public List<Group> getGroupsIsCollab() { + return groupsIsCollab; + } + + public void setGroupsIsAdmin(final List<Group> groupsIsAdmin) { + this.groupsIsAdmin = groupsIsAdmin; + } + + public void setGroupsIsCollab(final List<Group> groupsIsCollab) { + this.groupsIsCollab = groupsIsCollab; + } + +} Property changes on: trunk/src/main/java/cc/kune/domain/utils/ParticipationData.java ___________________________________________________________________ Name: svn:mergeinfo + Modified: trunk/src/main/java/cc/kune/domain/utils/SocialNetworkData.java =================================================================== --- trunk/src/main/java/cc/kune/domain/utils/SocialNetworkData.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/cc/kune/domain/utils/SocialNetworkData.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -19,10 +19,6 @@ */ package cc.kune.domain.utils; - -import org.ourproject.kune.platf.server.sn.ParticipationData; -import org.ourproject.kune.platf.server.sn.UserBuddiesData; - import cc.kune.core.shared.domain.SocialNetworkVisibility; import cc.kune.core.shared.domain.UserBuddiesVisibility; import cc.kune.core.shared.domain.utils.AccessRights; Copied: trunk/src/main/java/cc/kune/domain/utils/UserBuddiesData.java (from rev 1168, trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/utils/UserBuddiesData.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/utils/UserBuddiesData.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -0,0 +1,68 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + \*/ +package cc.kune.domain.utils; + +import java.util.ArrayList; +import java.util.List; + +import cc.kune.domain.User; + +public class UserBuddiesData { + + public static final UserBuddiesData EMPTY = new UserBuddiesData(); + + private List<User> buddies; + private int otherExtBuddies; + + public UserBuddiesData() { + otherExtBuddies = 0; + buddies = new ArrayList<User>(); + } + + public boolean contains(final String shortName) { + for (User buddie : buddies) { + if (buddie.getShortName().equals(shortName)) { + return true; + } + } + return false; + } + + public List<User> getBuddies() { + return buddies; + } + + public int getOtherExtBuddies() { + return otherExtBuddies; + } + + public void setBuddies(final List<User> buddies) { + this.buddies = buddies; + } + + public void setOtherExtBuddies(final int otherExtBuddies) { + this.otherExtBuddies = otherExtBuddies; + } + + @Override + public String toString() { + return "UserBuddiesData[ext: " + otherExtBuddies + " / int: " + buddies + "]"; + } +} Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -20,7 +20,6 @@ package org.ourproject.kune.platf.server.manager; -import org.ourproject.kune.platf.server.sn.ParticipationData; import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.DefaultException; @@ -28,6 +27,7 @@ import cc.kune.domain.Group; import cc.kune.domain.SocialNetwork; import cc.kune.domain.User; +import cc.kune.domain.utils.ParticipationData; import cc.kune.domain.utils.SocialNetworkData; public interface SocialNetworkManager extends Manager<SocialNetwork, Long> { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -20,10 +20,10 @@ package org.ourproject.kune.platf.server.manager; import org.ourproject.kune.platf.server.manager.impl.SearchResult; -import org.ourproject.kune.platf.server.sn.UserBuddiesData; import cc.kune.core.client.errors.I18nNotFoundException; import cc.kune.domain.User; +import cc.kune.domain.utils.UserBuddiesData; public interface UserManager { /** Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -27,8 +27,6 @@ import org.ourproject.kune.platf.server.access.AccessRightsService; import org.ourproject.kune.platf.server.manager.SocialNetworkManager; import org.ourproject.kune.platf.server.manager.UserManager; -import org.ourproject.kune.platf.server.sn.ParticipationData; -import org.ourproject.kune.platf.server.sn.UserBuddiesData; import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.AlreadyGroupMemberException; @@ -46,7 +44,9 @@ import cc.kune.domain.Group; import cc.kune.domain.SocialNetwork; import cc.kune.domain.User; +import cc.kune.domain.utils.ParticipationData; import cc.kune.domain.utils.SocialNetworkData; +import cc.kune.domain.utils.UserBuddiesData; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -40,7 +40,6 @@ import org.ourproject.kune.platf.server.manager.PropertyGroupManager; import org.ourproject.kune.platf.server.manager.UserManager; import org.ourproject.kune.platf.server.properties.ChatProperties; -import org.ourproject.kune.platf.server.sn.UserBuddiesData; import cc.kune.core.client.errors.I18nNotFoundException; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -49,6 +48,7 @@ import cc.kune.domain.Properties; import cc.kune.domain.PropertyGroup; import cc.kune.domain.User; +import cc.kune.domain.utils.UserBuddiesData; import com.google.inject.Inject; import com.google.inject.Provider; Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/sn/ParticipationData.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/sn/ParticipationData.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/org/ourproject/kune/platf/server/sn/ParticipationData.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -1,55 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.server.sn; - -import java.util.List; - -import cc.kune.domain.Group; - -public class ParticipationData { - private List<Group> groupsIsAdmin; - private List<Group> groupsIsCollab; - - public ParticipationData() { - this(null, null); - } - - public ParticipationData(final List<Group> groupsIsAdmin, final List<Group> groupsIsCollab) { - this.groupsIsAdmin = groupsIsAdmin; - this.groupsIsCollab = groupsIsCollab; - } - - public List<Group> getGroupsIsAdmin() { - return groupsIsAdmin; - } - - public List<Group> getGroupsIsCollab() { - return groupsIsCollab; - } - - public void setGroupsIsAdmin(final List<Group> groupsIsAdmin) { - this.groupsIsAdmin = groupsIsAdmin; - } - - public void setGroupsIsCollab(final List<Group> groupsIsCollab) { - this.groupsIsCollab = groupsIsCollab; - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -1,68 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package org.ourproject.kune.platf.server.sn; - -import java.util.ArrayList; -import java.util.List; - -import cc.kune.domain.User; - -public class UserBuddiesData { - - public static final UserBuddiesData EMPTY = new UserBuddiesData(); - - private List<User> buddies; - private int otherExtBuddies; - - public UserBuddiesData() { - otherExtBuddies = 0; - buddies = new ArrayList<User>(); - } - - public boolean contains(final String shortName) { - for (User buddie : buddies) { - if (buddie.getShortName().equals(shortName)) { - return true; - } - } - return false; - } - - public List<User> getBuddies() { - return buddies; - } - - public int getOtherExtBuddies() { - return otherExtBuddies; - } - - public void setBuddies(final List<User> buddies) { - this.buddies = buddies; - } - - public void setOtherExtBuddies(final int otherExtBuddies) { - this.otherExtBuddies = otherExtBuddies; - } - - @Override - public String toString() { - return "UserBuddiesData[ext: " + otherExtBuddies + " / int: " + buddies + "]"; - } -} Modified: trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -21,15 +21,15 @@ import java.util.List; -import org.ourproject.kune.platf.server.sn.ParticipationData; -import org.ourproject.kune.platf.server.sn.UserBuddiesData; import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.Group; import cc.kune.domain.SocialNetwork; +import cc.kune.domain.utils.ParticipationData; import cc.kune.domain.utils.SocialNetworkData; +import cc.kune.domain.utils.UserBuddiesData; public abstract class StateAbstract { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -21,12 +21,12 @@ import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.manager.SocialNetworkManager; -import org.ourproject.kune.platf.server.sn.ParticipationData; import cc.kune.core.client.errors.DefaultException; import cc.kune.domain.Content; import cc.kune.domain.Group; import cc.kune.domain.User; +import cc.kune.domain.utils.ParticipationData; import com.google.inject.Inject; import com.google.inject.Singleton; Modified: trunk/src/main/resources/dozerBeanMapping.xml =================================================================== --- trunk/src/main/resources/dozerBeanMapping.xml 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/main/resources/dozerBeanMapping.xml 2010-12-19 23:32:38 UTC (rev 1172) @@ -182,7 +182,7 @@ </mapping> <mapping> <class-a> cc.kune.core.shared.dto.ParticipationDataDTO </class-a> - <class-b> org.ourproject.kune.platf.server.sn.ParticipationData </class-b> + <class-b> cc.kune.domain.utils.ParticipationData </class-b> </mapping> <mapping> <class-a> cc.kune.core.shared.dto.I18nLanguageDTO </class-a> @@ -254,7 +254,7 @@ </mapping> <mapping> <class-a> cc.kune.core.shared.dto.UserBuddiesDataDTO </class-a> - <class-b> org.ourproject.kune.platf.server.sn.UserBuddiesData </class-b> + <class-b> cc.kune.domain.utils.UserBuddiesData </class-b> </mapping> <mapping> <class-a> cc.kune.core.shared.dto.SocialNetworkDataDTO </class-a> Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -8,7 +8,6 @@ import org.junit.Before; import org.junit.Test; import org.ourproject.kune.platf.server.PersistenceTest; -import org.ourproject.kune.platf.server.sn.ParticipationData; import org.ourproject.kune.testhelper.ctx.DomainContext; import cc.kune.core.client.errors.AccessViolationException; @@ -20,6 +19,7 @@ import cc.kune.core.shared.dto.SocialNetworkRequestResult; import cc.kune.domain.Group; import cc.kune.domain.User; +import cc.kune.domain.utils.ParticipationData; import com.google.inject.Inject; import com.wideplay.warp.persist.Transactional; Modified: trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java 2010-12-19 03:01:32 UTC (rev 1171) +++ trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java 2010-12-19 23:32:38 UTC (rev 1172) @@ -10,8 +10,6 @@ import org.ourproject.kune.platf.server.TestDomainHelper; import org.ourproject.kune.platf.server.TestHelper; import org.ourproject.kune.platf.server.manager.GroupManager; -import org.ourproject.kune.platf.server.sn.ParticipationData; -import org.ourproject.kune.platf.server.sn.UserBuddiesData; import org.ourproject.kune.platf.server.state.StateContent; import cc.kune.core.shared.domain.GroupListMode; @@ -39,7 +37,9 @@ import cc.kune.domain.Revision; import cc.kune.domain.SocialNetwork; import cc.kune.domain.User; +import cc.kune.domain.utils.ParticipationData; import cc.kune.domain.utils.SocialNetworkData; +import cc.kune.domain.utils.UserBuddiesData; import com.google.inject.Inject;

1 0

r1171 - in kune-ws-armor/trunk: . src/cc/kune/core/ws/armor src/cc/kune/core/ws/armor/client src/cc/kune/core/ws/armor/client/resources
by Vicente J. Ruiz Jurado 19 Dec '10

19 Dec '10

Author: vjrj_ Date: 2010-12-19 04:01:32 +0100 (Sun, 19 Dec 2010) New Revision: 1171 Added: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorEntryPoint.java kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorImpl.java kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorImpl.ui.xml Removed: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.java kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.ui.xml kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/IBody.java Modified: kune-ws-armor/trunk/pom.xml kune-ws-armor/trunk/src/cc/kune/core/ws/armor/WsArmor.gwt.xml kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmor.java kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java Log: Minor refacts Modified: kune-ws-armor/trunk/pom.xml =================================================================== --- kune-ws-armor/trunk/pom.xml 2010-12-19 02:58:53 UTC (rev 1170) +++ kune-ws-armor/trunk/pom.xml 2010-12-19 03:01:32 UTC (rev 1171) @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>kune-ws-armor</groupId> <artifactId>kune-ws-armor</artifactId> - <version>0.0.5</version> + <version>0.0.8</version> <name>Kune Armor Main Layout</name> <description>The current armor of Kune Workspace</description> <properties> Modified: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/WsArmor.gwt.xml =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/WsArmor.gwt.xml 2010-12-19 02:58:53 UTC (rev 1170) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/WsArmor.gwt.xml 2010-12-19 03:01:32 UTC (rev 1171) @@ -1,12 +1,13 @@ <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> <module> - <inherits name="com.google.gwt.user.User" /> - <inherits name="com.google.gwt.user.theme.standard.Standard" /> - <entry-point class="cc.kune.core.ws.armor.client.WsArmor" /> - <public path="public" /> - <source path="client" /> -  -  -  - <set-property name="user.agent" value="safari" /> + <inherits name="com.google.gwt.user.User" /> + <inherits name="com.google.gwt.user.theme.standard.Standard" /> +  + <public path="public" /> + <source path="client" /> +  +  +  + <set-property name="user.agent" value="safari" /> </module> \ No newline at end of file Deleted: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.java =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.java 2010-12-19 02:58:53 UTC (rev 1170) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.java 2010-12-19 03:01:32 UTC (rev 1171) @@ -1,99 +0,0 @@ -package cc.kune.core.ws.armor.client; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.uibinder.client.UiBinder; -import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.DockLayoutPanel; -import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.HasWidgets; -import com.google.gwt.user.client.ui.SplitLayoutPanel; -import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.Widget; - -public class Body extends Composite implements IBody { - - interface BodyUiBinder extends UiBinder<Widget, Body> { - } - - private static BodyUiBinder uiBinder = GWT.create(BodyUiBinder.class); - - @UiField - DockLayoutPanel mainpanel; - @UiField - FlowPanel sitebar; - @UiField - SplitLayoutPanel split; - @UiField - DockLayoutPanel splitCenter; - @UiField - DockLayoutPanel splitEast; - @UiField - VerticalPanel entityToolsSouth; - @UiField - VerticalPanel entityToolsNorth; - @UiField - VerticalPanel entityToolsCenter; - @UiField - FlowPanel entityHeader; - @UiField - FlowPanel entityFooter; - @UiField - FlowPanel docHeader; - @UiField - FlowPanel docSubheader; - @UiField - FlowPanel docFooter; - - public Body() { - initWidget(uiBinder.createAndBindUi(this)); - split.setWidgetMinSize(splitEast, 150); - // split.setWidgetMinSize(splitCenter, 200); - } - - @Override - public HasWidgets getDocFooter() { - return docFooter; - } - - @Override - public HasWidgets getDocHeader() { - return docHeader; - } - - @Override - public HasWidgets getDocSubheader() { - return docSubheader; - } - - @Override - public HasWidgets getEntityFooter() { - return entityFooter; - } - - @Override - public HasWidgets getEntityHeader() { - return entityHeader; - } - - @Override - public HasWidgets getEntityToolsCenter() { - return entityToolsCenter; - } - - @Override - public HasWidgets getEntityToolsNorth() { - return entityToolsNorth; - } - - @Override - public HasWidgets getEntityToolsSouth() { - return entityToolsSouth; - } - - @Override - public HasWidgets getSitebar() { - return sitebar; - } - -} Deleted: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.ui.xml =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.ui.xml 2010-12-19 02:58:53 UTC (rev 1170) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.ui.xml 2010-12-19 03:01:32 UTC (rev 1171) @@ -1,86 +0,0 @@ -<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> -<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" - xmlns:g="urn:import:com.google.gwt.user.client.ui"> - <ui:with field='res' - type='cc.kune.core.ws.armor.client.resources.WsArmorResources' /> - <g:DockLayoutPanel ui:field="mainpanel" styleName='{res.style.mainPanel}' - unit="PX"> - <g:north size="20"> - <g:FlowPanel ui:field="sitebar" height="20px" - styleName='{res.style.siteBar}'> - </g:FlowPanel> - </g:north> - <g:center> - <g:SplitLayoutPanel width="100%" height="100%" - ui:field="split"> - <g:center size="1.0"> - <g:DockLayoutPanel unit="PX" ui:field="splitCenter"> - <g:north size="168"> - <g:VerticalPanel width="100%" height="168px"> - <g:FlowPanel height="70px" width="100%" - styleName="{res.style.entityHeader}" ui:field="entityHeader"> -  - </g:FlowPanel> - <g:FlowPanel width="100%" height="38px" - styleName="{res.style.docHeader}" ui:field="docHeader"> - </g:FlowPanel> - <g:FlowPanel width="100%" height="60px" - styleName="{res.style.docSubheader}" ui:field="docSubheader"> - <g:Image resource='{res.defThemeDocArrowDown}' - styleName='{res.style.docHeaderArrow}' /> - </g:FlowPanel> - </g:VerticalPanel> - </g:north> - <g:center> - <g:DockLayoutPanel unit="PX" - styleName="{res.style.docEditorMargin}"> - <g:west size="10"> - <g:HTMLPanel /> - </g:west> - <g:east size="15"> - <g:HTMLPanel /> - </g:east> - <g:center> - <g:ScrollPanel styleName="{res.style.docEditor}"> - <g:HTML wordWrap="true" width="100%" height="100%"></g:HTML> - </g:ScrollPanel> - </g:center> - <g:south size="33.0"> - <g:VerticalPanel height="33px" width="100%" - styleName="{res.style.docFooter}"> - <g:FlowPanel width="100%" height="33" - ui:field="docFooter"> - </g:FlowPanel> - </g:VerticalPanel> - </g:south> - </g:DockLayoutPanel> - </g:center> - <g:south size="36"> - <g:FlowPanel height="36px" width="100%" - styleName="{res.style.entityFooter}" ui:field="entityFooter"> - </g:FlowPanel> - </g:south> - </g:DockLayoutPanel> - </g:center> - <g:east size="200.0"> - <g:DockLayoutPanel unit="PX" - styleName="{res.style.entityTools}" ui:field="splitEast"> - <g:north size="190"> - <g:VerticalPanel width="100%" ui:field="entityToolsNorth" - styleName="{res.style.entityToolsNorth}"></g:VerticalPanel> - </g:north> - <g:center> - <g:VerticalPanel width="100%" ui:field="entityToolsCenter" - styleName="{res.style.entityToolsCenter}"> - </g:VerticalPanel> - </g:center> - <g:south size="98"> - <g:VerticalPanel width="100%" - styleName="{res.style.entityToolsSouth}" ui:field="entityToolsSouth"></g:VerticalPanel> - </g:south> - </g:DockLayoutPanel> - </g:east> - </g:SplitLayoutPanel> - </g:center> - </g:DockLayoutPanel> -</ui:UiBinder> \ No newline at end of file Deleted: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/IBody.java =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/IBody.java 2010-12-19 02:58:53 UTC (rev 1170) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/IBody.java 2010-12-19 03:01:32 UTC (rev 1171) @@ -1,24 +0,0 @@ -package cc.kune.core.ws.armor.client; - -import com.google.gwt.user.client.ui.HasWidgets; - -public interface IBody { - - HasWidgets getDocFooter(); - - HasWidgets getDocHeader(); - - HasWidgets getDocSubheader(); - - HasWidgets getEntityFooter(); - - HasWidgets getEntityHeader(); - - HasWidgets getEntityToolsCenter(); - - HasWidgets getEntityToolsNorth(); - - HasWidgets getEntityToolsSouth(); - - HasWidgets getSitebar(); -} \ No newline at end of file Modified: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmor.java =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmor.java 2010-12-19 02:58:53 UTC (rev 1170) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmor.java 2010-12-19 03:01:32 UTC (rev 1171) @@ -1,43 +1,25 @@ package cc.kune.core.ws.armor.client; +import com.google.gwt.user.client.ui.HasWidgets; -import cc.kune.core.ws.armor.client.resources.WsArmorResources; +public interface WsArmor { -import com.google.gwt.core.client.EntryPoint; -import com.google.gwt.user.client.ui.InlineLabel; -import com.google.gwt.user.client.ui.RootLayoutPanel; + HasWidgets getDocFooter(); -/** - * Entry point classes define <code>onModuleLoad()</code>. - */ -public class WsArmor implements EntryPoint { - public void onModuleLoad() { - final WsArmorResources resources = WsArmorResources.INSTANCE; - resources.style().ensureInjected(); + HasWidgets getDocHeader(); - final RootLayoutPanel rootPanel = RootLayoutPanel.get(); - final Body armor = new Body(); - final InlineLabel icons = new InlineLabel("Icons"); - final InlineLabel login = new InlineLabel("Login"); - final InlineLabel logo = new InlineLabel("Logo"); - icons.setStyleName(resources.style().floatLeft()); - login.setStyleName(resources.style().floatRight()); - logo.setStyleName(resources.style().floatRight()); - armor.getSitebar().add(icons); - armor.getSitebar().add(logo); - armor.getSitebar().add(login); - armor.getEntityToolsNorth().add(new InlineLabel("Group members")); - armor.getEntityToolsCenter().add(new InlineLabel("Documents")); - armor.getEntityToolsSouth().add(new InlineLabel("Group tags")); - armor.getEntityHeader().add(new InlineLabel("Name of the Initiative")); - armor.getDocHeader().add(new InlineLabel("Some doc title")); - final InlineLabel editors = new InlineLabel("Editors:"); - editors.addStyleName(resources.style().docSubheaderLeft()); - armor.getDocSubheader().add(editors); - armor.getDocFooter().add(new InlineLabel("Tags:")); - armor.getEntityFooter().add(new InlineLabel("Rate it:")); - rootPanel.add(armor); + HasWidgets getDocSubheader(); - } + HasWidgets getEntityFooter(); -} + HasWidgets getEntityHeader(); + + HasWidgets getEntityToolsCenter(); + + HasWidgets getEntityToolsNorth(); + + HasWidgets getEntityToolsSouth(); + + HasWidgets getSitebar(); + +} \ No newline at end of file Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorEntryPoint.java (from rev 1166, kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmor.java) =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorEntryPoint.java (rev 0) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorEntryPoint.java 2010-12-19 03:01:32 UTC (rev 1171) @@ -0,0 +1,44 @@ +package cc.kune.core.ws.armor.client; + +import cc.kune.core.ws.armor.client.resources.WsArmorResources; + +import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.ui.InlineLabel; +import com.google.gwt.user.client.ui.RootLayoutPanel; + +/** + * Entry point classes define <code>onModuleLoad()</code>. + */ +public class WsArmorEntryPoint implements EntryPoint { + @Override + public void onModuleLoad() { + final WsArmorResources resources = GWT.create(WsArmorResources.class); + resources.style().ensureInjected(); + + final RootLayoutPanel rootPanel = RootLayoutPanel.get(); + final WsArmorImpl armor = new WsArmorImpl(); + final InlineLabel icons = new InlineLabel("Icons"); + final InlineLabel login = new InlineLabel("Login"); + final InlineLabel logo = new InlineLabel("Logo"); + icons.setStyleName(resources.style().floatLeft()); + login.setStyleName(resources.style().floatRight()); + logo.setStyleName(resources.style().floatRight()); + armor.getSitebar().add(icons); + armor.getSitebar().add(logo); + armor.getSitebar().add(login); + armor.getEntityToolsNorth().add(new InlineLabel("Group members")); + armor.getEntityToolsCenter().add(new InlineLabel("Documents")); + armor.getEntityToolsSouth().add(new InlineLabel("Group tags")); + armor.getEntityHeader().add(new InlineLabel("Name of the Initiative")); + armor.getDocHeader().add(new InlineLabel("Some doc title")); + final InlineLabel editors = new InlineLabel("Editors:"); + editors.addStyleName(resources.style().docSubheaderLeft()); + armor.getDocSubheader().add(editors); + armor.getDocFooter().add(new InlineLabel("Tags:")); + armor.getEntityFooter().add(new InlineLabel("Rate it:")); + rootPanel.add(armor); + + } + +} Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorImpl.java (from rev 1166, kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.java) =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorImpl.java (rev 0) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorImpl.java 2010-12-19 03:01:32 UTC (rev 1171) @@ -0,0 +1,98 @@ +package cc.kune.core.ws.armor.client; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.DockLayoutPanel; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.HasWidgets; +import com.google.gwt.user.client.ui.SplitLayoutPanel; +import com.google.gwt.user.client.ui.VerticalPanel; +import com.google.gwt.user.client.ui.Widget; + +public class WsArmorImpl extends Composite implements WsArmor { + + interface WsArmorImplUiBinder extends UiBinder<Widget, WsArmorImpl> { + } + + private static WsArmorImplUiBinder uiBinder = GWT.create(WsArmorImplUiBinder.class); + + @UiField + DockLayoutPanel mainpanel; + @UiField + FlowPanel sitebar; + @UiField + SplitLayoutPanel split; + @UiField + DockLayoutPanel splitCenter; + @UiField + DockLayoutPanel splitEast; + @UiField + VerticalPanel entityToolsSouth; + @UiField + VerticalPanel entityToolsNorth; + @UiField + VerticalPanel entityToolsCenter; + @UiField + FlowPanel entityHeader; + @UiField + FlowPanel entityFooter; + @UiField + FlowPanel docHeader; + @UiField + FlowPanel docSubheader; + @UiField + FlowPanel docFooter; + + public WsArmorImpl() { + initWidget(uiBinder.createAndBindUi(this)); + split.setWidgetMinSize(splitEast, 150); + // split.setWidgetMinSize(splitCenter, 200); + } + + @Override + public HasWidgets getDocFooter() { + return docFooter; + } + + @Override + public HasWidgets getDocHeader() { + return docHeader; + } + + @Override + public HasWidgets getDocSubheader() { + return docSubheader; + } + + @Override + public HasWidgets getEntityFooter() { + return entityFooter; + } + + @Override + public HasWidgets getEntityHeader() { + return entityHeader; + } + + @Override + public HasWidgets getEntityToolsCenter() { + return entityToolsCenter; + } + + @Override + public HasWidgets getEntityToolsNorth() { + return entityToolsNorth; + } + + @Override + public HasWidgets getEntityToolsSouth() { + return entityToolsSouth; + } + + @Override + public HasWidgets getSitebar() { + return sitebar; + } +} Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorImpl.ui.xml (from rev 1166, kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.ui.xml) =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorImpl.ui.xml (rev 0) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmorImpl.ui.xml 2010-12-19 03:01:32 UTC (rev 1171) @@ -0,0 +1,86 @@ +<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> +<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" + xmlns:g="urn:import:com.google.gwt.user.client.ui"> + <ui:with field='res' + type='cc.kune.core.ws.armor.client.resources.WsArmorResources' /> + <g:DockLayoutPanel ui:field="mainpanel" styleName='{res.style.mainPanel}' + unit="PX"> + <g:north size="20"> + <g:FlowPanel ui:field="sitebar" height="20px" + styleName='{res.style.siteBar}'> + </g:FlowPanel> + </g:north> + <g:center> + <g:SplitLayoutPanel width="100%" height="100%" + ui:field="split"> + <g:center size="1.0"> + <g:DockLayoutPanel unit="PX" ui:field="splitCenter"> + <g:north size="168"> + <g:VerticalPanel width="100%" height="168px"> + <g:FlowPanel height="70px" width="100%" + styleName="{res.style.entityHeader}" ui:field="entityHeader"> +  + </g:FlowPanel> + <g:FlowPanel width="100%" height="38px" + styleName="{res.style.docHeader}" ui:field="docHeader"> + </g:FlowPanel> + <g:FlowPanel width="100%" height="60px" + styleName="{res.style.docSubheader}" ui:field="docSubheader"> + <g:Image resource='{res.defThemeDocArrowDown}' + styleName='{res.style.docHeaderArrow}' /> + </g:FlowPanel> + </g:VerticalPanel> + </g:north> + <g:center> + <g:DockLayoutPanel unit="PX" + styleName="{res.style.docEditorMargin}"> + <g:west size="10"> + <g:HTMLPanel /> + </g:west> + <g:east size="15"> + <g:HTMLPanel /> + </g:east> + <g:center> + <g:ScrollPanel styleName="{res.style.docEditor}"> + <g:HTML wordWrap="true" width="100%" height="100%"></g:HTML> + </g:ScrollPanel> + </g:center> + <g:south size="33.0"> + <g:VerticalPanel height="33px" width="100%" + styleName="{res.style.docFooter}"> + <g:FlowPanel width="100%" height="33" + ui:field="docFooter"> + </g:FlowPanel> + </g:VerticalPanel> + </g:south> + </g:DockLayoutPanel> + </g:center> + <g:south size="36"> + <g:FlowPanel height="36px" width="100%" + styleName="{res.style.entityFooter}" ui:field="entityFooter"> + </g:FlowPanel> + </g:south> + </g:DockLayoutPanel> + </g:center> + <g:east size="200.0"> + <g:DockLayoutPanel unit="PX" + styleName="{res.style.entityTools}" ui:field="splitEast"> + <g:north size="190"> + <g:VerticalPanel width="100%" ui:field="entityToolsNorth" + styleName="{res.style.entityToolsNorth}"></g:VerticalPanel> + </g:north> + <g:center> + <g:VerticalPanel width="100%" ui:field="entityToolsCenter" + styleName="{res.style.entityToolsCenter}"> + </g:VerticalPanel> + </g:center> + <g:south size="98"> + <g:VerticalPanel width="100%" + styleName="{res.style.entityToolsSouth}" ui:field="entityToolsSouth"></g:VerticalPanel> + </g:south> + </g:DockLayoutPanel> + </g:east> + </g:SplitLayoutPanel> + </g:center> + </g:DockLayoutPanel> +</ui:UiBinder> \ No newline at end of file Modified: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java 2010-12-19 02:58:53 UTC (rev 1170) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java 2010-12-19 03:01:32 UTC (rev 1171) @@ -1,6 +1,5 @@ package cc.kune.core.ws.armor.client.resources; -import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.CssResource; import com.google.gwt.resources.client.ImageResource; @@ -43,9 +42,6 @@ String siteBar(); } - @Deprecated - public static final WsArmorResources INSTANCE = GWT.create(WsArmorResources.class); - @Source("def-theme-doc-arrow-down.png") ImageResource defThemeDocArrowDown();

1 0

19 Dec '10

Author: vjrj_ Date: 2010-12-19 03:58:53 +0100 (Sun, 19 Dec 2010) New Revision: 1170 Added: trunk/img/icons/loading-spiner.gif trunk/src/main/java/cc/kune/core/client/cookies/CookiesManagerViewImpl.java trunk/src/main/java/cc/kune/core/client/i18n/I18nReady.java trunk/src/main/java/cc/kune/core/client/init/ trunk/src/main/java/cc/kune/core/client/init/AppStart.java trunk/src/main/java/cc/kune/core/client/init/AppStarter.java trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java trunk/src/main/java/cc/kune/core/client/init/AppStop.java trunk/src/main/java/cc/kune/core/client/init/PrefetchUtilities.java trunk/src/main/java/cc/kune/core/client/notify/ProgressHide.java trunk/src/main/java/cc/kune/core/client/notify/ProgressShow.java trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.ui.xml trunk/src/main/java/cc/kune/core/client/resources/ trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java trunk/src/main/java/cc/kune/core/client/resources/core.css trunk/src/main/java/cc/kune/core/client/resources/loading-spiner.gif trunk/src/main/java/cc/kune/core/client/sitebar/ trunk/src/main/java/cc/kune/core/client/sitebar/logo/ trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.java trunk/src/main/java/cc/kune/core/public/images/ trunk/src/main/java/cc/kune/core/public/images/kune-logo-16px.png Removed: trunk/src/main/java/cc/kune/core/client/cookies/CookiesView.java trunk/src/main/java/cc/kune/core/client/i18n/I18nReadyEvent.java trunk/src/main/java/org/ourproject/kune/platf/client/app/Application.java trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/utils/PrefetchUtilities.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPanel.java Modified: trunk/TODO trunk/img/webtemplate/web_template-2011.svg trunk/pom.xml trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/CoreGinjector.java trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java trunk/src/main/java/cc/kune/core/client/errors/DefaultException.java trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java trunk/src/main/java/cc/kune/core/client/notify/SpinerPresenter.java trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java trunk/src/main/java/cc/kune/core/client/state/Session.java trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/public/ws.html trunk/src/main/java/cc/kune/core/shared/domain/TagCloudResult.java trunk/src/main/java/cc/kune/core/shared/domain/utils/AccessRights.java trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java trunk/src/main/java/org/ourproject/kune/blogs/KuneBlogs.gwt.xml trunk/src/main/java/org/ourproject/kune/chat/KuneChat.gwt.xml trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java trunk/src/main/java/org/ourproject/kune/docs/KuneDocs.gwt.xml trunk/src/main/java/org/ourproject/kune/gallery/KuneGallery.gwt.xml trunk/src/main/java/org/ourproject/kune/platf/KunePlatform.gwt.xml trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java trunk/src/main/java/org/ourproject/kune/wiki/KuneWiki.gwt.xml trunk/src/main/java/org/ourproject/kune/workspace/KuneWorkspace.gwt.xml trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java Log: Some more MVC patterns Modified: trunk/TODO =================================================================== --- trunk/TODO 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/TODO 2010-12-19 02:58:53 UTC (rev 1170) @@ -11,6 +11,9 @@ Use org-mode in emacs to easy manage this file * SHORT-TERM (URGENT) +** Update Dev Guide +*** Annotations generation http://code.google.com/p/gwt-platform/wiki/BoilerplateGeneration#Eclipse +*** Add -startupUrl to your GWT Run launch with /ws/?locale=en&log_level=INFO (or similar) ** new UI library (gwt-ext is dead) - mosaic, - gtx Added: trunk/img/icons/loading-spiner.gif =================================================================== (Binary files differ) Property changes on: trunk/img/icons/loading-spiner.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/img/webtemplate/web_template-2011.svg =================================================================== --- trunk/img/webtemplate/web_template-2011.svg 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/img/webtemplate/web_template-2011.svg 2010-12-19 02:58:53 UTC (rev 1170) @@ -51,16 +51,16 @@ borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="0.6953125" - inkscape:cx="512" - inkscape:cy="729.16854" + inkscape:zoom="1" + inkscape:cx="174.00056" + inkscape:cy="641.30184" inkscape:current-layer="layer1" inkscape:document-units="px" showgrid="false" inkscape:window-width="1280" - inkscape:window-height="749" + inkscape:window-height="977" inkscape:window-x="0" - inkscape:window-y="1024" + inkscape:window-y="20" inkscape:window-maximized="1" inkscape:snap-bbox="true" inkscape:bbox-paths="true" @@ -94,7 +94,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -2208,6 +2208,15 @@ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> + <rect + style="color:#000000;fill:#feb295;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect4635" + width="87.859406" + height="19.905512" + x="130.07086" + y="111.27247" + rx="4" + ry="4" /> <g style="opacity:0.5;display:inline" id="g5064" @@ -2456,7 +2465,7 @@ id="tspan3098" x="91.84803" y="201.77293" - style="-inkscape-font-specification:Ubuntu Bold;font-family:Ubuntu;font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal">Name of the Initiative</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold">Name of the Initiative</tspan></text> <text sodipodi:linespacing="125%" id="text3073-8" @@ -2580,7 +2589,7 @@ id="tspan3926" sodipodi:role="line" x="543.98315" - y="708.99359" + y="708.89807" style="font-size:16px"><tspan style="font-size:16px;fill:#784421" id="tspan3930">English</tspan><tspan @@ -2670,7 +2679,7 @@ sodipodi:role="line" id="tspan14835" /><tspan style="font-size:16px;fill:#280b0b" - y="710.39124" + y="710.29572" x="377.75659" sodipodi:role="line" id="tspan14837"><tspan @@ -3211,14 +3220,14 @@ id="tspan19968" /></tspan><tspan sodipodi:role="line" x="833" - y="728.54651" + y="728.30774" style="fill:#000080" id="tspan19970"><tspan style="font-size:12px;fill:#000080" id="tspan19972">resilience sustainability</tspan></tspan><tspan sodipodi:role="line" x="833" - y="743.69556" + y="743.55231" style="fill:#000080" id="tspan19974">environmentalism</tspan></text> <image @@ -3269,7 +3278,7 @@ id="tspan22977" sodipodi:role="line" x="633.75659" - y="743.39124" + y="743.29572" style="font-size:16px"><tspan style="font-size:16px;fill:#784421" id="tspan22979">License:</tspan></tspan></text> @@ -3409,7 +3418,7 @@ sodipodi:linespacing="100%"><tspan sodipodi:role="line" id="tspan25503" - x="798.60547" + x="798.04688" y="163">See this in the </tspan><tspan id="tspan25505" sodipodi:role="line" @@ -3441,7 +3450,7 @@ sodipodi:role="line" id="tspan3672" /><tspan style="font-size:16px" - y="743.39124" + y="743.29572" x="25.756592" sodipodi:role="line" id="tspan3674"><tspan @@ -3896,7 +3905,7 @@ id="tspan4990" sodipodi:role="line" x="29.756592" - y="708.39124" + y="708.29572" style="font-size:16px"><tspan style="font-size:16px;fill:#784421" id="tspan4992">Tags:</tspan></tspan></text> @@ -4430,6 +4439,43 @@ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/def-theme-doc-arrow-down.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> + <image + y="112.88816" + x="135.45085" + id="image4632" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAV5JREFU +OI2lk01OAkEQhb8axgGG30EiEEiMLoxuvK1X8ABewDsQdy4gBhNiJgg4IuhMl4vWAQSFxFp2+n2v +XnW1mJsr5R/l/jyQSh3qbai1oVhFb6/3B0jnDDrnUArAcTZvOw4Ysx0grRM4uQTXQx/vkXAAk3CD +IRkXTeJ1gJQC6FxAxoX+HfS6bB2MMeB5FvI+t00BELQg56PDPtrr/pmZJIaMi2TcJUArddteOPhb +DKgaEAe83BIgfhmSD5huZt4aAyyE7yEakx7sVQcemGQlwssI1IBf3qkVL2fNkhWARCPbRdDc7Z7N +W4CaJYDREH0dQ62JNI5/d/fLkC9Z8dczugA6myJPD2jrFI6OES8P09BGAyRXhKwPhbIVLmbpMqWb +qOEASWI4bKGlGhSq0IgRk9i8SQzzCKIx+halXa39BX0eIvMIKVTtQL2sFc8msHiD2TTdwK0AwNJX +HHbVJ0YdhWYwKlACAAAAAElFTkSuQmCC +" + height="16" + width="16" /> + <text + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" + sodipodi:linespacing="125%" + id="text4717" + y="125.59216" + x="153.17085" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + xml:space="preserve"><tspan + y="125.59216" + x="153.17085" + id="tspan4719" + sodipodi:role="line" + style="font-size:16px;font-weight:bold;-inkscape-font-specification:Ubuntu Bold">Loading</tspan></text> + <rect + style="color:#000000;fill:#feb295;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect4721" + width="87.663948" + height="3.7137473" + x="130.07883" + y="111.25339" /> </g> <g inkscape:groupmode="layer" Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/pom.xml 2010-12-19 02:58:53 UTC (rev 1170) @@ -66,7 +66,7 @@ <dependency> <groupId>cc.kune.core.ws.armor</groupId> <artifactId>ws-armor</artifactId> - <version>0.0.6</version> + <version>0.0.7</version> </dependency> <dependency> <groupId>com.gwtplatform</groupId> Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,24 +1,33 @@ package cc.kune.core.client; +import cc.kune.core.client.cookies.CookiesManager; +import cc.kune.core.client.cookies.CookiesManagerViewImpl; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.init.AppStarter; +import cc.kune.core.client.init.AppStarterDefault; +import cc.kune.core.client.init.PrefetchUtilities; import cc.kune.core.client.notify.SpinerPresenter; import cc.kune.core.client.notify.SpinerViewImpl; import cc.kune.core.client.notify.UserNotifierPresenter; import cc.kune.core.client.notify.UserNotifierPresenter.UserNotifierProxy; import cc.kune.core.client.notify.UserNotifierViewImpl; +import cc.kune.core.client.sitebar.logo.SiteLogoPresenter; +import cc.kune.core.client.sitebar.logo.SiteLogoViewImpl; import cc.kune.core.client.state.ContentProvider; import cc.kune.core.client.state.ContentProviderDefault; import cc.kune.core.client.state.HistoryWrapper; import cc.kune.core.client.state.HistoryWrapperDefault; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.SessionDefault; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.client.state.StateManagerDefault; import cc.kune.core.client.ws.CorePlaceManager; import cc.kune.core.client.ws.CorePresenter; import cc.kune.core.client.ws.CoreViewImpl; import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.core.ws.armor.client.Body; -import cc.kune.core.ws.armor.client.IBody; +import cc.kune.core.ws.armor.client.WsArmor; +import cc.kune.core.ws.armor.client.WsArmorImpl; import com.google.inject.Singleton; import com.gwtplatform.mvp.client.DefaultEventBus; @@ -31,9 +40,6 @@ import com.gwtplatform.mvp.client.proxy.ProxyFailureHandler; import com.gwtplatform.mvp.client.proxy.TokenFormatter; -/** - * The Class Core GinModule. - */ public class CoreGinModule extends AbstractPresenterModule { /* @@ -56,14 +62,20 @@ SpinerPresenter.SpinerProxy.class); bindPresenter(UserNotifierPresenter.class, UserNotifierPresenter.UserNotifierView.class, UserNotifierViewImpl.class, UserNotifierProxy.class); + bindPresenter(CookiesManager.class, CookiesManager.CookiesManagerView.class, CookiesManagerViewImpl.class, + CookiesManager.CookiesManagerProxy.class); + bindPresenter(SiteLogoPresenter.class, SiteLogoPresenter.SiteLogoView.class, SiteLogoViewImpl.class, + SiteLogoPresenter.SiteLogoProxy.class); - bind(IBody.class).to(Body.class).in(Singleton.class); + bind(WsArmorImpl.class).in(Singleton.class); + bind(WsArmor.class).to(WsArmorImpl.class); bind(Session.class).to(SessionDefault.class).in(Singleton.class); bind(I18nTranslationService.class).to(I18nUITranslationService.class).in(Singleton.class); bind(ErrorHandler.class).in(Singleton.class); - // bind(ContentProvider.class).to(ContentProviderDefault.class).in(Singleton.class); + bind(StateManager.class).to(StateManagerDefault.class).in(Singleton.class); + bind(ContentProvider.class).to(ContentProviderDefault.class).in(Singleton.class); bind(HistoryWrapper.class).to(HistoryWrapperDefault.class).in(Singleton.class); - // bind(StateManager.class).to(StateManagerDefault.class).in(Singleton.class); + bind(PrefetchUtilities.class).in(Singleton.class); + bind(AppStarter.class).to(AppStarterDefault.class).in(Singleton.class); } - } Modified: trunk/src/main/java/cc/kune/core/client/CoreGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinjector.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/client/CoreGinjector.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,7 +1,9 @@ package cc.kune.core.client; +import cc.kune.core.client.cookies.CookiesManager; import cc.kune.core.client.notify.SpinerPresenter; import cc.kune.core.client.notify.UserNotifierPresenter; +import cc.kune.core.client.sitebar.logo.SiteLogoPresenter; import cc.kune.core.client.ws.CorePresenter; import com.google.gwt.inject.client.AsyncProvider; @@ -14,16 +16,20 @@ @GinModules({ CoreGinModule.class }) public interface CoreGinjector extends Ginjector { - AsyncProvider<CorePresenter> getCorePresenter(); + AsyncProvider<CorePresenter> getCorePresenter(); - EventBus getEventBus(); + AsyncProvider<CookiesManager> getCookiesManager(); - PlaceManager getPlaceManager(); + EventBus getEventBus(); - ProxyFailureHandler getProxyFailureHandler(); + PlaceManager getPlaceManager(); - AsyncProvider<SpinerPresenter> getSpinerPresenter(); + ProxyFailureHandler getProxyFailureHandler(); - AsyncProvider<UserNotifierPresenter> getUserNotifierPresenter(); + AsyncProvider<SpinerPresenter> getSpinerPresenter(); + AsyncProvider<SiteLogoPresenter> getSiteLogoPresenter(); + + AsyncProvider<UserNotifierPresenter> getUserNotifierPresenter(); + } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,25 +1,33 @@ package cc.kune.core.client.cookies; -import cc.kune.core.client.state.Session; - -import com.google.gwt.user.client.Cookies; import com.google.inject.Inject; +import com.gwtplatform.mvp.client.EventBus; +import com.gwtplatform.mvp.client.Presenter; +import com.gwtplatform.mvp.client.View; +import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; +import com.gwtplatform.mvp.client.proxy.Proxy; -public class CookiesManager { - public interface ICookiesView { +public class CookiesManager extends Presenter<CookiesManager.CookiesManagerView, CookiesManager.CookiesManagerProxy> { + + @ProxyCodeSplit + public interface CookiesManagerProxy extends Proxy<CookiesManager> { + } + + public interface CookiesManagerView extends View { String getCurrentCookie(); } @Inject - public CookiesManager() { + public CookiesManager(final EventBus eventBus, final CookiesManagerView view, final CookiesManagerProxy proxy) { + super(eventBus, view, proxy); } public String getCurrentCookie() { - return Cookies.getCookie(Session.USERHASH); - // view.getCurrentCookie(); + return getView().getCurrentCookie(); } - public void onDoNothing() { + @Override + protected void revealInParent() { } } Copied: trunk/src/main/java/cc/kune/core/client/cookies/CookiesManagerViewImpl.java (from rev 1168, trunk/src/main/java/cc/kune/core/client/cookies/CookiesView.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/cookies/CookiesManagerViewImpl.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/cookies/CookiesManagerViewImpl.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -0,0 +1,27 @@ +package cc.kune.core.client.cookies; + +import cc.kune.core.client.cookies.CookiesManager.CookiesManagerView; +import cc.kune.core.client.state.Session; + +import com.google.gwt.user.client.Cookies; +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; +import com.gwtplatform.mvp.client.ViewImpl; + +public class CookiesManagerViewImpl extends ViewImpl implements CookiesManagerView { + + @Inject + public CookiesManagerViewImpl() { + } + + @Override + public String getCurrentCookie() { + return Cookies.getCookie(Session.USERHASH); + } + + @Override + public Widget asWidget() { + return null; + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/cookies/CookiesManagerViewImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/src/main/java/cc/kune/core/client/cookies/CookiesView.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/cookies/CookiesView.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/client/cookies/CookiesView.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,19 +0,0 @@ -package cc.kune.core.client.cookies; - -import cc.kune.core.client.cookies.CookiesManager.ICookiesView; -import cc.kune.core.client.state.Session; - -import com.google.gwt.user.client.Cookies; -import com.google.inject.Inject; - -public class CookiesView implements ICookiesView { - - @Inject - public CookiesView() { - } - - public String getCurrentCookie() { - return Cookies.getCookie(Session.USERHASH); - } - -} Modified: trunk/src/main/java/cc/kune/core/client/errors/DefaultException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/DefaultException.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/client/errors/DefaultException.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -19,10 +19,10 @@ \*/ package cc.kune.core.client.errors; +import com.google.gwt.user.client.rpc.InvocationException; import com.google.gwt.user.client.rpc.IsSerializable; -import com.google.gwt.user.client.rpc.StatusCodeException; -public class DefaultException extends StatusCodeException implements IsSerializable { +public class DefaultException extends InvocationException implements IsSerializable { private static final long serialVersionUID = -6111471089427505005L; @@ -31,7 +31,7 @@ } public DefaultException(final int statusCode, final String message) { - super(statusCode, message); + super(statusCode + " " + message); } public DefaultException(final String message) { Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -22,7 +22,7 @@ import org.ourproject.common.client.notify.NotifyLevel; import cc.kune.core.client.notify.AlertEvent; -import cc.kune.core.client.notify.SpinerPresenter; +import cc.kune.core.client.notify.ProgressHideEvent; import cc.kune.core.client.notify.UserNotifyEvent; import cc.kune.core.client.state.Session; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -40,18 +40,16 @@ private final Session session; private final I18nTranslationService i18n; private final Event0 onSessionExpired; - private final SpinerPresenter spiner; private final PlaceManager placeManager; - private final EventBus eventBus; + private final EventBus eventBus; @Inject - public ErrorHandler(final Session session, final I18nTranslationService i18n, - final SpinerPresenter spiner, final PlaceManager placeManager, EventBus eventBus) { + public ErrorHandler(final Session session, final I18nTranslationService i18n, final PlaceManager placeManager, + EventBus eventBus) { this.session = session; this.i18n = i18n; - this.spiner = spiner; this.placeManager = placeManager; - this.eventBus = eventBus; + this.eventBus = eventBus; this.onSessionExpired = new Event0("onSessionExpired"); } @@ -65,10 +63,11 @@ } public void process(final Throwable caught) { - spiner.fade(); + eventBus.fireEvent(new ProgressHideEvent()); if (caught instanceof AccessViolationException) { logException(caught); - eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("You do not have rights to perform that action"))); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, + i18n.t("You do not have rights to perform that action"))); } else if (caught instanceof SessionExpiredException) { logException(caught); doSessionExpired(); @@ -77,7 +76,8 @@ if (session.isLogged()) { doSessionExpired(); } else { - eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.important, i18n.t("Please sign in or register to collaborate"))); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.important, + i18n.t("Please sign in or register to collaborate"))); } } else if (caught instanceof GroupNotFoundException) { logException(caught); Copied: trunk/src/main/java/cc/kune/core/client/i18n/I18nReady.java (from rev 1168, trunk/src/main/java/cc/kune/core/client/i18n/I18nReadyEvent.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nReady.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nReady.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -0,0 +1,7 @@ +package cc.kune.core.client.i18n; + +import com.gwtplatform.annotation.GenEvent; + +@GenEvent +public class I18nReady { +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/i18n/I18nReady.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/src/main/java/cc/kune/core/client/i18n/I18nReadyEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nReadyEvent.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nReadyEvent.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,32 +0,0 @@ -package cc.kune.core.client.i18n; - -import com.google.gwt.event.shared.EventHandler; -import com.google.gwt.event.shared.GwtEvent; - -public class I18nReadyEvent extends GwtEvent<I18nReadyEvent.I18nReadyHandler> { - - public interface I18nReadyHandler extends EventHandler { - - void fire(I18nReadyEvent event); - } - - public static final GwtEvent.Type<I18nReadyHandler> TYPE = new GwtEvent.Type<I18nReadyHandler>(); - - public static Type<I18nReadyHandler> getType() { - return TYPE; - } - - public I18nReadyEvent() { - } - - @Override - public com.google.gwt.event.shared.GwtEvent.Type<I18nReadyHandler> getAssociatedType() { - return TYPE; - } - - @Override - protected void dispatch(final I18nReadyHandler handler) { - handler.fire(this); - } - -} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -71,6 +71,7 @@ public void onSuccess(final HashMap<String, String> result) { lexicon = result; session.setCurrentLanguage(currentLang); + eventBus.fireEvent(new I18nReadyEvent()); } }); } Added: trunk/src/main/java/cc/kune/core/client/init/AppStart.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/AppStart.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/init/AppStart.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -0,0 +1,12 @@ +package cc.kune.core.client.init; + +import cc.kune.core.shared.dto.InitDataDTO; + +import com.gwtplatform.annotation.GenEvent; +import com.gwtplatform.annotation.Order; + +@GenEvent +public class AppStart { + @Order(1) + InitDataDTO initData; +} Property changes on: trunk/src/main/java/cc/kune/core/client/init/AppStart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/core/client/init/AppStarter.java (from rev 1168, trunk/src/main/java/org/ourproject/kune/platf/client/app/Application.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/AppStarter.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/init/AppStarter.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -0,0 +1,27 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.core.client.init; + + +public interface AppStarter { + + void start(); + +} Copied: trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java (from rev 1168, trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -0,0 +1,98 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.core.client.init; + +import org.ourproject.common.client.notify.NotifyLevel; + +import cc.kune.core.client.notify.ProgressHideEvent; +import cc.kune.core.client.notify.UserNotifyEvent; +import cc.kune.core.client.rpcservices.SiteServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.InitDataDTO; + +import com.allen_sauer.gwt.log.client.Log; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; +import com.google.gwt.user.client.Timer; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.Window.ClosingEvent; +import com.google.gwt.user.client.Window.ClosingHandler; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.inject.Inject; +import com.gwtplatform.mvp.client.EventBus; + +public class AppStarterDefault implements AppStarter { + private final Session session; + private final SiteServiceAsync siteService; + private final EventBus eventBus; + private final PrefetchUtilities prefetchUtilities; + + @Inject + public AppStarterDefault(final Session session, final SiteServiceAsync siteService, final EventBus eventBus, + PrefetchUtilities prefetchUtilities) { + this.session = session; + this.siteService = siteService; + this.eventBus = eventBus; + this.prefetchUtilities = prefetchUtilities; + Window.addWindowClosingHandler(new ClosingHandler() { + @Override + public void onWindowClosing(final ClosingEvent event) { + eventBus.fireEvent(new AppStopEvent()); + } + }); + } + + @Override + public void start() { + prefetchUtilities.preFetchImpImages(); + getInitData(); + final Timer prefetchTimer = new Timer() { + @Override + public void run() { + prefetchUtilities.doTasksDeferred(); + } + }; + prefetchTimer.schedule(20000); + } + + private void getInitData() { + siteService.getInitData(session.getUserHash(), new AsyncCallback<InitDataDTO>() { + @Override + public void onFailure(final Throwable error) { + eventBus.fireEvent(new ProgressHideEvent()); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, "Error fetching initial data")); + Log.debug(error.getMessage()); + } + + @Override + public void onSuccess(final InitDataDTO initData) { + session.setInitData(initData); + session.setCurrentUserInfo(initData.getUserInfo()); + eventBus.fireEvent(new AppStartEvent(initData)); + Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override + public void execute() { + eventBus.fireEvent(new ProgressHideEvent()); + } + }); + } + }); + } +} Added: trunk/src/main/java/cc/kune/core/client/init/AppStop.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/AppStop.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/init/AppStop.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -0,0 +1,8 @@ +package cc.kune.core.client.init; + +import com.gwtplatform.annotation.GenEvent; + +@GenEvent +public class AppStop { + +} Property changes on: trunk/src/main/java/cc/kune/core/client/init/AppStop.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/core/client/init/PrefetchUtilities.java (from rev 1168, trunk/src/main/java/org/ourproject/kune/platf/client/utils/PrefetchUtilities.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/PrefetchUtilities.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/init/PrefetchUtilities.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -0,0 +1,121 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.core.client.init; + +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.RepeatingCommand; +import com.google.gwt.user.client.ui.Image; + +public class PrefetchUtilities { + public PrefetchUtilities() { + } + + public void doTasksDeferred() { + + Scheduler.get().scheduleIncremental(new RepeatingCommand() { + int i = 0; + int j = 0; + + String[] lic = { "gnu-fdl.gif", "bynd80x15.png", "byncsa80x15.png", "byncnd80x15.png", "bync80x15.png", + "by80x15.png", "fal-license.gif" }; + + String[] ext = {}; + + // "default/form/text-bg.gif", "default/form/trigger.gif", + // "default/form/date-trigger.gif", + // "gray/window/left-corners.png", "gray/button/btn-sprite.gif", + // "gray/window/top-bottom.png", + // "gray/window/right-corners.png", "gray/window/left-right.png", + // "default/sizer/s-handle.gif", + // "default/sizer/e-handle.gif", "default/sizer/ne-handle.gif", + // "default/sizer/se-handle.gif", + // "default/sizer/sw-handle.gif", "gray/panel/tool-sprites.gif", + // "default/sizer/nw-handle.gif", + // "gray/tabs/tabs-sprite.gif", "gray/tabs/tab-strip-bg.gif", + // "default/shadow.png", + // "default/shadow-lr.png", "default/shadow-c.png", + // "default/grid/invalid_line.gif", + // "default/form/exclamation.gif", "default/box/tb-blue.gif", + // "default/grid/loading.gif", + // "gray/toolbar/bg.gif", "default/grid/grid3-hrow.gif", + // "default/dd/drop-no.gif", + // "default/grid/col-move-top.gif", + // "default/grid/col-move-bottom.gif", "default/grid/row-over.gif", + // "default/grid/grid-split.gif", + // "default/grid/page-first-disabled.gif", + // "default/grid/page-last-disabled.gif", "default/grid/done.gif", + // "default/grid/page-prev-disabled.gif", "default/grid/done.gif", + // "default/grid/page-next-disabled.gif", + // "default/qtip/tip-sprite.gif", + // "default/grid/grid3-hrow-over.gif", + // "default/grid/grid3-hd-btn.gif", + // "gray/panel/white-top-bottom.gif", "gray/tabs/tab-close.gif", + // "gray/toolbar/btn-arrow.gif", + // "gray/toolbar/tb-btn-sprite.gif", "gray/panel/light-hd.gif" }; + + @Override + public boolean execute() { + + while (i < lic.length) { + final String licImg = lic[i]; + Image.prefetch("images/lic/" + licImg); + i++; + } + + while (j < ext.length) { + final String extImg = ext[j]; + Image.prefetch("js/ext/resources/images/" + extImg); + j++; + } + + final boolean notFinished = i + j < lic.length + ext.length; + + final boolean finished = !notFinished; + + if (finished) { + // In the future maybe: workspace.getLoginComponent() + } + + return notFinished; + } + }); + } + + public void preFetchImpImages() { + final String[] imgs = {}; + // "images/spin-kune-thund-green.gif", "css/img/button-bg-hard.gif", + // "css/img/button-bg-soft.gif", "css/img/arrow-down-white.gif", + // "css/img/arrow-right-white.gif", + // "images/lic/bysa80x15.png", "images/nav/blog.png", + // "images/nav/download.png", "images/nav/film.png", + // "images/nav/folder.png", "images/nav/gallery.png", + // "images/nav/go.png", "images/nav/page_pdf.png", + // "images/nav/page.png", "images/nav/page_pps.png", + // "images/nav/page_text.png", + // "images/nav/page_word.png", "images/nav/page_zip.png", + // "images/nav/picture.png", "images/nav/post.png", + // "images/nav/refresh.png", "images/nav/room_add.png", + // "images/nav/room.png", "images/nav/upload.png", + // "images/nav/wikipage.png", "images/nav/wiki.png" }; + for (final String img : imgs) { + Image.prefetch(img); + } + } +} Added: trunk/src/main/java/cc/kune/core/client/notify/ProgressHide.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/ProgressHide.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/notify/ProgressHide.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -0,0 +1,7 @@ +package cc.kune.core.client.notify; + +import com.gwtplatform.annotation.GenEvent; + +@GenEvent +public class ProgressHide { +} Property changes on: trunk/src/main/java/cc/kune/core/client/notify/ProgressHide.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/notify/ProgressShow.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/ProgressShow.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/notify/ProgressShow.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -0,0 +1,10 @@ +package cc.kune.core.client.notify; + +import com.gwtplatform.annotation.GenEvent; +import com.gwtplatform.annotation.Order; + +@GenEvent +public class ProgressShow { + @Order(1) + String message; +} Property changes on: trunk/src/main/java/cc/kune/core/client/notify/ProgressShow.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/notify/SpinerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/SpinerPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/client/notify/SpinerPresenter.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,48 +1,56 @@ package cc.kune.core.client.notify; +import cc.kune.core.client.i18n.I18nReadyEvent; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.inject.Inject; import com.gwtplatform.mvp.client.EventBus; +import com.gwtplatform.mvp.client.PopupView; import com.gwtplatform.mvp.client.Presenter; -import com.gwtplatform.mvp.client.View; import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; -import com.gwtplatform.mvp.client.annotations.ProxyStandard; +import com.gwtplatform.mvp.client.annotations.ProxyEvent; import com.gwtplatform.mvp.client.proxy.Proxy; -import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent; +import com.gwtplatform.mvp.client.proxy.RevealRootPopupContentEvent; public class SpinerPresenter extends Presenter<SpinerPresenter.SpinerView, SpinerPresenter.SpinerProxy> { - - @ProxyCodeSplit + + private final I18nTranslationService i18n; + + @ProxyCodeSplit public interface SpinerProxy extends Proxy<SpinerPresenter> { } - public interface SpinerView extends View { - + public interface SpinerView extends PopupView { void fade(); void show(String message); - - void showLoading(); } @Inject - public SpinerPresenter(final EventBus eventBus, final SpinerView view, final SpinerProxy proxy) { + public SpinerPresenter(final EventBus eventBus, final SpinerView view, final SpinerProxy proxy, + I18nTranslationService i18n) { super(eventBus, view, proxy); + this.i18n = i18n; } - public void fade() { - getView().fade(); + @ProxyEvent + public void onProgressShow(ProgressShowEvent event) { + getView().show(event.getMessage()); } - public void show(final String message) { - getView().show(message); + @ProxyEvent + public void onI18nReady(I18nReadyEvent event) { + getView().show(i18n.t("Loading")); } - public void showLoading() { - getView().showLoading(); + @ProxyEvent + public void onProgressHide(ProgressHideEvent event) { + getView().fade(); } @Override protected void revealInParent() { - RevealRootContentEvent.fire(this, this); + RevealRootPopupContentEvent.fire(this, this); + // RevealRootContentEvent.fire(this, this); } } Modified: trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,38 +1,59 @@ package cc.kune.core.client.notify; import cc.kune.core.client.notify.SpinerPresenter.SpinerView; +import cc.kune.core.ws.armor.client.WsArmor; -import com.google.gwt.user.client.ui.Label; +import com.google.gwt.core.client.GWT; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.InlineLabel; import com.google.gwt.user.client.ui.Widget; -import com.gwtplatform.mvp.client.ViewImpl; +import com.google.inject.Inject; +import com.gwtplatform.mvp.client.EventBus; +import com.gwtplatform.mvp.client.PopupViewWithUiHandlers; +import com.gwtplatform.mvp.client.UiHandlers; -public class SpinerViewImpl extends ViewImpl implements SpinerView { +public class SpinerViewImpl extends PopupViewWithUiHandlers<UiHandlers> implements SpinerView { - private final Label label; + @Inject + protected SpinerViewImpl(EventBus eventBus, WsArmor armor) { + super(eventBus); + widget = uiBinder.createAndBindUi(this); + armor.getSitebar().add(widget); + } - public SpinerViewImpl() { - label = new Label(); + private static SpinerViewImplUiBinder uiBinder = GWT.create(SpinerViewImplUiBinder.class); + + interface SpinerViewImplUiBinder extends UiBinder<Widget, SpinerViewImpl> { } + @UiField + HorizontalPanel panel; + @UiField + InlineLabel label; + @UiField + Image img; + Widget widget; + @Override public Widget asWidget() { - return label; + return widget; } @Override public void fade() { - // TODO Auto-generated method stub - + panel.setVisible(false); } @Override - public void show(final String message) { - label.setText(message); + public void show(String message) { + if (message == null || message.isEmpty()) { + label.setText("Fixme"); + } else { + label.setText(message); + } + panel.setVisible(true); } - - @Override - public void showLoading() { - label.setText("FIXME"); - } - } Added: trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.ui.xml (rev 0) +++ trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.ui.xml 2010-12-19 02:58:53 UTC (rev 1170) @@ -0,0 +1,11 @@ +<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> +<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" + xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:p1="urn:import:com.extjs.gxt.ui.client.widget"> + <ui:with field='res' type='cc.kune.core.client.resources.CoreResources' /> + <g:FlowPanel> + <g:HorizontalPanel ui:field="panel" styleName="kLoadingPanel" verticalAlignment="ALIGN_MIDDLE" horizontalAlignment="ALIGN_CENTER" borderWidth="0"> + <g:Image ui:field="img" styleName="{res.css.loadingSpiner}" /> + <g:InlineLabel ui:field="label" styleName="kLoadingLabel" horizontalAlignment="ALIGN_CENTER" /> + </g:HorizontalPanel> + </g:FlowPanel> +</ui:UiBinder> \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.ui.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -3,67 +3,49 @@ import org.ourproject.common.client.notify.ConfirmationAsk; import org.ourproject.common.client.notify.NotifyLevel; -import cc.kune.core.client.notify.AlertEvent.AlertHandler; import cc.kune.core.client.notify.UserNotifierPresenter.UserNotifierProxy; import cc.kune.core.client.notify.UserNotifierPresenter.UserNotifierView; -import cc.kune.core.client.notify.UserNotifyEvent.UserNotifyHandler; +import com.google.gwt.user.client.ui.RootPanel; import com.google.inject.Inject; import com.gwtplatform.mvp.client.EventBus; import com.gwtplatform.mvp.client.Presenter; import com.gwtplatform.mvp.client.View; import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; import com.gwtplatform.mvp.client.annotations.ProxyEvent; -import com.gwtplatform.mvp.client.annotations.ProxyStandard; import com.gwtplatform.mvp.client.proxy.Proxy; -public class UserNotifierPresenter extends - Presenter<UserNotifierView, UserNotifierProxy> { - @ProxyCodeSplit - public interface UserNotifierProxy extends - Proxy<UserNotifierPresenter> { - } +public class UserNotifierPresenter extends Presenter<UserNotifierView, UserNotifierProxy> { + @ProxyCodeSplit + public interface UserNotifierProxy extends Proxy<UserNotifierPresenter> { + } - public interface UserNotifierView extends View { - public void alert(String title, String message); + public interface UserNotifierView extends View { + public void alert(String title, String message); - public void confirmationAsk(ConfirmationAsk<?> ask); + public void confirmationAsk(ConfirmationAsk<?> ask); - public void notify(NotifyLevel level, String message); - } + public void notify(NotifyLevel level, String message); + } - @Inject - public UserNotifierPresenter(final EventBus eventBus, - final UserNotifierView view, final UserNotifierProxy proxy) { - super(eventBus, view, proxy); - addRegisteredHandler(UserNotifyEvent.getType(), - new UserNotifyHandler() { - @Override - public void onUserNotify(UserNotifyEvent event) { - view.notify(event.getLevel(), event.getMessage()); - } - }); - addRegisteredHandler(AlertEvent.getType(), new AlertHandler() { - @Override - public void onAlert(AlertEvent event) { - view.alert(event.getTitle(), event.getMessage()); - } - }); - } + @Inject + public UserNotifierPresenter(final EventBus eventBus, final UserNotifierView view, final UserNotifierProxy proxy) { + super(eventBus, view, proxy); + } - @ProxyEvent - public void onUserNotify(UserNotifyEvent event) { - // FIXME test this - getView().notify(event.getLevel(), event.getMessage()); - } + @ProxyEvent + public void onUserNotify(UserNotifyEvent event) { + getView().notify(event.getLevel(), event.getMessage()); + } - @ProxyEvent - public void onAlert(AlertEvent event) { - getView().alert(event.getTitle(), event.getMessage()); - }; + @ProxyEvent + public void onAlert(AlertEvent event) { + getView().alert(event.getTitle(), event.getMessage()); + } - @Override - protected void revealInParent() { - } + @Override + protected void revealInParent() { + RootPanel.get().add(getWidget()); + } } \ No newline at end of file Added: trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -0,0 +1,17 @@ +package cc.kune.core.client.resources; + +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.CssResource; +import com.google.gwt.resources.client.ImageResource; + +public interface CoreResources extends ClientBundle { + public interface Style extends CssResource { + String loadingSpiner(); + } + + @Source("loading-spiner.gif") + ImageResource loadingSpiner(); + + @Source("core.css") + Style css(); +} Property changes on: trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/resources/core.css =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/core.css (rev 0) +++ trunk/src/main/java/cc/kune/core/client/resources/core.css 2010-12-19 02:58:53 UTC (rev 1170) @@ -0,0 +1,6 @@ +@CHARSET "UTF-8"; + +@sprite .loadingSpiner { + gwt-image: 'loadingSpiner'; + margin-top: 2px; +} Property changes on: trunk/src/main/java/cc/kune/core/client/resources/core.css ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/resources/loading-spiner.gif =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/loading-spiner.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -0,0 +1,38 @@ +package cc.kune.core.client.sitebar.logo; + +import cc.kune.core.client.init.AppStartEvent; + +import com.google.inject.Inject; +import com.gwtplatform.mvp.client.EventBus; +import com.gwtplatform.mvp.client.Presenter; +import com.gwtplatform.mvp.client.View; +import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; +import com.gwtplatform.mvp.client.annotations.ProxyEvent; +import com.gwtplatform.mvp.client.proxy.Proxy; +import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent; + +public class SiteLogoPresenter extends Presenter<SiteLogoPresenter.SiteLogoView, SiteLogoPresenter.SiteLogoProxy> { + + public interface SiteLogoView extends View { + void setSiteLogoUrl(String siteLogoUrl); + } + + @ProxyCodeSplit + public interface SiteLogoProxy extends Proxy<SiteLogoPresenter> { + } + + @Inject + public SiteLogoPresenter(EventBus eventBus, SiteLogoView view, SiteLogoProxy proxy) { + super(eventBus, view, proxy); + } + + @Override + protected void revealInParent() { + RevealRootContentEvent.fire(this, this); + } + + @ProxyEvent + public void onAppStart(AppStartEvent event) { + getView().setSiteLogoUrl(event.getInitData().getSiteLogoUrl()); + } +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.java (from rev 1168, trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPanel.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -0,0 +1,49 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + \*/ +package cc.kune.core.client.sitebar.logo; + +import cc.kune.core.ws.armor.client.WsArmor; + +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; +import com.gwtplatform.mvp.client.ViewImpl; + +public class SiteLogoViewImpl extends ViewImpl implements SiteLogoPresenter.SiteLogoView { + + private final Image siteLogoImg; + + @Inject + public SiteLogoViewImpl(WsArmor armor) { + siteLogoImg = new Image(); + siteLogoImg.addStyleName("k-floatright"); + armor.getSitebar().add(siteLogoImg); + } + + @Override + public void setSiteLogoUrl(final String siteLogoUrl) { + siteLogoImg.setUrl(siteLogoUrl); + } + + @Override + public Widget asWidget() { + return siteLogoImg; + } +} Modified: trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -21,32 +21,35 @@ import java.util.HashMap; -import cc.kune.core.client.notify.SpinerPresenter; +import cc.kune.core.client.notify.ProgressShowEvent; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateAbstractDTO; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Inject; +import com.gwtplatform.mvp.client.EventBus; public class ContentProviderDefault implements ContentProvider { private final ContentServiceAsync server; private final HashMap<StateToken, StateAbstractDTO> cache; - private final SpinerPresenter spiner; + private final EventBus eventBus; @Inject - public ContentProviderDefault(final ContentServiceAsync server, final SpinerPresenter spiner) { + public ContentProviderDefault(final ContentServiceAsync server, final EventBus eventBus) { this.server = server; - this.spiner = spiner; + this.eventBus = eventBus; this.cache = new HashMap<StateToken, StateAbstractDTO>(); } + @Override public void cache(final StateToken encodeState, final StateAbstractDTO content) { cache.put(encodeState, content); } + @Override public void getContent(final String user, final StateToken newState, final AsyncCallback<StateAbstractDTO> callback) { - spiner.showLoading(); + eventBus.fireEvent(new ProgressShowEvent("")); final StateAbstractDTO catched = getCached(newState); if (catched != null) { callback.onSuccess(catched); Modified: trunk/src/main/java/cc/kune/core/client/state/Session.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/Session.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/client/state/Session.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -41,7 +41,6 @@ import java.util.Collection; import java.util.List; - import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.I18nCountryDTO; @@ -136,10 +135,13 @@ boolean isNotLogged(); + @Deprecated void onInitDataReceived(Listener<InitDataDTO> listener); + @Deprecated void onUserSignIn(Listener<UserInfoDTO> listener); + @Deprecated void onUserSignOut(Listener0 listener); void setCurrentLanguage(final I18nLanguageDTO currentLanguage); Modified: trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -23,7 +23,6 @@ import java.util.List; import cc.kune.core.client.cookies.CookiesManager; -import cc.kune.core.client.i18n.I18nReadyEvent; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.UserServiceAsync; import cc.kune.core.shared.domain.utils.StateToken; @@ -47,7 +46,6 @@ import com.google.gwt.core.client.GWT; import com.google.inject.Inject; import com.google.inject.Provider; -import com.gwtplatform.mvp.client.EventBus; public class SessionDefault implements Session { private String userHash; @@ -62,12 +60,9 @@ private final Event<UserInfoDTO> onUserSignIn; private final Event0 onUserSignOut; private final Provider<UserServiceAsync> userServiceProvider; - private final EventBus eventBus; @Inject - public SessionDefault(final CookiesManager cookieManager, final Provider<UserServiceAsync> userServiceProvider, - EventBus eventBus) { - this.eventBus = eventBus; + public SessionDefault(final CookiesManager cookieManager, final Provider<UserServiceAsync> userServiceProvider) { this.userHash = cookieManager.getCurrentCookie(); this.userHash = userHash == null || userHash.equals("null") ? null : userHash; this.userServiceProvider = userServiceProvider; @@ -282,7 +277,6 @@ @Override public void setCurrentLanguage(final I18nLanguageDTO currentLanguage) { this.currentLanguage = currentLanguage; - eventBus.fireEvent(new I18nReadyEvent()); } @Override Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -23,7 +23,7 @@ import cc.kune.core.client.actions.BeforeActionCollection; import cc.kune.core.client.actions.BeforeActionListener; -import cc.kune.core.client.notify.SpinerPresenter; +import cc.kune.core.client.notify.ProgressHideEvent; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.SocialNetworkDataDTO; @@ -40,6 +40,7 @@ import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.user.client.History; import com.google.inject.Inject; +import com.gwtplatform.mvp.client.EventBus; public class StateManagerDefault implements StateManager, ValueChangeHandler<String> { private final ContentProvider contentProvider; @@ -57,12 +58,12 @@ private final Event2<String, String> onToolChanged; private final Event2<String, String> onGroupChanged; private final BeforeActionCollection beforeStateChangeCollection; - private final SpinerPresenter spiner; + private final EventBus eventBus; @Inject public StateManagerDefault(final ContentProvider contentProvider, final Session session, - final HistoryWrapper history, final SpinerPresenter spinner) { - this.spiner = spinner; + final HistoryWrapper history, final EventBus eventBus) { + this.eventBus = eventBus; // Put this outside here History.addValueChangeHandler(this); this.contentProvider = contentProvider; @@ -75,6 +76,7 @@ this.onToolChanged = new Event2<String, String>("onToolChanged"); this.onSocialNetworkChanged = new Event<StateAbstractDTO>("onSocialNetworkChanged"); session.onUserSignIn(new Listener<UserInfoDTO>() { + @Override public void onEvent(final UserInfoDTO parameter) { if (previousToken == null) { // starting up @@ -85,6 +87,7 @@ } }); session.onUserSignOut(new Listener0() { + @Override public void onEvent() { reload(); } @@ -93,39 +96,48 @@ beforeStateChangeCollection = new BeforeActionCollection(); } + @Override public void addBeforeStateChangeListener(final BeforeActionListener listener) { beforeStateChangeCollection.add(listener); } + @Override public void addSiteToken(final String token, final Listener0 listener) { siteTokens.put(token, listener); } + @Override public void gotoToken(final StateToken newToken) { Log.debug("StateManager: history goto-token newItem (" + newToken + ")"); history.newItem(newToken.getEncoded()); } + @Override public void gotoToken(final String token) { gotoToken(new StateToken(token)); } + @Override public void onGroupChanged(final Listener2<String, String> listener) { onGroupChanged.add(listener); } + @Override public void onSocialNetworkChanged(final Listener<StateAbstractDTO> listener) { onSocialNetworkChanged.add(listener); } + @Override public void onStateChanged(final Listener<StateAbstractDTO> listener) { onStateChanged.add(listener); } + @Override public void onToolChanged(final Listener2<String, String> listener) { onToolChanged.add(listener); } + @Override public void onValueChange(final ValueChangeEvent<String> event) { onHistoryChanged(event.getValue()); } @@ -135,22 +147,27 @@ * Reload current state (using client cache if available) * </p> */ + @Override public void reload() { onHistoryChanged(history.getToken()); } + @Override public void removeBeforeStateChangeListener(final BeforeActionListener listener) { beforeStateChangeCollection.remove(listener); } + @Override public void removeSiteToken(final String token) { siteTokens.remove(token); } + @Override public void restorePreviousToken() { gotoToken(previousToken); } + @Override public void resumeTokenChange() { if (resumedToken != null) { reload(); @@ -159,12 +176,14 @@ } } + @Override public void setRetrievedState(final StateAbstractDTO newState) { contentProvider.cache(newState.getStateToken(), newState); // setState(newState); history.newItem(newState.getStateToken().toString()); } + @Override public void setSocialNetwork(final SocialNetworkDataDTO socialNet) { StateAbstractDTO state; if (session != null && (state = session.getCurrentState()) != null) { @@ -201,7 +220,7 @@ void setState(final StateAbstractDTO newState) { session.setCurrentState(newState); onStateChanged.fire(newState); - spiner.fade(); + eventBus.fireEvent(new ProgressHideEvent()); checkGroupAndToolChange(newState); previousToken = newState.getStateToken(); @@ -229,6 +248,7 @@ private void onHistoryChanged(final StateToken newState) { contentProvider.getContent(session.getUserHash(), newState, new AsyncCallbackSimple<StateAbstractDTO>() { + @Override public void onSuccess(final StateAbstractDTO newState) { setState(newState); } Modified: trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,6 +1,8 @@ package cc.kune.core.client.ws; -import cc.kune.core.client.notify.AlertEvent; +import cc.kune.core.client.i18n.I18nReadyEvent; +import cc.kune.core.client.init.AppStarter; +import cc.kune.core.client.notify.SpinerPresenter; import cc.kune.core.client.notify.UserNotifierPresenter; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -10,6 +12,7 @@ import com.gwtplatform.mvp.client.View; import com.gwtplatform.mvp.client.annotations.NameToken; import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; +import com.gwtplatform.mvp.client.annotations.ProxyEvent; import com.gwtplatform.mvp.client.proxy.ProxyPlace; import com.gwtplatform.mvp.client.proxy.RevealRootLayoutContentEvent; @@ -17,7 +20,9 @@ * The Class CorePresenter. */ public class CorePresenter extends Presenter<CorePresenter.CoreView, CorePresenter.CoreProxy> { - @ProxyCodeSplit + private final AppStarter appStarter; + + @ProxyCodeSplit @NameToken("home") public interface CoreProxy extends ProxyPlace<CorePresenter> { } @@ -27,13 +32,28 @@ @Inject public CorePresenter(final EventBus eventBus, final CoreView view, final CoreProxy proxy, - final I18nTranslationService i18n, UserNotifierPresenter userNotifier) { + final I18nTranslationService i18n, UserNotifierPresenter userNotifier, SpinerPresenter spiner, + AppStarter appStarter) { super(eventBus, view, proxy); + this.appStarter = appStarter; } + @ProxyEvent + public void onI18nReady(I18nReadyEvent event) { + appStarter.start(); + } + @Override protected void revealInParent() { - RevealRootLayoutContentEvent.fire(getEventBus(), this); + RevealRootLayoutContentEvent.fire(getEventBus(), this); + // getEventBus().fireEvent(new ProgressShowEvent("Something")); + // Timer timer = new Timer() { + // @Override + // public void run() { + // getEventBus().fireEvent(new ProgressHideEvent()); + // } + // }; + // // timer.schedule(4); } } Modified: trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,6 +1,7 @@ package cc.kune.core.client.ws; -import cc.kune.core.ws.armor.client.Body; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.ws.armor.client.WsArmorImpl; import cc.kune.core.ws.armor.client.resources.WsArmorResources; import com.google.gwt.core.client.GWT; @@ -14,24 +15,25 @@ */ public class CoreViewImpl extends ViewImpl implements CorePresenter.CoreView { - private final Body body; + private final WsArmorImpl armor; /** * Instantiates a new core view. * - * @param body + * @param armor * the body */ @Inject - public CoreViewImpl(final Body body) { - this.body = body; + public CoreViewImpl(final WsArmorImpl armor) { + this.armor = armor; + GWT.<CoreResources> create(CoreResources.class).css().ensureInjected(); GWT.<WsArmorResources> create(WsArmorResources.class).style().ensureInjected(); - body.getEntityHeader().add(new InlineLabel("Test - a, e, i, o, u")); - body.getDocHeader().add(new InlineLabel("doc title")); + armor.getEntityHeader().add(new InlineLabel("Test - a, e, i, o, u")); + armor.getDocHeader().add(new InlineLabel("doc title")); } @Override public Widget asWidget() { - return body; + return armor; } } Added: trunk/src/main/java/cc/kune/core/public/images/kune-logo-16px.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/images/kune-logo-16px.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,308 +1,367 @@ @CHARSET "UTF-8"; -body { - background-color: white; - color: black; - font-family: 'Droid Sans', Arial; - font-size: small; - margin: 5px; +body { + background-color: white; + color: black; + font-family: 'Inconsolata', Arial; + font-size: small; + margin: 5px; } * { - font-family: 'Droid Sans', Arial; + font-family: 'Inconsolata', Arial; } -body.fontface {font: 'Droid Sans', Arial;} +body.fontface { + font: 'Inconsolata', Arial; +} -a { - color: darkblue; +a { + color: darkblue; } -a:visited { - color: darkblue; +a:visited { + color: darkblue; } .gwt-DialogBox { - border: 2px solid #AAAAAA; - background-color: white; + border: 2px solid #AAAAAA; + background-color: white; } .gwt-DialogBox .Caption { - background-image: url(gray_gradient.gif); - background-repeat: repeat-x; - padding: 4px; - padding-bottom: 8px; - font-weight: bold; - cursor: default; + background-image: url(gray_gradient.gif); + background-repeat: repeat-x; + padding: 4px; + padding-bottom: 8px; + font-weight: bold; + cursor: default; } .gwt-MenuBar { - background-color: #C3D9FF; - cursor: default; + background-color: #C3D9FF; + cursor: default; } .gwt-MenuItem { - font-size: 80%; - margin: 1px; - cursor: default; + font-size: 80%; + margin: 1px; + cursor: default; } .gwt-MenuItem-selected { - background-color: #E8EEF7; + background-color: #E8EEF7; } .gwt-Tree { + } .gwt-Tree .gwt-TreeItem { - font-size: 80%; - cursor: default; + font-size: 80%; + cursor: default; } .gwt-Tree .gwt-TreeItem-selected { - background-color: #C3D9FF; + background-color: #C3D9FF; } .gwt-StackPanel { - background-color: white; - border: 1px solid #AAAAAA; - width: 15em; + background-color: white; + border: 1px solid #AAAAAA; + width: 15em; } .gwt-StackPanel .gwt-StackPanelItem { - background-image: url(blue_gradient.gif); - background-repeat: repeat-x; - background-color: #EEEEEE; - cursor: pointer; - cursor: hand; + background-image: url(blue_gradient.gif); + background-repeat: repeat-x; + background-color: #EEEEEE; + cursor: pointer; + cursor: hand; } .gwt-StackPanel .gwt-StackPanelItem-selected { + } .gwt-TabPanel { - + } .gwt-TabPanelBottom { - border-left: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - border-bottom: 1px solid #87b3ff; + border-left: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + border-bottom: 1px solid #87b3ff; } .gwt-TabBar { - font-size: smaller; + font-size: smaller; } .gwt-TabBar .gwt-TabBarFirst { - height: 100%; - border-bottom: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - padding-left: 3px; + height: 100%; + border-bottom: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + padding-left: 3px; } .gwt-TabBar .gwt-TabBarRest { - border-bottom: 1px solid #87b3ff; - padding-right: 3px; + border-bottom: 1px solid #87b3ff; + padding-right: 3px; } .gwt-TabBar .gwt-TabBarItem { - border-top: 1px solid #87b3ff; - border-bottom: 1px solid #87b3ff; - padding: 2px; - cursor: hand; - white-space: nowrap; - border-right: 1px solid #87b3ff; + border-top: 1px solid #87b3ff; + border-bottom: 1px solid #87b3ff; + padding: 2px; + cursor: hand; + white-space: nowrap; + border-right: 1px solid #87b3ff; } .gwt-TabBar .gwt-TabBarItem-selected { - font-weight: bold; - background-color: #e8eef7; - border-top: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - border-bottom: 1px solid #e8eef7; - padding: 2px; - cursor: default; - white-space: nowrap; + font-weight: bold; + background-color: #e8eef7; + border-top: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + border-bottom: 1px solid #e8eef7; + padding: 2px; + cursor: default; + white-space: nowrap; } .gwt-PushButton-up { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; } .gwt-PushButton-up-hovering { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; } .gwt-PushButton-down { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; } .gwt-PushButton-down-hovering { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; } .gwt-ToggleButton-up { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; } .gwt-ToggleButton-up-hovering { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); + cursor: pointer; + cursor: hand; } .gwt-ToggleButton-down { - background-color: #C3D9FF; - padding: 2px; - background-color: #E8F1FF; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + background-color: #E8F1FF; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; } .gwt-ToggleButton-down-hovering { - background-color: #C3D9FF; - padding: 2px; - background-color: #E8F1FF; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); - cursor: pointer; - cursor: hand; + background-color: #C3D9FF; + padding: 2px; + background-color: #E8F1FF; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); + cursor: pointer; + cursor: hand; } .gwt-RichTextArea { - border: 1px solid black; - background-color: white; + border: 1px solid black; + background-color: white; } .gwt-RichTextToolbar { - background-color: #C3D9FF; - padding: 2px; + background-color: #C3D9FF; + padding: 2px; } .gwt-RichTextToolbar .gwt-PushButton-up { - margin-right: 2px; - border: 1px solid #C3D9FF; + margin-right: 2px; + border: 1px solid #C3D9FF; } .gwt-RichTextToolbar .gwt-PushButton-up-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); } .gwt-RichTextToolbar .gwt-PushButton-down { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); } .gwt-RichTextToolbar .gwt-PushButton-down-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); } .gwt-RichTextToolbar .gwt-ToggleButton-up { - margin-right: 2px; - border: 1px solid #C3D9FF; + margin-right: 2px; + border: 1px solid #C3D9FF; } .gwt-RichTextToolbar .gwt-ToggleButton-up-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); } .gwt-RichTextToolbar .gwt-ToggleButton-down { - margin-right: 2px; - background-color: #E8F1FF; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); + margin-right: 2px; + background-color: #E8F1FF; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); } .gwt-RichTextToolbar .gwt-ToggleButton-down-hovering { - margin-right: 2px; - background-color: #E8F1FF; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); + margin-right: 2px; + background-color: #E8F1FF; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); } .gwt-HorizontalSplitPanel { - border: 8px solid #C3D9FF; + border: 8px solid #C3D9FF; } .gwt-HorizontalSplitPanel .splitter { - background-color: #C3D9FF; - cursor: move; + background-color: #C3D9FF; + cursor: move; } .gwt-HorizontalSplitPanel .left { - background-color: #E8EEF7; + background-color: #E8EEF7; } .gwt-VerticalSplitPanel { - border: 8px solid #C3D9FF; + border: 8px solid #C3D9FF; } .gwt-VerticalSplitPanel .splitter { - background-color: #C3D9FF; - height: 8px; - cursor: move; + background-color: #C3D9FF; + height: 8px; + cursor: move; } .gwt-SuggestBoxPopup { - border: 2px solid #C3D9FF; + border: 2px solid #C3D9FF; } .gwt-SuggestBoxPopup .item { - padding: 2px; + padding: 2px; } .gwt-SuggestBoxPopup .item-selected { - background-color: #C3D9FF; - padding: 2px; + background-color: #C3D9FF; + padding: 2px; } .gwt-DisclosurePanel { - border: 2px solid #C3D9FF; + border: 2px solid #C3D9FF; } .gwt-DisclosurePanel .header { - background-color: #e8eef7; - cursor: hand; + background-color: #e8eef7; + cursor: hand; } -.gwt-SplitLayoutPanel { } -.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-HDragger { background-color: white; background: none; } -.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-VDragger { } +.gwt-SplitLayoutPanel { + +} + +.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-HDragger { + background-color: white; + background: none; +} + +.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-VDragger { + +} + +.kLoadingPanel { + background-color: #feb295; + -webkit-border-bottom-left-radius: 4px; + -moz-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; + -webkit-border-top-right-radius: 4px; + -moz-border-top-right-radius: 4px; + border-top-right-radius: 4px; + -webkit-border-top-left-radius: 4px; + -moz-border-top-left-radius: 4px; + border-top-left-radius: 4px; + padding: 0 10px 0 7px; +} + +.kLoadingLabel { + font-size: 14px; + color: white; + font-weight: bold; + padding: 0 0 0 5px; +} + +.k-floatleft { + float: left; +} + +.k-floatright { + float: right; +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/public/ws.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.html 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/public/ws.html 2010-12-19 02:58:53 UTC (rev 1170) @@ -7,7 +7,8 @@ src="/ws/ws.nocache.js"></script> </head>  -<link href='http://fonts.googleapis.com/css?family=Droid+Sans' rel='stylesheet' type='text/css'> + +<link href='http://fonts.googleapis.com/css?family=Inconsolata' rel='stylesheet' type='text/css'> <body> <iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe> <iframe src="" id="__download" style="width: 0; height: 0; border: 0"></iframe> Modified: trunk/src/main/java/cc/kune/core/shared/domain/TagCloudResult.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/domain/TagCloudResult.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/shared/domain/TagCloudResult.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -28,6 +28,9 @@ private int maxValue; private int minValue; + public TagCloudResult() { + } + public TagCloudResult(final List<TagCount> tagCountList, final int maxValue, final int minValue) { this.tagCountList = tagCountList; this.maxValue = maxValue; Modified: trunk/src/main/java/cc/kune/core/shared/domain/utils/AccessRights.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/domain/utils/AccessRights.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/cc/kune/core/shared/domain/utils/AccessRights.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -19,83 +19,83 @@ */ package cc.kune.core.shared.domain.utils; -public class AccessRights { - boolean administrable; - boolean editable; - boolean visible; +import com.google.gwt.user.client.rpc.IsSerializable; - public AccessRights() { - this(false, false, false); - } +public class AccessRights implements IsSerializable { + boolean administrable; + boolean editable; + boolean visible; - public AccessRights(final boolean administrable, final boolean editable, - final boolean visible) { - this.administrable = administrable; - this.editable = editable; - this.visible = visible; - } + public AccessRights() { + this(false, false, false); + } - public boolean isAdministrable() { - return administrable; - } + public AccessRights(final boolean administrable, final boolean editable, final boolean visible) { + this.administrable = administrable; + this.editable = editable; + this.visible = visible; + } - public boolean isEditable() { - return editable; - } + public boolean isAdministrable() { + return administrable; + } - public boolean isVisible() { - return visible; - } + public boolean isEditable() { + return editable; + } - public void setAdministrable(final boolean isAdministrable) { - this.administrable = isAdministrable; - } + public boolean isVisible() { + return visible; + } - public void setEditable(final boolean isEditable) { - this.editable = isEditable; - } + public void setAdministrable(final boolean isAdministrable) { + this.administrable = isAdministrable; + } - public void setVisible(final boolean isVisible) { - this.visible = isVisible; - } + public void setEditable(final boolean isEditable) { + this.editable = isEditable; + } - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final AccessRights other = (AccessRights) obj; - if (administrable != other.administrable) { - return false; - } - if (editable != other.editable) { - return false; - } - if (visible != other.visible) { - return false; - } - return true; - } + public void setVisible(final boolean isVisible) { + this.visible = isVisible; + } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + (administrable ? 1231 : 1237); - result = prime * result + (editable ? 1231 : 1237); - result = prime * result + (visible ? 1231 : 1237); - return result; - } + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final AccessRights other = (AccessRights) obj; + if (administrable != other.administrable) { + return false; + } + if (editable != other.editable) { + return false; + } + if (visible != other.visible) { + return false; + } + return true; + } - @Override - public String toString() { - return "AccessRights[a: " + administrable + ", e: " + editable - + ", v: " + visible + "]"; - } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + (administrable ? 1231 : 1237); + result = prime * result + (editable ? 1231 : 1237); + result = prime * result + (visible ? 1231 : 1237); + return result; + } + + @Override + public String toString() { + return "AccessRights[a: " + administrable + ", e: " + editable + ", v: " + visible + "]"; + } } Modified: trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -22,21 +22,19 @@ import org.ourproject.kune.platf.client.services.Loader; import org.ourproject.kune.platf.client.services.PlatformModule; -import cc.kune.core.ws.armor.client.Body; -import cc.kune.core.ws.armor.client.resources.WsArmorResources; - import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; -import com.google.gwt.user.client.ui.RootLayoutPanel; public class KuneEntryPoint implements EntryPoint { + @Override public void onModuleLoad() { Log.setUncaughtExceptionHandler(); Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override public void execute() { onModuleLoadCont(); } @@ -46,11 +44,11 @@ public void onModuleLoadCont() { // At the moment, in runtime: Log.setCurrentLogLevel(Log.LOG_LEVEL_DEBUG); - final WsArmorResources resources = WsArmorResources.INSTANCE; - resources.style().ensureInjected(); - - final Body body = new Body(); - RootLayoutPanel.get().add(body); + // final WsArmorResources resources = WsArmorResources.INSTANCE; + // resources.style().ensureInjected(); + // + // final Body body = new Body(); + // RootLayoutPanel.get().add(body); // Loader.install(new RegistryModule(), new DocumentClientModule(), new // BlogClientModule(), // new WikiClientModule(), new GalleryClientModule(), new Modified: trunk/src/main/java/org/ourproject/kune/blogs/KuneBlogs.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/KuneBlogs.gwt.xml 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/org/ourproject/kune/blogs/KuneBlogs.gwt.xml 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,5 +1,6 @@ <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> <module> + <inherits name="cc.kune.core.Core" /> <inherits name='org.ourproject.kune.platf.KunePlatform' /> <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> <source path="client" /> Modified: trunk/src/main/java/org/ourproject/kune/chat/KuneChat.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/KuneChat.gwt.xml 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/org/ourproject/kune/chat/KuneChat.gwt.xml 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,5 +1,6 @@ <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> <module> + <inherits name="cc.kune.core.Core" /> <inherits name='org.ourproject.kune.platf.KunePlatform' /> <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> <inherits name="com.calclab.emiteuimodule.EmiteUIModule" /> Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -27,7 +27,6 @@ import org.ourproject.kune.chat.client.ctx.room.AddRoom; import org.ourproject.kune.chat.client.ctx.room.AddRoomPanel; import org.ourproject.kune.chat.client.ctx.room.AddRoomPresenter; -import org.ourproject.kune.platf.client.app.Application; import org.ourproject.kune.platf.client.app.ToolGroup; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; @@ -44,6 +43,7 @@ import org.ourproject.kune.workspace.client.tool.ToolSelector; import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.init.AppStarter; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; @@ -88,7 +88,7 @@ @Override public ChatEngine create() { final ChatEngineDefault chatEngineDefault = new ChatEngineDefault(i(I18nUITranslationService.class), - i(WorkspaceSkeleton.class), i(Application.class), i(Session.class), p(EmiteUIDialog.class), + i(WorkspaceSkeleton.class), i(AppStarter.class), i(Session.class), p(EmiteUIDialog.class), p(FileDownloadUtils.class), i(GlobalShortcutRegister.class)); return chatEngineDefault; } Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -26,12 +26,12 @@ import org.ourproject.kune.platf.client.actions.ActionEvent; import org.ourproject.kune.platf.client.actions.KeyStroke; import org.ourproject.kune.platf.client.actions.Shortcut; -import org.ourproject.kune.platf.client.app.Application; import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.client.init.AppStarter; import cc.kune.core.client.state.Session; import cc.kune.core.client.utils.WindowUtils; import cc.kune.core.shared.dto.InitDataDTO; @@ -56,7 +56,6 @@ import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.Window.ClosingEvent; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.Button; import com.gwtext.client.widgets.ToolbarButton; @@ -74,7 +73,7 @@ private final Provider<FileDownloadUtils> downloadUtils; public ChatEngineDefault(final I18nTranslationService i18n, final WorkspaceSkeleton wskel, - final Application application, final Session session, final Provider<EmiteUIDialog> emiteUIProvider, + final AppStarter application, final Session session, final Provider<EmiteUIDialog> emiteUIProvider, final Provider<FileDownloadUtils> downloadUtils, final GlobalShortcutRegister shortcutRegister) { this.i18n = i18n; this.wskel = wskel; @@ -83,6 +82,7 @@ this.onRosterChanged = new Event0("onRosterChanged"); shortcut = Shortcut.getShortcut(false, true, false, false, Character.valueOf('C')); shortcutRegister.put(shortcut, new AbstractExtendedAction() { + @Override public void actionPerformed(final ActionEvent event) { if (isDialogStarted()) { toggleShow(); @@ -91,6 +91,7 @@ } }); session.onInitDataReceived(new Listener<InitDataDTO>() { + @Override public void onEvent(final InitDataDTO initData) { checkChatDomain(initData.getChatDomain()); chatOptions = new ChatConnectionOptions(initData.getChatHttpBase(), initData.getChatDomain(), @@ -107,42 +108,50 @@ } }); session.onUserSignOut(new Listener0() { + @Override public void onEvent() { logout(); } }); session.onUserSignIn(new Listener<UserInfoDTO>() { + @Override public void onEvent(final UserInfoDTO user) { login(user.getChatName(), user.getChatPassword()); } }); - application.onClosing(new Listener<ClosingEvent>() { - public void onEvent(final ClosingEvent event) { - stop(); - } - }); + // application.onClosing(new Listener<ClosingEvent>() { + // public void onEvent(final ClosingEvent event) { + // stop(); + // } + // }); } + @Override public void addNewBuddie(final String shortName) { emiteUIProvider.get().addBuddie(getLocalUserJid(shortName), shortName, ""); } + @Override public void addOnRosterChanged(final Listener0 slot) { onRosterChanged.add(slot); } + @Override public void chat(final XmppURI jid) { emiteUIProvider.get().chat(jid); } + @Override public ChatConnectionOptions getChatOptions() { return chatOptions; } + @Override public boolean isBuddie(final String shortName) { return isBuddie(getLocalUserJid(shortName)); } + @Override public boolean isBuddie(final XmppURI jid) { if (roster != null) { for (final RosterItem item : roster) { @@ -158,14 +167,17 @@ return !emiteUIProvider.get().isDialogNotStarted(); } + @Override public boolean isLoggedIn() { return emiteUIProvider.get().isLoggedIn(); } + @Override public void joinRoom(final String roomName, final String userAlias) { joinRoom(roomName, null, userAlias); } + @Override public void joinRoom(final String roomName, final String subject, final String userAlias) { if (emiteUIProvider.get().isLoggedIn()) { final XmppURI roomURI = XmppURI.uri(roomName + "@" + chatOptions.roomHost + "/" @@ -173,6 +185,7 @@ final Room room = (Room) emiteUIProvider.get().joinRoom(roomURI); if (subject != null) { Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override public void execute() { final RoomUI roomUI = (RoomUI) room.getData(ChatUI.class); if (roomUI != null) { @@ -186,10 +199,12 @@ } } + @Override public void login(final String jid, final String passwd) { final UserChatOptions userChatOptions = getUserChatOptions(jid, passwd); // FIXME: Avatar provider final AvatarProvider avatarProvider = new AvatarProvider() { + @Override public String getAvatarURL(final XmppURI userURI) { // if (userURI.getHost().equals(chatOptions.domain)) { // FIXME @@ -205,6 +220,7 @@ chatOptions.userOptions = userChatOptions; if (emiteUIProvider.get().isDialogNotStarted()) { emiteUIProvider.get().onRosterChanged(new Listener<Collection<RosterItem>>() { + @Override public void onEvent(final Collection<RosterItem> rosterChanged) { roster = rosterChanged; onRosterChanged.fire(); @@ -229,11 +245,13 @@ }); wskel.getSiteTraybar().addButton(traybarButton); emiteUIProvider.get().onChatAttended(new Listener<String>() { + @Override public void onEvent(final String parameter) { traybarButton.setIcon("images/e-icon.gif"); } }); emiteUIProvider.get().onChatUnattendedWithActivity(new Listener<String>() { + @Override public void onEvent(final String parameter) { traybarButton.setIcon("images/e-icon-a.gif"); } @@ -241,17 +259,20 @@ } emiteUIProvider.get().hide(); emiteUIProvider.get().onChatAttended(new Listener<String>() { + @Override public void onEvent(final String parameter) { Window.setTitle(initialWindowTitle); } }); emiteUIProvider.get().onChatUnattendedWithActivity(new Listener<String>() { + @Override public void onEvent(final String chatTitle) { Window.setTitle("(* " + chatTitle + ") " + initialWindowTitle); } }); } + @Override public void logout() { if (!emiteUIProvider.get().isDialogNotStarted()) { emiteUIProvider.get().setOwnPresence(OwnStatus.offline); @@ -261,14 +282,17 @@ } } + @Override public void setAvatar(final String photoBinary) { emiteUIProvider.get().setOwnVCardAvatar(photoBinary); } + @Override public void show() { emiteUIProvider.get().show(); } + @Override public void stop() { if (!emiteUIProvider.get().isDialogNotStarted()) { emiteUIProvider.get().destroy(); Modified: trunk/src/main/java/org/ourproject/kune/docs/KuneDocs.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/KuneDocs.gwt.xml 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/org/ourproject/kune/docs/KuneDocs.gwt.xml 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,5 +1,6 @@ <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> <module> + <inherits name="cc.kune.core.Core" /> <inherits name='org.ourproject.kune.platf.KunePlatform' /> <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> <source path="client" /> Modified: trunk/src/main/java/org/ourproject/kune/gallery/KuneGallery.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/KuneGallery.gwt.xml 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/org/ourproject/kune/gallery/KuneGallery.gwt.xml 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,5 +1,6 @@ <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> <module> + <inherits name="cc.kune.core.Core" /> <inherits name='org.ourproject.kune.platf.KunePlatform' /> <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> <source path="client" /> Modified: trunk/src/main/java/org/ourproject/kune/platf/KunePlatform.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/KunePlatform.gwt.xml 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/org/ourproject/kune/platf/KunePlatform.gwt.xml 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,6 +1,7 @@ <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> <module>  + <inherits name="cc.kune.core.Core" /> <inherits name='com.google.gwt.user.User' /> <inherits name='com.google.gwt.i18n.I18N' /> <inherits name="com.google.gwt.user.UserAgent" /> Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/app/Application.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/app/Application.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/org/ourproject/kune/platf/client/app/Application.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,34 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.client.app; - -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; -import com.google.gwt.user.client.Window.ClosingEvent; - -public interface Application { - - void onClosing(Listener<ClosingEvent> listener); - - void onStarting(Listener0 listener); - - void start(); - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,107 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.client.app; - -import org.ourproject.kune.platf.client.ui.noti.NotifyUser; -import org.ourproject.kune.platf.client.utils.PrefetchUtilities; - -import cc.kune.core.client.rpcservices.SiteServiceAsync; -import cc.kune.core.client.state.Session; -import cc.kune.core.shared.dto.InitDataDTO; - -import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.events.Event; -import com.calclab.suco.client.events.Event0; -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; -import com.google.gwt.core.client.Scheduler; -import com.google.gwt.core.client.Scheduler.ScheduledCommand; -import com.google.gwt.user.client.Timer; -import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.Window.ClosingEvent; -import com.google.gwt.user.client.Window.ClosingHandler; -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.google.gwt.user.client.ui.RootPanel; - -public class ApplicationDefault implements Application { - private final Session session; - private final Event0 onAppStarting; - private final Event<ClosingEvent> onAppClosing; - private final SiteServiceAsync siteService; - - public ApplicationDefault(final Session session, final SiteServiceAsync siteService) { - this.session = session; - this.siteService = siteService; - this.onAppStarting = new Event0("onAppStarting"); - this.onAppClosing = new Event<ClosingEvent>("onAppClossing"); - Window.addWindowClosingHandler(new ClosingHandler() { - public void onWindowClosing(final ClosingEvent event) { - stop(event); - } - }); - } - - public void onClosing(final Listener<ClosingEvent> listener) { - onAppClosing.add(listener); - } - - public void onStarting(final Listener0 listener) { - onAppStarting.add(listener); - } - - public void start() { - onAppStarting.fire(); - PrefetchUtilities.preFetchImpImages(); - getInitData(); - final Timer prefetchTimer = new Timer() { - @Override - public void run() { - PrefetchUtilities.doTasksDeferred(); - } - }; - prefetchTimer.schedule(20000); - } - - private void getInitData() { - siteService.getInitData(session.getUserHash(), new AsyncCallback<InitDataDTO>() { - public void onFailure(final Throwable error) { - RootPanel.get("kuneinitialcurtain").setVisible(false); - RootPanel.get("kuneloading").setVisible(false); - NotifyUser.error("Error fetching initial data"); - Log.debug(error.getMessage()); - } - - public void onSuccess(final InitDataDTO initData) { - session.setInitData(initData); - session.setCurrentUserInfo(initData.getUserInfo()); - Scheduler.get().scheduleDeferred(new ScheduledCommand() { - public void execute() { - RootPanel.get("kuneinitialcurtain").setVisible(false); - RootPanel.get("kuneloading").setVisible(false); - } - }); - } - }); - } - - private void stop(final ClosingEvent event) { - onAppClosing.fire(event); - } -} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -21,9 +21,7 @@ import org.ourproject.kune.platf.client.actions.ui.BasicGuiBindings; import org.ourproject.kune.platf.client.actions.ui.GuiBindingsRegister; -import org.ourproject.kune.platf.client.app.Application; import org.ourproject.kune.platf.client.app.ApplicationComponentGroup; -import org.ourproject.kune.platf.client.app.ApplicationDefault; import org.ourproject.kune.platf.client.app.ToolGroup; import org.ourproject.kune.platf.client.i18n.Resources; import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; @@ -101,7 +99,6 @@ import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.rpcservices.SiteServiceAsync; import cc.kune.core.client.state.AccessRightsClientManager; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; @@ -178,12 +175,12 @@ //AsyncCallbackSimple.init(i(ErrorHandler.class)); - register(Singleton.class, new Factory<Application>(Application.class) { - @Override - public Application create() { - return new ApplicationDefault(i(Session.class), i(SiteServiceAsync.class)); - } - }); +// register(Singleton.class, new Factory<AppStarter>(AppStarter.class) { +// @Override +// public AppStarter create() { +// return new AppStarterDefault(i(Session.class), i(SiteServiceAsync.class)); +// } +// }); register(Singleton.class, new Factory<DeferredCommandWrapper>(DeferredCommandWrapper.class) { @Override @@ -474,7 +471,7 @@ }); i(ApplicationComponentGroup.class).createAll(); i(ToolGroup.class).createAll(); - i(Application.class).start(); +// i(AppStarter.class).start(); } } \ No newline at end of file Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/utils/PrefetchUtilities.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/utils/PrefetchUtilities.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/org/ourproject/kune/platf/client/utils/PrefetchUtilities.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,95 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.client.utils; - -import com.google.gwt.core.client.Scheduler; -import com.google.gwt.core.client.Scheduler.RepeatingCommand; -import com.google.gwt.user.client.ui.Image; - -public class PrefetchUtilities { - - public static void doTasksDeferred() { - - Scheduler.get().scheduleIncremental(new RepeatingCommand() { - int i = 0; - int j = 0; - - String[] lic = { "gnu-fdl.gif", "bynd80x15.png", "byncsa80x15.png", "byncnd80x15.png", "bync80x15.png", - "by80x15.png", "fal-license.gif" }; - - String[] ext = { "default/form/text-bg.gif", "default/form/trigger.gif", "default/form/date-trigger.gif", - "gray/window/left-corners.png", "gray/button/btn-sprite.gif", "gray/window/top-bottom.png", - "gray/window/right-corners.png", "gray/window/left-right.png", "default/sizer/s-handle.gif", - "default/sizer/e-handle.gif", "default/sizer/ne-handle.gif", "default/sizer/se-handle.gif", - "default/sizer/sw-handle.gif", "gray/panel/tool-sprites.gif", "default/sizer/nw-handle.gif", - "gray/tabs/tabs-sprite.gif", "gray/tabs/tab-strip-bg.gif", "default/shadow.png", - "default/shadow-lr.png", "default/shadow-c.png", "default/grid/invalid_line.gif", - "default/form/exclamation.gif", "default/box/tb-blue.gif", "default/grid/loading.gif", - "gray/toolbar/bg.gif", "default/grid/grid3-hrow.gif", "default/dd/drop-no.gif", - "default/grid/col-move-top.gif", "default/grid/col-move-bottom.gif", "default/grid/row-over.gif", - "default/grid/grid-split.gif", "default/grid/page-first-disabled.gif", - "default/grid/page-last-disabled.gif", "default/grid/done.gif", - "default/grid/page-prev-disabled.gif", "default/grid/done.gif", - "default/grid/page-next-disabled.gif", "default/qtip/tip-sprite.gif", - "default/grid/grid3-hrow-over.gif", "default/grid/grid3-hd-btn.gif", - "gray/panel/white-top-bottom.gif", "gray/tabs/tab-close.gif", "gray/toolbar/btn-arrow.gif", - "gray/toolbar/tb-btn-sprite.gif", "gray/panel/light-hd.gif" }; - - public boolean execute() { - - while (i < lic.length) { - final String licImg = lic[i]; - Image.prefetch("images/lic/" + licImg); - i++; - } - - while (j < ext.length) { - final String extImg = ext[j]; - Image.prefetch("js/ext/resources/images/" + extImg); - j++; - } - - final boolean notFinished = i + j < lic.length + ext.length; - - final boolean finished = !notFinished; - - if (finished) { - // In the future maybe: workspace.getLoginComponent() - } - - return notFinished; - } - }); - } - - public static void preFetchImpImages() { - final String[] imgs = { "images/spin-kune-thund-green.gif", "css/img/button-bg-hard.gif", - "css/img/button-bg-soft.gif", "css/img/arrow-down-white.gif", "css/img/arrow-right-white.gif", - "images/lic/bysa80x15.png", "images/nav/blog.png", "images/nav/download.png", "images/nav/film.png", - "images/nav/folder.png", "images/nav/gallery.png", "images/nav/go.png", "images/nav/page_pdf.png", - "images/nav/page.png", "images/nav/page_pps.png", "images/nav/page_text.png", - "images/nav/page_word.png", "images/nav/page_zip.png", "images/nav/picture.png", "images/nav/post.png", - "images/nav/refresh.png", "images/nav/room_add.png", "images/nav/room.png", "images/nav/upload.png", - "images/nav/wikipage.png", "images/nav/wiki.png" }; - for (final String img : imgs) { - Image.prefetch(img); - } - } -} Modified: trunk/src/main/java/org/ourproject/kune/wiki/KuneWiki.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/KuneWiki.gwt.xml 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/org/ourproject/kune/wiki/KuneWiki.gwt.xml 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,5 +1,6 @@ <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> <module> + <inherits name="cc.kune.core.Core" /> <inherits name='org.ourproject.kune.platf.KunePlatform' /> <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> <source path="client" /> Modified: trunk/src/main/java/org/ourproject/kune/workspace/KuneWorkspace.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/KuneWorkspace.gwt.xml 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/org/ourproject/kune/workspace/KuneWorkspace.gwt.xml 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,5 +1,6 @@ <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> <module> + <inherits name="cc.kune.core.Core" /> <inherits name='org.ourproject.kune.platf.KunePlatform' /> <inherits name="org.ourproject.kune.chat.KuneChat" /> <inherits name="com.google.gwt.core.Core" /> Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -169,8 +169,6 @@ import org.ourproject.kune.workspace.client.site.msg.ToastMessagePanel; import org.ourproject.kune.workspace.client.site.msg.ToastMessagePresenter; import org.ourproject.kune.workspace.client.sitebar.sitelogo.SiteLogo; -import org.ourproject.kune.workspace.client.sitebar.sitelogo.SiteLogoPanel; -import org.ourproject.kune.workspace.client.sitebar.sitelogo.SiteLogoPresenter; import org.ourproject.kune.workspace.client.sitebar.sitenewgroup.SiteNewGroupLink; import org.ourproject.kune.workspace.client.sitebar.sitenewgroup.SiteNewGroupLinkPanel; import org.ourproject.kune.workspace.client.sitebar.sitenewgroup.SiteNewGroupLinkPresenter; @@ -423,10 +421,12 @@ register(ApplicationComponentGroup.class, new Factory<SiteLogo>(SiteLogo.class) { @Override public SiteLogo create() { - final SiteLogoPresenter presenter = new SiteLogoPresenter(i(Session.class)); - final SiteLogoPanel panel = new SiteLogoPanel(presenter, i(WorkspaceSkeleton.class)); - presenter.init(panel); - return presenter; + // final SiteLogoPresenter presenter = new + // SiteLogoPresenter(i(Session.class)); + // final SiteLogoPanel panel = new SiteLogoPanel(presenter, + // i(WorkspaceSkeleton.class)); + // presenter.init(panel); + return null; } }); @@ -958,24 +958,28 @@ // Register of tokens like "signin", "newgroup", "translate" etcetera i(StateManager.class).addSiteToken(SiteToken.signin.toString(), new Listener0() { + @Override public void onEvent() { i(SignIn.class).doSignIn(); } }); i(StateManager.class).addSiteToken(SiteToken.register.toString(), new Listener0() { + @Override public void onEvent() { i(Register.class).doRegister(); } }); i(StateManager.class).addSiteToken(SiteToken.newgroup.toString(), new Listener0() { + @Override public void onEvent() { i(NewGroup.class).doNewGroup(); } }); i(StateManager.class).addSiteToken(SiteToken.translate.toString(), new Listener0() { + @Override public void onEvent() { i(I18nTranslator.class).doShowTranslator(); } Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPanel.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPanel.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -1,38 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package org.ourproject.kune.workspace.client.sitebar.sitelogo; - -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - -import com.google.gwt.user.client.ui.Image; - -public class SiteLogoPanel implements SiteLogoView { - - private final Image siteLogoImg; - - public SiteLogoPanel(final SiteLogoPresenter presenter, final WorkspaceSkeleton ws) { - siteLogoImg = new Image(); - ws.getSiteBar().add(siteLogoImg); - } - - public void setSiteLogoUrl(final String siteLogoUrl) { - siteLogoImg.setUrl(siteLogoUrl); - } -} Modified: trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java 2010-12-18 17:00:55 UTC (rev 1169) +++ trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java 2010-12-19 02:58:53 UTC (rev 1170) @@ -5,11 +5,9 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.site.SiteToken; import cc.kune.core.client.actions.BeforeActionListener; -import cc.kune.core.client.notify.SpinerPresenter; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateAbstractDTO; @@ -17,6 +15,7 @@ import com.calclab.suco.testing.events.MockedListener0; import com.calclab.suco.testing.events.MockedListener2; import com.google.gwt.user.client.rpc.AsyncCallback; +import com.gwtplatform.mvp.client.EventBus; public class StateManagerTest { @@ -37,8 +36,8 @@ contentProvider = Mockito.mock(ContentProvider.class); session = Mockito.mock(Session.class); history = Mockito.mock(HistoryWrapper.class); - final SpinerPresenter spiner = Mockito.mock(SpinerPresenter.class); - stateManager = new StateManagerDefault(contentProvider, session, history, spiner); + final EventBus eventBus = Mockito.mock(EventBus.class); + stateManager = new StateManagerDefault(contentProvider, session, history, eventBus); Mockito.when(session.getUserHash()).thenReturn(HASH); state = Mockito.mock(StateAbstractDTO.class); stateChangeListener = new MockedListener<StateAbstractDTO>(); @@ -49,7 +48,7 @@ stateManager.onStateChanged(stateChangeListener); stateManager.onGroupChanged(groupChangeListener); stateManager.onToolChanged(toolChangeListener); - new NotifyUser(null, null); + // new NotifyUser(null, null); } @Test

1 0

18 Dec '10

Author: vjrj_ Date: 2010-12-18 18:00:55 +0100 (Sat, 18 Dec 2010) New Revision: 1169 Added: trunk/src/main/java/cc/kune/core/client/notify/Alert.java trunk/src/main/java/cc/kune/core/client/notify/UserNotify.java trunk/src/main/java/cc/kune/core/shared/domain/AccessRol.java trunk/src/main/java/cc/kune/core/shared/domain/utils/ trunk/src/main/java/cc/kune/core/shared/domain/utils/AccessRights.java trunk/src/main/java/cc/kune/core/shared/domain/utils/StateToken.java Removed: trunk/src/main/java/cc/kune/core/client/CoreEventBus.java trunk/src/main/java/cc/kune/core/shared/dto/AccessRightsDTO.java trunk/src/main/java/cc/kune/core/shared/dto/StateToken.java trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRights.java trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRol.java Modified: trunk/ trunk/dev-utils/kune.cleanup.eclipse.preferences.xml trunk/pom.xml trunk/src/main/java/cc/kune/core/Core.gwt.xml trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/CoreGinjector.java trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java trunk/src/main/java/cc/kune/core/client/notify/SpinerPresenter.java trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java trunk/src/main/java/cc/kune/core/client/rpcservices/GroupService.java trunk/src/main/java/cc/kune/core/client/rpcservices/GroupServiceAsync.java trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkService.java trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkServiceAsync.java trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java trunk/src/main/java/cc/kune/core/client/state/ContentProvider.java trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java trunk/src/main/java/cc/kune/core/client/state/Session.java trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java trunk/src/main/java/cc/kune/core/client/state/StateManager.java trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java trunk/src/main/java/cc/kune/core/shared/domain/GroupListMode.java trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java trunk/src/main/java/cc/kune/core/shared/dto/ContainerSimpleDTO.java trunk/src/main/java/cc/kune/core/shared/dto/ContentSimpleDTO.java trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDataDTO.java trunk/src/main/java/cc/kune/core/shared/dto/StateAbstractDTO.java trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java trunk/src/main/java/cc/kune/core/shared/dto/StateContentDTO.java trunk/src/main/java/cc/kune/core/shared/dto/StateTokenUtils.java trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java trunk/src/main/java/cc/kune/domain/AccessLists.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/domain/Group.java trunk/src/main/java/cc/kune/domain/GroupList.java trunk/src/main/java/cc/kune/domain/User.java trunk/src/main/java/cc/kune/domain/utils/HasStateToken.java trunk/src/main/java/cc/kune/domain/utils/SocialNetworkData.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionRegistry.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsService.java trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsServiceDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessService.java trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessServiceDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderService.java trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderServiceDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/auth/Authorizated.java trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptor.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUtils.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java trunk/src/main/java/org/ourproject/kune/platf/server/rpc/GroupRPC.java trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SocialNetworkRPC.java trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java trunk/src/main/java/org/ourproject/kune/platf/server/state/StateContainer.java trunk/src/main/java/org/ourproject/kune/platf/server/state/StateContent.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbar.java trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbarPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentActionRegistry.java trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigator.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorItem.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorView.java trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextBottomToolbar.java trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextTopToolbar.java trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextActionRegistry.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/GroupOptionsDefLicensePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/UserOptionsDefLicensePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/GroupOptionsToolsConfPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/UserOptionsToolsConfPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupActionRegistry.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolComparator.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbar.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbarPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationSummaryToolbarPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationToolbar.java trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManager.java trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorItemPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploader.java trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsert.java trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPresenter.java trunk/src/main/resources/dozerBeanMapping.xml trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java trunk/src/test/java/cc/kune/core/client/state/StateTokenTest.java trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceAddTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceGetTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceIntegrationTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java trunk/src/test/java/org/ourproject/kune/platf/server/access/AccessRightsServiceTest.java trunk/src/test/java/org/ourproject/kune/platf/server/access/FinderTest.java trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptorTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader/EntityLogoPresenterTest.java trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolActionTest.java trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java Log: Some more MVC patterns Property changes on: trunk ___________________________________________________________________ Name: svn:ignore - pmd-eclipse.log .pmd www-test screenlog.0 bin client public target Main-compile bin .settings .gwt-cache repository derby.log star-yellow-grey.png run.sh tomcat .classpath gwt-out synccss.sh .externalToolBuilders .project .wtpmodules www testRepository kune-OLD-jcr KuneApp.launch KuneApp NOSERVER.launch old_src org.ourproject.kune.app.Kune org.ourproject.kune.iml org.ourproject.kune.ipr org.ourproject.kune.iws nbproject hibernate.reveng.xml .gwt-tmp target-eclipse .checkstyle .classpath-bien + pmd-eclipse.log .pmd www-test screenlog.0 bin client public target Main-compile bin .settings .gwt-cache repository derby.log star-yellow-grey.png run.sh tomcat .classpath gwt-out synccss.sh .externalToolBuilders .project .wtpmodules www testRepository kune-OLD-jcr KuneApp.launch KuneApp NOSERVER.launch old_src org.ourproject.kune.app.Kune org.ourproject.kune.iml org.ourproject.kune.ipr org.ourproject.kune.iws nbproject hibernate.reveng.xml .gwt-tmp target-eclipse .checkstyle .classpath-bien pom.xml.* Modified: trunk/dev-utils/kune.cleanup.eclipse.preferences.xml =================================================================== --- trunk/dev-utils/kune.cleanup.eclipse.preferences.xml 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/dev-utils/kune.cleanup.eclipse.preferences.xml 2010-12-18 17:00:55 UTC (rev 1169) @@ -5,7 +5,7 @@ <setting id="cleanup.always_use_parentheses_in_expressions" value="true"/> <setting id="cleanup.never_use_blocks" value="false"/> <setting id="cleanup.remove_unused_private_methods" value="true"/> -<setting id="cleanup.add_missing_deprecated_annotations" value="false"/> +<setting id="cleanup.add_missing_deprecated_annotations" value="true"/> <setting id="cleanup.convert_to_enhanced_for_loop" value="false"/> <setting id="cleanup.remove_unnecessary_nls_tags" value="true"/> <setting id="cleanup.sort_members" value="true"/> @@ -28,11 +28,12 @@ <setting id="cleanup.add_missing_nls_tags" value="false"/> <setting id="cleanup.format_source_code" value="true"/> <setting id="cleanup.qualify_static_method_accesses_with_declaring_class" value="false"/> -<setting id="cleanup.add_missing_override_annotations" value="false"/> +<setting id="cleanup.add_missing_override_annotations" value="true"/> <setting id="cleanup.remove_unused_private_types" value="true"/> <setting id="cleanup.add_missing_methods" value="false"/> <setting id="cleanup.make_local_variable_final" value="true"/> <setting id="cleanup.correct_indentation" value="false"/> +<setting id="cleanup.add_missing_override_annotations_interface_methods" value="true"/> <setting id="cleanup.remove_unused_imports" value="true"/> <setting id="cleanup.remove_trailing_whitespaces_ignore_empty" value="false"/> <setting id="cleanup.make_private_fields_final" value="true"/> @@ -41,7 +42,7 @@ <setting id="cleanup.remove_trailing_whitespaces" value="true"/> <setting id="cleanup.sort_members_all" value="true"/> <setting id="cleanup.use_blocks_only_for_return_and_throw" value="false"/> -<setting id="cleanup.add_missing_annotations" value="false"/> +<setting id="cleanup.add_missing_annotations" value="true"/> <setting id="cleanup.use_parentheses_in_expressions" value="false"/> <setting id="cleanup.qualify_static_field_accesses_with_declaring_class" value="false"/> <setting id="cleanup.use_this_for_non_static_method_access_only_if_necessary" value="true"/> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/pom.xml 2010-12-18 17:00:55 UTC (rev 1169) @@ -1,891 +1,910 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>cc.kune</groupId> - <artifactId>kune</artifactId> - <packaging>war</packaging> - <version>0.0.7</version> - <name>kune</name> - <description> kune free/open/libre collaboration platform </description> - <url>http://kune.ourproject.org</url> - <properties> -  - <gwtVersion>2.1.0</gwtVersion> - <maven.compiler.source>1.6</maven.compiler.source> - <maven.compiler.target>1.6</maven.compiler.target> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <slf4j.version>1.6.1</slf4j.version> - <openjpa.version>2.0.1</openjpa.version> - </properties> - <dependencies> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-servlet</artifactId> - <version>${gwtVersion}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - <version>${gwtVersion}</version> - <scope>provided</scope> - </dependency> -  - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice</artifactId> - <version>2.0.1</version> - </dependency> - <dependency> - <groupId>com.googlecode.gwt.inject</groupId> - <artifactId>gin</artifactId> - <version>r137</version> - </dependency> - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice-servlet</artifactId> - <version>2.0.1</version> - </dependency> - <dependency> - <groupId>org.ourproject.common</groupId> - <artifactId>gwt-common</artifactId> - <version>0.0.3</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.extjs</groupId> - <artifactId>gxt</artifactId> - <version>2.2.1</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.cobogw.gwt</groupId> - <artifactId>cobogw</artifactId> - <version>1.3.1</version> - </dependency> - <dependency> - <groupId>cc.kune.core.ws.armor</groupId> - <artifactId>ws-armor</artifactId> - <version>0.0.5</version> - </dependency> - <dependency> - <groupId>com.gwtplatform</groupId> - <artifactId>gwtp</artifactId> - <version>0.4</version> - </dependency> -  - <dependency> - <groupId>com.gwtext</groupId> - <artifactId>gwtext</artifactId> - <version>2.0.5</version> - </dependency> - <dependency> - <groupId>com.gwtextux</groupId> - <artifactId>gwtextux</artifactId> - <version>0.4.0.924</version> - </dependency> - <dependency> - <groupId>com.allen_sauer.gwt.log.gwt-log</groupId> - <artifactId>gwt-log</artifactId> - <version>3.0.1</version> - </dependency> - <dependency> - <groupId>com.allen_sauer.gwt.voices.gwt-voices</groupId> - <artifactId>gwt-voices</artifactId> - <version>1.6.0</version> - </dependency> -  - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - <dependency> - <groupId>net.sf.dozer</groupId> - <artifactId>dozer</artifactId> - <version>4.0</version> - </dependency> - <dependency> - <groupId>com.calclab</groupId> - <artifactId>suco</artifactId> - <version>0.6.5</version> - </dependency> - <dependency> - <groupId>jmagick</groupId> - <artifactId>jmagick</artifactId> - <version>6.2.6-0</version> - </dependency> - <dependency> - <groupId>org.xwiki.platform</groupId> - <artifactId>xwiki-web-gwt-dom</artifactId> - <version>2.3-rc-1</version> -  -  -  - </dependency> -  - <dependency> - <groupId>com.calclab.emite</groupId> - <artifactId>emite</artifactId> - <version>0.4.7</version> - </dependency> - <dependency> - <groupId>org.jivesoftware.smack</groupId> - <artifactId>smack</artifactId> - <version>3.0.4</version> - </dependency> - <dependency> - <groupId>org.jivesoftware.smackx</groupId> - <artifactId>smackx</artifactId> - <version>3.0.4</version> - </dependency> - <dependency> - <groupId>org.jivesoftware.smackx.debugger</groupId> - <artifactId>smackx-debugger</artifactId> - <version>3.0.4</version> - </dependency> -  - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.1.13</version> - </dependency> -  - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>3.3.1.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>4.0.2.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.4.0.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - <version>3.3.0.ga</version> - </dependency> -  - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search</artifactId> - <version>3.1.0.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.4.0.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-tools</artifactId> - <version>3.2.3.GA</version> - </dependency> - <dependency> - <groupId>c3p0</groupId> - <artifactId>c3p0</artifactId> - <version>0.9.1.2</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>com.wideplay</groupId> - <artifactId>warp-persist</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> -  - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> -  - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${slf4j.version}</version> -  - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j.version}</version> -  - </dependency> -  - <dependency> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - <version>1.2.2</version> - </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>org.codehaus.jettison</groupId> - <artifactId>jettison</artifactId> - <version>1.0-RC2</version> - </dependency> - <dependency> - <groupId>net.sf.json-lib</groupId> - <artifactId>json-lib</artifactId> - <version>2.1</version> - <classifier>jdk15</classifier> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2</version> - </dependency> -  - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.1.1</version> - </dependency> -  - <dependency> - <groupId>org.liquibase</groupId> - <artifactId>liquibase-core</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>org.liquibase</groupId> - <artifactId>liquibase-plugin</artifactId> - <version>1.7.0.0</version> - </dependency> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> -  - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> - <version>1.6</version> - </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.0.20070617</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> -  - <scope>test</scope> - </dependency> -  -  -  -  -  -  -  - <dependency> - <groupId>org.jruby.rack</groupId> - <artifactId>jruby-rack</artifactId> - <version>1.0.3</version> -  - </dependency> -  - <dependency> - <groupId>org.waveprotocol</groupId> - <artifactId>kune-wave-server</artifactId> - <version>0.0.2.2</version> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.2</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> - <type>jar</type> - </dependency> -  -  -  -  -  -  - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice-assistedinject</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - <version>0.9.94</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.gnu.inet</groupId> - <artifactId>libidn</artifactId> - <version>1.15</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - <version>2.1.0</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - <version>1.1.4c</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3_xpath</artifactId> - <version>1.1.4c</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - <version>1.0</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.wave-protocol</groupId> - <artifactId>xmpp</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.wave-protocol</groupId> - <artifactId>whack</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>com.google.common</groupId> - <artifactId>collect</artifactId> - <version>1.0-rc2</version> - </dependency> - </dependencies> - <distributionManagement> - <repository> - <id>kune.ourproject.org</id> - <url>scpexe://kune.ourproject.org/home/groups/kune/htdocs/mavenrepo/</url> - </repository> - </distributionManagement> - <pluginRepositories> -  - <pluginRepository> - <id>jboss-public-repository-group</id> - <name>JBoss Public Maven Repository Group</name> - <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </pluginRepository> -  -  - <pluginRepository> - <id>Codehaus Snapshots</id> - <url>http://snapshots.repository.codehaus.org/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled>  - </releases> - </pluginRepository> - <pluginRepository> - <id>gwt-plugin-repo</id> - <url>http://google-web-toolkit.googlecode.com/svn/2.1.0.M3/gwt/maven</url> - <name>Google Web Toolkit Plugin Repository</name> - </pluginRepository> - </pluginRepositories> - <repositories> - <repository> - <id>guice-maven</id> - <name>guice maven</name> - <url>http://guice-maven.googlecode.com/svn/trunk</url> - </repository> - <repository> - <id>Codehaus Snapshots</id> - <url>http://snapshots.repository.codehaus.org/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - <repository> - <id>jboss-public-repository-group</id> - <name>JBoss Public Maven Repository Group</name> - <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository> - <repository> - <id>mvp4g.googlecode.releases</id> - <name>Releases Repository for Mvp4g</name> - <url>http://mvp4g.googlecode.com/svn/maven2/releases/</url> - </repository> - <repository> - <id>ext-gxt</id> - <name>ext-gxt at jahia</name> - <url>http://maven.jahia.org/maven2/</url> - </repository> - <repository> - <id>ext-gxt</id> - <name>ext-gxt at jahia</name> - <url>http://maven.jahia.org/maven2/</url> - </repository> - <repository> - <id>cobogw</id> - <name>Cobogw repository at googlecode</name> - <url>http://cobogw.googlecode.com/svn/maven2</url> - </repository> - <repository> - <id>gwtp</id> - <name>gwtp repo</name> - <url>http://maven.gwt-platform.googlecode.com/hg/</url> - </repository> -  - <repository> - <id>dyndns-repo</id> - <url>http://maven.dyndns.org/2</url> - </repository> - <repository> - <id>gwt-maven</id> - <url> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>cc.kune</groupId> + <artifactId>kune</artifactId> + <packaging>war</packaging> + <version>0.0.7</version> + <name>kune</name> + <description> kune free/open/libre collaboration platform </description> + <url>http://kune.ourproject.org</url> + <properties> +  + <gwtVersion>2.1.0</gwtVersion> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.target>1.6</maven.compiler.target> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <slf4j.version>1.6.1</slf4j.version> + <openjpa.version>2.0.1</openjpa.version> + </properties> + <dependencies> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <version>${gwtVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwtVersion}</version> + <scope>provided</scope> + </dependency> +  + <dependency> + <groupId>com.google.code.guice</groupId> + <artifactId>guice</artifactId> + <version>2.0.1</version> + </dependency> + <dependency> + <groupId>com.googlecode.gwt.inject</groupId> + <artifactId>gin</artifactId> + <version>r137</version> + </dependency> + <dependency> + <groupId>com.google.code.guice</groupId> + <artifactId>guice-servlet</artifactId> + <version>2.0.1</version> + </dependency> + <dependency> + <groupId>org.ourproject.common</groupId> + <artifactId>gwt-common</artifactId> + <version>0.0.3</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.extjs</groupId> + <artifactId>gxt</artifactId> + <version>2.2.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.cobogw.gwt</groupId> + <artifactId>cobogw</artifactId> + <version>1.3.1</version> + </dependency> + <dependency> + <groupId>cc.kune.core.ws.armor</groupId> + <artifactId>ws-armor</artifactId> + <version>0.0.6</version> + </dependency> + <dependency> + <groupId>com.gwtplatform</groupId> + <artifactId>gwtp</artifactId> + <version>0.4</version> + </dependency> +  + <dependency> + <groupId>com.gwtext</groupId> + <artifactId>gwtext</artifactId> + <version>2.0.5</version> + </dependency> + <dependency> + <groupId>com.gwtextux</groupId> + <artifactId>gwtextux</artifactId> + <version>0.4.0.924</version> + </dependency> + <dependency> + <groupId>com.allen_sauer.gwt.log.gwt-log</groupId> + <artifactId>gwt-log</artifactId> + <version>3.0.1</version> + </dependency> + <dependency> + <groupId>com.allen_sauer.gwt.voices.gwt-voices</groupId> + <artifactId>gwt-voices</artifactId> + <version>1.6.0</version> + </dependency> +  + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + <dependency> + <groupId>net.sf.dozer</groupId> + <artifactId>dozer</artifactId> + <version>4.0</version> + </dependency> + <dependency> + <groupId>com.calclab</groupId> + <artifactId>suco</artifactId> + <version>0.6.5</version> + </dependency> + <dependency> + <groupId>jmagick</groupId> + <artifactId>jmagick</artifactId> + <version>6.2.6-0</version> + </dependency> + <dependency> + <groupId>org.xwiki.platform</groupId> + <artifactId>xwiki-web-gwt-dom</artifactId> + <version>2.3-rc-1</version> +  +  +  + </dependency> +  + <dependency> + <groupId>com.calclab.emite</groupId> + <artifactId>emite</artifactId> + <version>0.4.7</version> + </dependency> + <dependency> + <groupId>org.jivesoftware.smack</groupId> + <artifactId>smack</artifactId> + <version>3.0.4</version> + </dependency> + <dependency> + <groupId>org.jivesoftware.smackx</groupId> + <artifactId>smackx</artifactId> + <version>3.0.4</version> + </dependency> + <dependency> + <groupId>org.jivesoftware.smackx.debugger</groupId> + <artifactId>smackx-debugger</artifactId> + <version>3.0.4</version> + </dependency> +  + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.1.13</version> + </dependency> +  + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.3.1.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>4.0.2.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.4.0.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-commons-annotations</artifactId> + <version>3.3.0.ga</version> + </dependency> +  + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search</artifactId> + <version>3.1.0.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.4.0.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-tools</artifactId> + <version>3.2.3.GA</version> + </dependency> + <dependency> + <groupId>c3p0</groupId> + <artifactId>c3p0</artifactId> + <version>0.9.1.2</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>com.wideplay</groupId> + <artifactId>warp-persist</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> +  + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> +  + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>${slf4j.version}</version> +  + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4j.version}</version> +  + </dependency> +  + <dependency> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + <version>1.2.2</version> + </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>org.codehaus.jettison</groupId> + <artifactId>jettison</artifactId> + <version>1.0-RC2</version> + </dependency> + <dependency> + <groupId>net.sf.json-lib</groupId> + <artifactId>json-lib</artifactId> + <version>2.1</version> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2</version> + </dependency> +  + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.1.1</version> + </dependency> +  + <dependency> + <groupId>org.liquibase</groupId> + <artifactId>liquibase-core</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>org.liquibase</groupId> + <artifactId>liquibase-plugin</artifactId> + <version>1.7.0.0</version> + </dependency> +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> +  + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> + <version>1.6</version> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.0.20070617</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> +  + <scope>test</scope> + </dependency> +  +  +  +  +  +  +  + <dependency> + <groupId>org.jruby.rack</groupId> + <artifactId>jruby-rack</artifactId> + <version>1.0.3</version> +  + </dependency> +  + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>kune-wave-server</artifactId> + <version>0.0.2.2</version> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.2</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + <type>jar</type> + </dependency> +  +  +  +  +  +  + <dependency> + <groupId>com.google.code.guice</groupId> + <artifactId>guice-assistedinject</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + <version>0.9.94</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.gnu.inet</groupId> + <artifactId>libidn</artifactId> + <version>1.15</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>2.1.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + <version>1.1.4c</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3_xpath</artifactId> + <version>1.1.4c</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>aopalliance</groupId> + <artifactId>aopalliance</artifactId> + <version>1.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.wave-protocol</groupId> + <artifactId>xmpp</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>org.wave-protocol</groupId> + <artifactId>whack</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>com.google.common</groupId> + <artifactId>collect</artifactId> + <version>1.0-rc2</version> + </dependency> + </dependencies> + <distributionManagement> + <repository> + <id>kune.ourproject.org</id> + <url>scpexe://kune.ourproject.org/home/groups/kune/htdocs/mavenrepo/</url> + </repository> + </distributionManagement> + <pluginRepositories> +  + <pluginRepository> + <id>jboss-public-repository-group</id> + <name>JBoss Public Maven Repository Group</name> + <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </pluginRepository> +  +  + <pluginRepository> + <id>Codehaus Snapshots</id> + <url>http://snapshots.repository.codehaus.org/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled>  + </releases> + </pluginRepository> + <pluginRepository> + <id>gwt-plugin-repo</id> + <url>http://google-web-toolkit.googlecode.com/svn/2.1.0.M3/gwt/maven</url> + <name>Google Web Toolkit Plugin Repository</name> + </pluginRepository> + <pluginRepository> + <id>maven2-repository.dev.java.net</id> + <name>Java.net Repository for Maven</name> + <url>http://download.java.net/maven/2/</url> + <layout>default</layout> + </pluginRepository> + </pluginRepositories> + <repositories> + <repository> + <id>guice-maven</id> + <name>guice maven</name> + <url>http://guice-maven.googlecode.com/svn/trunk</url> + </repository> + <repository> + <id>Codehaus Snapshots</id> + <url>http://snapshots.repository.codehaus.org/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + <repository> + <id>jboss-public-repository-group</id> + <name>JBoss Public Maven Repository Group</name> + <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + <repository> + <id>mvp4g.googlecode.releases</id> + <name>Releases Repository for Mvp4g</name> + <url>http://mvp4g.googlecode.com/svn/maven2/releases/</url> + </repository> + <repository> + <id>ext-gxt</id> + <name>ext-gxt at jahia</name> + <url>http://maven.jahia.org/maven2/</url> + </repository> + <repository> + <id>ext-gxt</id> + <name>ext-gxt at jahia</name> + <url>http://maven.jahia.org/maven2/</url> + </repository> + <repository> + <id>cobogw</id> + <name>Cobogw repository at googlecode</name> + <url>http://cobogw.googlecode.com/svn/maven2</url> + </repository> + <repository> + <id>gwtp</id> + <name>gwtp repo</name> + <url>http://maven.gwt-platform.googlecode.com/hg/</url> + </repository> +  + <repository> + <id>dyndns-repo</id> + <url>http://maven.dyndns.org/2</url> + </repository> + <repository> + <id>gwt-maven</id> + <url> http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/ </url> - </repository> - <repository> - <id>kune-maven</id> - <url>http://kune.ourproject.org/mavenrepo/</url> - </repository> - <repository> - <id>google-maven-snapshot-repository</id> - <name>Google Maven Snapshot Repository</name> - <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - <repository> - <id>openqa.org</id> - <name>Openqa Release Repository</name> - <url>http://archiva.openqa.org/repository/releases</url> - <layout>default</layout> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>openqa.org snapshots</id> - <name>Openqa Snapshot Repository</name> - <url>http://archiva.openqa.org/repository/snapshots</url> - <layout>default</layout> - <snapshots> - <enabled>true</enabled> - <updatePolicy>daily</updatePolicy> - <checksumPolicy>ignore</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - <repository> - <id>xwiki-releases</id> - <name>XWiki Maven2 Remote Repository for Releases</name> - <url>http://maven.xwiki.org/releases</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>xwiki</id> - <name>XWiki Repository</name> - <url>http://maven.xwiki.org/snapshots</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>daily</updatePolicy> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - </repository> - </repositories> - <issueManagement> - <system>kune issues list at ourproject.org</system> - <url>http://kune.ourproject.org/issues/</url> - </issueManagement> - <developers> - <developer> - <id>dani</id> - <name>Daniel Gómez Blasco</name> - <email>danigb(a)gmail.com</email> - </developer> - <developer> - <name>Samer Hassan</name> - <email>samer2004(a)gmail.com</email> - </developer> - <developer> - <name>Vicente J. Ruiz Jurado</name> - <email>vjrj(a)ourproject.org</email> - </developer> - </developers> - <scm> - <url>svn://scm.ourproject.org/svnroot/kune/trunk</url> - </scm> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.3</version> - <configuration> - <forkMode>pertest</forkMode> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> -  - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>gwt-maven-plugin</artifactId> - <version>2.1.0-1</version> - <executions> - <execution> - <configuration> -  - <soyc>false</soyc> - <style>OBF</style> - <inline>true</inline> - </configuration> - <goals> -  - <goal>compile</goal> -  - <goal>resources</goal> - </goals> - </execution> - </executions> - <configuration> - <runTarget>org.ourproject.kune.app.Kune/ws.html?log_level=DEBUG</runTarget> - <gwt.module>org.ourproject.kune.app.Kune</gwt.module> - </configuration> - </plugin> - <plugin> - <artifactId>maven-eclipse-plugin</artifactId> - <version>2.7</version> - <configuration> - <downloadSources>true</downloadSources> - <downloadJavadocs>false</downloadJavadocs> - <wtpversion>2.0</wtpversion> - </configuration> - </plugin> -  - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>7.2.1.v20101111</version> -  - <configuration> -  -  -  - <webAppSourceDirectory>war</webAppSourceDirectory> - <reload>manual</reload> - <scanIntervalSeconds>0</scanIntervalSeconds> - </configuration> - </plugin> -  - <plugin> - <groupId>org.liquibase</groupId> - <artifactId>liquibase-plugin</artifactId> - <version>1.7.0.0</version> - <executions> - <execution> - <phase>process-resources</phase> - <configuration> - <changeLogFile> - src/main/resources/db/liquibase_changelog.xml </changeLogFile> - <driver>com.mysql.jdbc.Driver</driver> - <url>jdbc:mysql://localhost/kune_dev</url> - <username>kune</username> - <password>db4kune</password> - <verbose>true</verbose> - </configuration> -  - <goals> - <goal>update</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> - <executions> - <execution> - <id>core</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>core</classifier> - <includes> - <include>**/KunePlatform.gwt.xml**</include> - <include>**/i18n/I18nTranslationService.**</include> - <include>**/i18n/I18nTranslationServiceMocked.** </include> - <include>**/TextUtils.**</include> - <include>**/IconLabelEditable.**</include> - <include>**/QuickTipsHelper.**</include> - <include>**/RichText.gwt.xml**</include> - <include>**/BasicDialog.**</include> - <include>**/HorizontalLine.**</include> - <include>**/AbstractLabel.**</include> - <include>**/IconLabel.**</include> - <include> **/EditableIconLabel.**</include> - <include> **/EditableClickListener.**</include> - <include>**/KuneStringUtils.**</include> - <include>**/IconHyperlink*.**</include> - <include>**/LabelWrapper*.**</include> - <include>**/KuneUiUtils.**</include> - <include>**/View.**</include> -  - </includes> - </configuration> - </execution> - <execution> - <id>helloworldmodule</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <classifier>helloworldmodule</classifier> - <includes> - <include>**/HelloWorld*</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>pertest</forkMode> -  - <skip>true</skip> - </configuration> - <executions> - <execution> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - </configuration> - </execution> - </executions> - </plugin> -  - </plugins> -  - <outputDirectory>war/WEB-INF/classes</outputDirectory> - <testOutputDirectory>war/WEB-INF/test-classes</testOutputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>src/main/java</directory> - </resource> - </resources> - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>1.0-beta-2</version> - </extension> - </extensions> - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>2.4</version> - <configuration> - <linkXref>true</linkXref> - <sourceEncoding>utf-8</sourceEncoding> - <minimumTokens>100</minimumTokens> - <targetJdk>1.5</targetJdk> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jdepend-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - </plugin> - </plugins> - </reporting> - <profiles> - <profile> -  - <id>m2eclipse</id> - <activation> - <property> - <name>!m2e.version</name> - </property> - </activation> -  - <dependencies> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-servlet</artifactId> - <version>${gwtVersion}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - <version>${gwtVersion}</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - </profiles> + </repository> + <repository> + <id>kune-maven</id> + <url>http://kune.ourproject.org/mavenrepo/</url> + </repository> + <repository> + <id>google-maven-snapshot-repository</id> + <name>Google Maven Snapshot Repository</name> + <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>openqa.org</id> + <name>Openqa Release Repository</name> + <url>http://archiva.openqa.org/repository/releases</url> + <layout>default</layout> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>openqa.org snapshots</id> + <name>Openqa Snapshot Repository</name> + <url>http://archiva.openqa.org/repository/snapshots</url> + <layout>default</layout> + <snapshots> + <enabled>true</enabled> + <updatePolicy>daily</updatePolicy> + <checksumPolicy>ignore</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + <repository> + <id>xwiki-releases</id> + <name>XWiki Maven2 Remote Repository for Releases</name> + <url>http://maven.xwiki.org/releases</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>xwiki</id> + <name>XWiki Repository</name> + <url>http://maven.xwiki.org/snapshots</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>daily</updatePolicy> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + </repository> + </repositories> + <issueManagement> + <system>kune issues list at ourproject.org</system> + <url>http://kune.ourproject.org/issues/</url> + </issueManagement> + <developers> + <developer> + <id>dani</id> + <name>Daniel Gómez Blasco</name> + <email>danigb(a)gmail.com</email> + </developer> + <developer> + <name>Samer Hassan</name> + <email>samer2004(a)gmail.com</email> + </developer> + <developer> + <name>Vicente J. Ruiz Jurado</name> + <email>vjrj(a)ourproject.org</email> + </developer> + </developers> + <scm> + <url>svn://scm.ourproject.org/svnroot/kune/trunk</url> + </scm> + <build> + <plugins> + <plugin> + <groupId>org.bsc.maven</groupId> + <artifactId>maven-processor-plugin</artifactId> + <version>1.3.7</version> + <executions> + <execution> + <id>process</id> + <goals> + <goal>process</goal> + </goals> + <phase>generate-sources</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3</version> + <configuration> + <forkMode>pertest</forkMode> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> +  + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <version>2.1.0-1</version> + <executions> + <execution> + <configuration> +  + <soyc>false</soyc> + <style>OBF</style> + <inline>true</inline> + </configuration> + <goals> +  + <goal>compile</goal> +  + <goal>resources</goal> + </goals> + </execution> + </executions> + <configuration> + <runTarget>org.ourproject.kune.app.Kune/ws.html?log_level=DEBUG</runTarget> + <gwt.module>org.ourproject.kune.app.Kune</gwt.module> + </configuration> + </plugin> + <plugin> + <artifactId>maven-eclipse-plugin</artifactId> + <version>2.7</version> + <configuration> + <downloadSources>true</downloadSources> + <downloadJavadocs>false</downloadJavadocs> + <wtpversion>2.0</wtpversion> + </configuration> + </plugin> +  + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>7.2.1.v20101111</version> +  + <configuration> +  +  +  + <webAppSourceDirectory>war</webAppSourceDirectory> + <reload>manual</reload> + <scanIntervalSeconds>0</scanIntervalSeconds> + </configuration> + </plugin> +  + <plugin> + <groupId>org.liquibase</groupId> + <artifactId>liquibase-plugin</artifactId> + <version>1.7.0.0</version> + <executions> + <execution> + <phase>process-resources</phase> + <configuration> + <changeLogFile> + src/main/resources/db/liquibase_changelog.xml </changeLogFile> + <driver>com.mysql.jdbc.Driver</driver> + <url>jdbc:mysql://localhost/kune_dev</url> + <username>kune</username> + <password>db4kune</password> + <verbose>true</verbose> + </configuration> +  + <goals> + <goal>update</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> + <executions> + <execution> + <id>core</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>core</classifier> + <includes> + <include>**/KunePlatform.gwt.xml**</include> + <include>**/i18n/I18nTranslationService.**</include> + <include>**/i18n/I18nTranslationServiceMocked.** </include> + <include>**/TextUtils.**</include> + <include>**/IconLabelEditable.**</include> + <include>**/QuickTipsHelper.**</include> + <include>**/RichText.gwt.xml**</include> + <include>**/BasicDialog.**</include> + <include>**/HorizontalLine.**</include> + <include>**/AbstractLabel.**</include> + <include>**/IconLabel.**</include> + <include> **/EditableIconLabel.**</include> + <include> **/EditableClickListener.**</include> + <include>**/KuneStringUtils.**</include> + <include>**/IconHyperlink*.**</include> + <include>**/LabelWrapper*.**</include> + <include>**/KuneUiUtils.**</include> + <include>**/View.**</include> +  + </includes> + </configuration> + </execution> + <execution> + <id>helloworldmodule</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>helloworldmodule</classifier> + <includes> + <include>**/HelloWorld*</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>pertest</forkMode> +  + <skip>true</skip> + </configuration> + <executions> + <execution> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + </configuration> + </execution> + </executions> + </plugin> +  + </plugins> +  + <outputDirectory>war/WEB-INF/classes</outputDirectory> + <testOutputDirectory>war/WEB-INF/test-classes</testOutputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory>src/main/java</directory> + </resource> + </resources> + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>1.0-beta-2</version> + </extension> + </extensions> + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <version>2.4</version> + <configuration> + <linkXref>true</linkXref> + <sourceEncoding>utf-8</sourceEncoding> + <minimumTokens>100</minimumTokens> + <targetJdk>1.5</targetJdk> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jdepend-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + </plugin> + </plugins> + </reporting> + <profiles> + <profile> +  + <id>m2eclipse</id> + <activation> + <property> + <name>!m2e.version</name> + </property> + </activation> +  + <dependencies> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <version>${gwtVersion}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwtVersion}</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + </profiles> </project> Modified: trunk/src/main/java/cc/kune/core/Core.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/core/Core.gwt.xml 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/Core.gwt.xml 2010-12-18 17:00:55 UTC (rev 1169) @@ -1,32 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> <module rename-to="ws"> -  -  - <source path='client' - excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> - <source path="shared" /> - <public path="public" /> -  - <inherits name="com.google.gwt.user.User" /> -  - <inherits name="cc.kune.core.ws.armor.WsArmor" /> - <inherits name="org.ourproject.common.Common" /> - <inherits name="com.extjs.gxt.ui.GXT" /> - <inherits name="com.calclab.suco.Suco" /> - <inherits name='com.gwtplatform.mvp.Mvp' /> - <define-configuration-property name="gin.ginjector" - is-multi-valued="false" /> - <set-configuration-property name="gin.ginjector" - value="cc.kune.core.client.CoreGinjector" /> -  - <stylesheet src="ws.css" /> - <stylesheet src="fontface/stylesheet.css" /> -  -  -  -  -  - <set-property name="user.agent" value="safari" /> +  +  + <source path='client' + excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> + <source path="shared" /> + <public path="public" /> +  + <inherits name="com.google.gwt.user.User" /> +  + <inherits name="cc.kune.core.ws.armor.WsArmor" /> + <inherits name="org.ourproject.common.Common" /> + <inherits name="com.extjs.gxt.ui.GXT" /> + <inherits name="com.calclab.suco.Suco" /> +  + <inherits name='com.gwtplatform.mvp.Mvp' /> + <define-configuration-property name="gin.ginjector" + is-multi-valued="false" /> + <set-configuration-property name="gin.ginjector" + value="cc.kune.core.client.CoreGinjector" /> +  + <stylesheet src="ws.css" /> + <stylesheet src="fontface/stylesheet.css" /> +  + <entry-point class="cc.kune.core.client.KuneEntryPoint" /> +  +  +  + <set-property name="user.agent" value="safari" /> </module> \ No newline at end of file Deleted: trunk/src/main/java/cc/kune/core/client/CoreEventBus.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreEventBus.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/CoreEventBus.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -1,49 +0,0 @@ -package cc.kune.core.client; - -public interface CoreEventBus { -} -// /** -// * The Kune Core EventBus. -// */ -// @Events(startView = CoreView.class, ginModules = { CoreGinModule.class, -// CommonGinModule.class }) -// @Debug(logLevel = LogLevel.DETAILED) -// public interface CoreEventBus extends EventBus { -// -// @Event(handlers = UserNotifierPresenter.class) -// public void alert(String title, String message); -// -// @Event(handlers = UserNotifierPresenter.class) -// public void confirmationAsk(ConfirmationAsk<?> confirmation); -// -// @Event(handlers = CookiesManager.class) -// public void doNothing(); -// -// @Event -// // FIXME (nobody do nothing with this) -// public void gotoToken(String token); -// -// @Event(handlers = UserNotifierPresenter.class) -// public void hideSpin(); -// -// @Event -// // FIXME (nobody do nothing with this) -// public void i18nReady(); -// -// @Event(handlers = UserNotifierPresenter.class) -// public void notify(NotifyLevel level, String message); -// -// @Event(handlers = UserNotifierPresenter.class) -// public void showSpin(String message); -// -// @Event -// // FIXME (nobody do nothing with this) -// public void showSpinLoading(); -// -// /** -// * Application start event -// */ -// @Start -// @Event(handlers = { CorePresenter.class }) -// void start(); - Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -61,7 +61,7 @@ bind(Session.class).to(SessionDefault.class).in(Singleton.class); bind(I18nTranslationService.class).to(I18nUITranslationService.class).in(Singleton.class); bind(ErrorHandler.class).in(Singleton.class); - bind(ContentProvider.class).to(ContentProviderDefault.class).in(Singleton.class); + // bind(ContentProvider.class).to(ContentProviderDefault.class).in(Singleton.class); bind(HistoryWrapper.class).to(HistoryWrapperDefault.class).in(Singleton.class); // bind(StateManager.class).to(StateManagerDefault.class).in(Singleton.class); } Modified: trunk/src/main/java/cc/kune/core/client/CoreGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinjector.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/CoreGinjector.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -14,16 +14,16 @@ @GinModules({ CoreGinModule.class }) public interface CoreGinjector extends Ginjector { - AsyncProvider<CorePresenter> getCorePresenter(); + AsyncProvider<CorePresenter> getCorePresenter(); - EventBus getEventBus(); + EventBus getEventBus(); - PlaceManager getPlaceManager(); + PlaceManager getPlaceManager(); - ProxyFailureHandler getProxyFailureHandler(); + ProxyFailureHandler getProxyFailureHandler(); - AsyncProvider<SpinerPresenter> getSpinerPresenter(); + AsyncProvider<SpinerPresenter> getSpinerPresenter(); - AsyncProvider<UserNotifierPresenter> getUserNotifierPresenter(); + AsyncProvider<UserNotifierPresenter> getUserNotifierPresenter(); } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -39,7 +39,6 @@ */ public void onModuleLoadCont() { DelayedBindRegistry.bind(ginjector); - ginjector.getPlaceManager().revealCurrentPlace(); } Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -21,8 +21,9 @@ import org.ourproject.common.client.notify.NotifyLevel; +import cc.kune.core.client.notify.AlertEvent; import cc.kune.core.client.notify.SpinerPresenter; -import cc.kune.core.client.notify.UserNotifierPresenter; +import cc.kune.core.client.notify.UserNotifyEvent; import cc.kune.core.client.state.Session; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -32,30 +33,31 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException; import com.google.inject.Inject; +import com.gwtplatform.mvp.client.EventBus; import com.gwtplatform.mvp.client.proxy.PlaceManager; public class ErrorHandler { private final Session session; private final I18nTranslationService i18n; private final Event0 onSessionExpired; - private final UserNotifierPresenter notifier; private final SpinerPresenter spiner; private final PlaceManager placeManager; + private final EventBus eventBus; @Inject - public ErrorHandler(final Session session, final I18nTranslationService i18n, final UserNotifierPresenter notifier, - final SpinerPresenter spiner, final PlaceManager placeManager) { + public ErrorHandler(final Session session, final I18nTranslationService i18n, + final SpinerPresenter spiner, final PlaceManager placeManager, EventBus eventBus) { this.session = session; this.i18n = i18n; - this.notifier = notifier; this.spiner = spiner; this.placeManager = placeManager; + this.eventBus = eventBus; this.onSessionExpired = new Event0("onSessionExpired"); } public void doSessionExpired() { onSessionExpired.fire(); - notifier.notify(NotifyLevel.info, "Your session has expired. Please log in again."); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.info, "Your session has expired. Please log in again.")); } public void onSessionExpired(final Listener0 listener) { @@ -66,7 +68,7 @@ spiner.fade(); if (caught instanceof AccessViolationException) { logException(caught); - notifier.notify(NotifyLevel.error, i18n.t("You do not have rights to perform that action")); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("You do not have rights to perform that action"))); } else if (caught instanceof SessionExpiredException) { logException(caught); doSessionExpired(); @@ -75,40 +77,40 @@ if (session.isLogged()) { doSessionExpired(); } else { - notifier.notify(NotifyLevel.important, i18n.t("Please sign in or register to collaborate")); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.important, i18n.t("Please sign in or register to collaborate"))); } } else if (caught instanceof GroupNotFoundException) { logException(caught); - notifier.notify(NotifyLevel.veryImportant, i18n.t("Group not found")); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.veryImportant, i18n.t("Group not found"))); goHome(); } else if (caught instanceof IncompatibleRemoteServiceException) { - notifier.notify(NotifyLevel.error, - i18n.t("Your browser is outdated with the server software. Please reload this page.")); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, + i18n.t("Your browser is outdated with the server software. Please reload this page."))); } else if (caught instanceof ContentNotFoundException) { logException(caught); - notifier.notify(NotifyLevel.veryImportant, i18n.t("Content not found")); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.veryImportant, i18n.t("Content not found"))); goHome(); } else if (caught instanceof ContentNotPermittedException) { logException(caught); - notifier.notify(NotifyLevel.error, i18n.t("Action not permitted in this location")); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("Action not permitted in this location"))); goHome(); } else if (caught instanceof ContainerNotPermittedException) { logException(caught); - notifier.notify(NotifyLevel.error, i18n.t("Action not permitted in this location")); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("Action not permitted in this location"))); goHome(); } else if (caught instanceof LastAdminInGroupException) { logException(caught); - notifier.alert(i18n.t("Warning"), i18n.t("Sorry, you are the last admin of this group." - + " Look for someone to substitute you appropriately as admin before leaving this group.")); + eventBus.fireEvent(new AlertEvent(i18n.t("Warning"), i18n.t("Sorry, you are the last admin of this group." + + " Look for someone to substitute you appropriately as admin before leaving this group."))); } else if (caught instanceof AlreadyGroupMemberException) { logException(caught); - notifier.notify(NotifyLevel.error, i18n.t("This group is already a group member")); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("This group is already a group member"))); } else if (caught instanceof AlreadyUserMemberException) { logException(caught); - notifier.notify(NotifyLevel.error, i18n.t("This user is already a group member")); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("This user is already a group member"))); } else { logException(caught, true); - notifier.notify(NotifyLevel.error, i18n.t("Error performing operation")); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("Error performing operation"))); GWT.log("Other kind of exception in StateManagerDefault/processErrorException", caught); } } Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -35,6 +35,7 @@ import com.google.gwt.i18n.client.DateTimeFormat; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Inject; +import com.gwtplatform.mvp.client.EventBus; public class I18nUITranslationService extends I18nTranslationService { private HashMap<String, String> lexicon; @@ -44,25 +45,29 @@ private final Session session; @Inject - public I18nUITranslationService(final Session session, final I18nServiceAsync i18nService) { + public I18nUITranslationService(final Session session, final I18nServiceAsync i18nService, final EventBus eventBus) { this.session = session; this.i18nService = i18nService; final Location loc = WindowUtils.getLocation(); final String locale = loc.getParameter("locale"); i18nService.getInitialLanguage(locale, new AsyncCallback<I18nLanguageDTO>() { + @Override public void onFailure(final Throwable caught) { Log.error("Workspace adaptation to your language failed: " + caught.getMessage()); } + @Override public void onSuccess(final I18nLanguageDTO result) { currentLang = result; currentLanguageCode = currentLang.getCode(); session.setCurrentLanguage(currentLang); i18nService.getLexicon(currentLang.getCode(), new AsyncCallback<HashMap<String, String>>() { + @Override public void onFailure(final Throwable caught) { Log.error("Workspace adaptation to your language failed:" + caught.getMessage()); } + @Override public void onSuccess(final HashMap<String, String> result) { lexicon = result; session.setCurrentLanguage(currentLang); @@ -152,9 +157,11 @@ if (session.isLogged()) { i18nService.getTranslation(session.getUserHash(), currentLanguageCode, text, new AsyncCallback<String>() { + @Override public void onFailure(final Throwable caught) { } + @Override public void onSuccess(final String result) { } }); Added: trunk/src/main/java/cc/kune/core/client/notify/Alert.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/Alert.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/notify/Alert.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -0,0 +1,12 @@ +package cc.kune.core.client.notify; + +import com.gwtplatform.annotation.GenEvent; +import com.gwtplatform.annotation.Order; + +@GenEvent +public class Alert { + @Order(1) + String title; + @Order(2) + String message; +} Property changes on: trunk/src/main/java/cc/kune/core/client/notify/Alert.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/notify/SpinerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/SpinerPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/notify/SpinerPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -4,12 +4,15 @@ import com.gwtplatform.mvp.client.EventBus; import com.gwtplatform.mvp.client.Presenter; import com.gwtplatform.mvp.client.View; -import com.gwtplatform.mvp.client.proxy.ProxyPlace; +import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; +import com.gwtplatform.mvp.client.annotations.ProxyStandard; +import com.gwtplatform.mvp.client.proxy.Proxy; import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent; public class SpinerPresenter extends Presenter<SpinerPresenter.SpinerView, SpinerPresenter.SpinerProxy> { - - public interface SpinerProxy extends ProxyPlace<SpinerPresenter> { + + @ProxyCodeSplit + public interface SpinerProxy extends Proxy<SpinerPresenter> { } public interface SpinerView extends View { Modified: trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -3,47 +3,67 @@ import org.ourproject.common.client.notify.ConfirmationAsk; import org.ourproject.common.client.notify.NotifyLevel; +import cc.kune.core.client.notify.AlertEvent.AlertHandler; import cc.kune.core.client.notify.UserNotifierPresenter.UserNotifierProxy; import cc.kune.core.client.notify.UserNotifierPresenter.UserNotifierView; +import cc.kune.core.client.notify.UserNotifyEvent.UserNotifyHandler; import com.google.inject.Inject; import com.gwtplatform.mvp.client.EventBus; import com.gwtplatform.mvp.client.Presenter; import com.gwtplatform.mvp.client.View; -import com.gwtplatform.mvp.client.proxy.ProxyPlace; +import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; +import com.gwtplatform.mvp.client.annotations.ProxyEvent; +import com.gwtplatform.mvp.client.annotations.ProxyStandard; +import com.gwtplatform.mvp.client.proxy.Proxy; -public class UserNotifierPresenter extends Presenter<UserNotifierView, UserNotifierProxy> { +public class UserNotifierPresenter extends + Presenter<UserNotifierView, UserNotifierProxy> { + @ProxyCodeSplit + public interface UserNotifierProxy extends + Proxy<UserNotifierPresenter> { + } - public interface UserNotifierProxy extends ProxyPlace<UserNotifierPresenter> { - } + public interface UserNotifierView extends View { + public void alert(String title, String message); - public interface UserNotifierView extends View { - public void alert(String title, String message); + public void confirmationAsk(ConfirmationAsk<?> ask); - public void confirmationAsk(ConfirmationAsk<?> ask); + public void notify(NotifyLevel level, String message); + } - public void notify(NotifyLevel level, String message); - } + @Inject + public UserNotifierPresenter(final EventBus eventBus, + final UserNotifierView view, final UserNotifierProxy proxy) { + super(eventBus, view, proxy); + addRegisteredHandler(UserNotifyEvent.getType(), + new UserNotifyHandler() { + @Override + public void onUserNotify(UserNotifyEvent event) { + view.notify(event.getLevel(), event.getMessage()); + } + }); + addRegisteredHandler(AlertEvent.getType(), new AlertHandler() { + @Override + public void onAlert(AlertEvent event) { + view.alert(event.getTitle(), event.getMessage()); + } + }); + } - @Inject - public UserNotifierPresenter(final EventBus eventBus, final UserNotifierView view, final UserNotifierProxy proxy) { - super(eventBus, view, proxy); - } + @ProxyEvent + public void onUserNotify(UserNotifyEvent event) { + // FIXME test this + getView().notify(event.getLevel(), event.getMessage()); + } - public void notify(final NotifyLevel level, final String message) { - getView().notify(level, message); - } + @ProxyEvent + public void onAlert(AlertEvent event) { + getView().alert(event.getTitle(), event.getMessage()); + }; - public void alert(final String title, final String message) { - getView().alert(title, message); - }; + @Override + protected void revealInParent() { + } - public void onConfirmationAsk(final ConfirmationAsk<?> ask) { - getView().confirmationAsk(ask); - } - - @Override - protected void revealInParent() { - } - } \ No newline at end of file Added: trunk/src/main/java/cc/kune/core/client/notify/UserNotify.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/UserNotify.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/notify/UserNotify.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -0,0 +1,14 @@ +package cc.kune.core.client.notify; + +import org.ourproject.common.client.notify.NotifyLevel; + +import com.gwtplatform.annotation.GenEvent; +import com.gwtplatform.annotation.Order; + +@GenEvent +public class UserNotify { + @Order(1) + NotifyLevel level; + @Order(2) + String message; +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/notify/UserNotify.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -25,13 +25,13 @@ import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.RateResult; import cc.kune.core.shared.domain.TagCloudResult; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.CommentDTO; import cc.kune.core.shared.dto.ContentSimpleDTO; import cc.kune.core.shared.dto.I18nLanguageDTO; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.dto.StateToken; import com.google.gwt.user.client.rpc.RemoteService; import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -24,13 +24,13 @@ import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.RateResult; import cc.kune.core.shared.domain.TagCloudResult; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.CommentDTO; import cc.kune.core.shared.dto.ContentSimpleDTO; import cc.kune.core.shared.dto.I18nLanguageDTO; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.dto.StateToken; import com.google.gwt.user.client.rpc.AsyncCallback; Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/GroupService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/GroupService.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/GroupService.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -22,9 +22,9 @@ import cc.kune.core.client.errors.DefaultException; import cc.kune.core.shared.domain.AdmissionType; import cc.kune.core.shared.domain.SocialNetworkVisibility; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.core.shared.dto.StateToken; import com.google.gwt.user.client.rpc.RemoteService; import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/GroupServiceAsync.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/GroupServiceAsync.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/GroupServiceAsync.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -21,9 +21,9 @@ import cc.kune.core.shared.domain.AdmissionType; import cc.kune.core.shared.domain.SocialNetworkVisibility; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.core.shared.dto.StateToken; import com.google.gwt.user.client.rpc.AsyncCallback; Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkService.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkService.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -20,9 +20,9 @@ package cc.kune.core.client.rpcservices; import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.SocialNetworkDataDTO; import cc.kune.core.shared.dto.SocialNetworkRequestResult; -import cc.kune.core.shared.dto.StateToken; import com.google.gwt.user.client.rpc.RemoteService; import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkServiceAsync.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkServiceAsync.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkServiceAsync.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -20,9 +20,9 @@ package cc.kune.core.client.rpcservices; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.SocialNetworkDataDTO; import cc.kune.core.shared.dto.SocialNetworkRequestResult; -import cc.kune.core.shared.dto.StateToken; import com.google.gwt.user.client.rpc.AsyncCallback; Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -21,7 +21,7 @@ import cc.kune.core.client.errors.DefaultException; import cc.kune.core.shared.domain.UserBuddiesVisibility; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.UserDTO; import cc.kune.core.shared.dto.UserInfoDTO; Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -20,7 +20,7 @@ package cc.kune.core.client.rpcservices; import cc.kune.core.shared.domain.UserBuddiesVisibility; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.UserDTO; import cc.kune.core.shared.dto.UserInfoDTO; Modified: trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -1,7 +1,7 @@ package cc.kune.core.client.state; -import cc.kune.core.shared.dto.AccessRightsDTO; +import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.core.shared.dto.StateAbstractDTO; import com.calclab.suco.client.events.Event2; @@ -9,15 +9,15 @@ import com.calclab.suco.client.events.Listener2; public class AccessRightsClientManager { - private AccessRightsDTO previousRights; - private final Event2<AccessRightsDTO, AccessRightsDTO> onRightsChanged; + private AccessRights previousRights; + private final Event2<AccessRights, AccessRights> onRightsChanged; public AccessRightsClientManager(final StateManager stateManager) { this.previousRights = null; - this.onRightsChanged = new Event2<AccessRightsDTO, AccessRightsDTO>("onRightsChanged"); + this.onRightsChanged = new Event2<AccessRights , AccessRights >("onRightsChanged"); stateManager.onStateChanged(new Listener<StateAbstractDTO>() { public void onEvent(final StateAbstractDTO newState) { - final AccessRightsDTO rights = newState.getGroupRights(); + final AccessRights rights = newState.getGroupRights(); if (!rights.equals(previousRights)) { onRightsChanged.fire(previousRights, rights); previousRights = rights; @@ -26,7 +26,7 @@ }); } - public void onRightsChanged(final Listener2<AccessRightsDTO, AccessRightsDTO> listener) { + public void onRightsChanged(final Listener2<AccessRights, AccessRights> listener) { onRightsChanged.add(listener); } } Modified: trunk/src/main/java/cc/kune/core/client/state/ContentProvider.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/ContentProvider.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/state/ContentProvider.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -20,8 +20,8 @@ package cc.kune.core.client.state; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.dto.StateToken; import com.google.gwt.user.client.rpc.AsyncCallback; Modified: trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -23,8 +23,8 @@ import cc.kune.core.client.notify.SpinerPresenter; import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.dto.StateToken; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Inject; Modified: trunk/src/main/java/cc/kune/core/client/state/Session.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/Session.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/state/Session.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -43,6 +43,7 @@ import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.I18nCountryDTO; import cc.kune.core.shared.dto.I18nLanguageDTO; import cc.kune.core.shared.dto.I18nLanguageSimpleDTO; @@ -51,7 +52,6 @@ import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.dto.ToolSimpleDTO; import cc.kune.core.shared.dto.UserInfoDTO; import cc.kune.core.shared.dto.UserSimpleDTO; Modified: trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -26,6 +26,7 @@ import cc.kune.core.client.i18n.I18nReadyEvent; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.UserServiceAsync; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.I18nCountryDTO; import cc.kune.core.shared.dto.I18nLanguageDTO; import cc.kune.core.shared.dto.I18nLanguageSimpleDTO; @@ -34,7 +35,6 @@ import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.dto.ToolSimpleDTO; import cc.kune.core.shared.dto.UserInfoDTO; import cc.kune.core.shared.dto.UserSimpleDTO; @@ -62,12 +62,12 @@ private final Event<UserInfoDTO> onUserSignIn; private final Event0 onUserSignOut; private final Provider<UserServiceAsync> userServiceProvider; + private final EventBus eventBus; @Inject - private static EventBus eventBus; - - @Inject - public SessionDefault(final CookiesManager cookieManager, final Provider<UserServiceAsync> userServiceProvider) { + public SessionDefault(final CookiesManager cookieManager, final Provider<UserServiceAsync> userServiceProvider, + EventBus eventBus) { + this.eventBus = eventBus; this.userHash = cookieManager.getCurrentCookie(); this.userHash = userHash == null || userHash.equals("null") ? null : userHash; this.userServiceProvider = userServiceProvider; @@ -77,23 +77,28 @@ this.onUserSignOut = new Event0("onUserSignOut"); } + @Override public void check(final AsyncCallbackSimple<Void> callback) { Log.debug("Checking session (userhash: " + getUserHash() + ")"); userServiceProvider.get().onlyCheckSession(getUserHash(), callback); } + @Override public StateContainerDTO getContainerState() { return (StateContainerDTO) currentState; } + @Override public StateContentDTO getContentState() { return (StateContentDTO) currentState; } + @Override public List<I18nCountryDTO> getCountries() { return initData.getCountries(); } + @Override public Object[][] getCountriesArray() { if (countriesArray == null) { countriesArray = mapCountries(); @@ -101,70 +106,87 @@ return countriesArray; } + @Override public String getCurrentCCversion() { return initData.getCurrentCCversion(); } + @Override public String getCurrentGroupShortName() { return currentState == null ? null : currentState.getStateToken().getGroup(); } + @Override public I18nLanguageDTO getCurrentLanguage() { return currentLanguage; } + @Override public StateAbstractDTO getCurrentState() { return currentState; } + @Override public StateToken getCurrentStateToken() { return currentState == null ? null : currentState.getStateToken(); } + @Override public UserSimpleDTO getCurrentUser() { return currentUserInfo == null ? null : currentUserInfo.getUser(); } + @Override public UserInfoDTO getCurrentUserInfo() { return currentUserInfo; } + @Override public LicenseDTO getDefLicense() { return initData.getDefaultLicense(); } + @Override public String getGalleryPermittedExtensions() { return initData.getGalleryPermittedExtensions(); } + @Override public Collection<ToolSimpleDTO> getGroupTools() { return initData.getGroupTools(); } + @Override public int getImgCropsize() { return initData.getImgCropsize(); } + @Override public int getImgIconsize() { return initData.getImgIconsize(); } + @Override public int getImgResizewidth() { return initData.getImgResizewidth(); } + @Override public int getImgThumbsize() { return initData.getImgThumbsize(); } + @Override public InitDataDTO getInitData() { return initData; } + @Override public List<I18nLanguageSimpleDTO> getLanguages() { return initData.getLanguages(); } + @Override public Object[][] getLanguagesArray() { if (languagesArray == null) { languagesArray = mapLangs(); @@ -172,19 +194,23 @@ return languagesArray; } + @Override public List<LicenseDTO> getLicenses() { return initData.getLicenses(); } + @Override public boolean getShowDeletedContent() { return currentUserInfo == null ? false : currentUserInfo.getShowDeletedContent(); } + @Override public String getSiteUrl() { final String baseURL = GWT.getModuleBaseURL(); return baseURL.substring(0, baseURL.lastIndexOf("/" + GWT.getModuleName())); } + @Override public Object[][] getTimezones() { if (timezonesArray == null) { mapTimezones(); @@ -192,26 +218,32 @@ return timezonesArray; } + @Override public String getUserHash() { return userHash; } + @Override public Collection<ToolSimpleDTO> getUserTools() { return initData.getUserTools(); } + @Override public boolean inSameToken(final StateToken token) { return getCurrentStateToken().equals(token); } + @Override public boolean isCurrentStateAContent() { return currentState instanceof StateContentDTO; } + @Override public boolean isCurrentStateAGroup() { return currentState == null ? false : !currentState.getGroup().isPersonal(); } + @Override public boolean isInCurrentUserSpace() { if (!isLogged()) { return false; @@ -222,35 +254,43 @@ return false; } + @Override public boolean isLogged() { return userHash != null; } + @Override public boolean isNotLogged() { return !isLogged(); } + @Override public void onInitDataReceived(final Listener<InitDataDTO> listener) { onInitDataReceived.add(listener); } + @Override public void onUserSignIn(final Listener<UserInfoDTO> listener) { onUserSignIn.add(listener); } + @Override public void onUserSignOut(final Listener0 listener) { onUserSignOut.add(listener); } + @Override public void setCurrentLanguage(final I18nLanguageDTO currentLanguage) { this.currentLanguage = currentLanguage; eventBus.fireEvent(new I18nReadyEvent()); } + @Override public void setCurrentState(final StateAbstractDTO currentState) { this.currentState = currentState; } + @Override public void setCurrentUserInfo(final UserInfoDTO currentUserInfo) { this.currentUserInfo = currentUserInfo; if (currentUserInfo != null) { @@ -260,17 +300,19 @@ } } + @Override public void setInitData(final InitDataDTO initData) { this.initData = initData; onInitDataReceived.fire(initData); } + @Override public void setUserHash(final String userHash) { this.userHash = userHash; } private Object[][] mapCountries() { - assert (initData != null); + assert initData != null; final Object[][] objs = new Object[initData.getCountries().size()][1]; int i = 0; for (final I18nCountryDTO country : initData.getCountries()) { @@ -281,7 +323,7 @@ } private Object[][] mapLangs() { - assert (initData != null); + assert initData != null; final Object[][] objs = new Object[initData.getLanguages().size()][1]; int i = 0; for (final I18nLanguageSimpleDTO language : initData.getLanguages()) { @@ -292,7 +334,7 @@ } private void mapTimezones() { - assert (initData != null); + assert initData != null; timezonesArray = new Object[initData.getTimezones().length][1]; for (int i = 0; i < getTimezones().length; i++) { final Object[] obj = new Object[] { initData.getTimezones()[i] }; Modified: trunk/src/main/java/cc/kune/core/client/state/StateManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -21,9 +21,9 @@ import cc.kune.core.client.actions.BeforeActionListener; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.SocialNetworkDataDTO; import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.dto.StateToken; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -25,9 +25,9 @@ import cc.kune.core.client.actions.BeforeActionListener; import cc.kune.core.client.notify.SpinerPresenter; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.SocialNetworkDataDTO; import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.dto.UserInfoDTO; import com.allen_sauer.gwt.log.client.Log; Modified: trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -1,5 +1,7 @@ package cc.kune.core.client.ws; +import cc.kune.core.client.notify.AlertEvent; +import cc.kune.core.client.notify.UserNotifierPresenter; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; @@ -15,7 +17,7 @@ * The Class CorePresenter. */ public class CorePresenter extends Presenter<CorePresenter.CoreView, CorePresenter.CoreProxy> { - @ProxyCodeSplit + @ProxyCodeSplit @NameToken("home") public interface CoreProxy extends ProxyPlace<CorePresenter> { } @@ -25,13 +27,13 @@ @Inject public CorePresenter(final EventBus eventBus, final CoreView view, final CoreProxy proxy, - final I18nTranslationService i18n) { + final I18nTranslationService i18n, UserNotifierPresenter userNotifier) { super(eventBus, view, proxy); } @Override protected void revealInParent() { - RevealRootLayoutContentEvent.fire(eventBus, this); + RevealRootLayoutContentEvent.fire(getEventBus(), this); } } Copied: trunk/src/main/java/cc/kune/core/shared/domain/AccessRol.java (from rev 1166, trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRol.java) =================================================================== --- trunk/src/main/java/cc/kune/core/shared/domain/AccessRol.java (rev 0) +++ trunk/src/main/java/cc/kune/core/shared/domain/AccessRol.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -0,0 +1,24 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.core.shared.domain; + +public enum AccessRol { + Administrator, Editor, Viewer +} Modified: trunk/src/main/java/cc/kune/core/shared/domain/GroupListMode.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/domain/GroupListMode.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/shared/domain/GroupListMode.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -19,24 +19,8 @@ */ package cc.kune.core.shared.domain; -import java.util.List; - - -import cc.kune.domain.Group; - import com.google.gwt.user.client.rpc.IsSerializable; public enum GroupListMode implements IsSerializable { NORMAL, NOBODY, EVERYONE; - - public boolean checkIfIncludes(final Group group, final List<Group> list) { - switch (this) { - case NOBODY: - return false; - case EVERYONE: - return true; - default: - return list.contains(group); - } - } } Copied: trunk/src/main/java/cc/kune/core/shared/domain/utils/AccessRights.java (from rev 1166, trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRights.java) =================================================================== --- trunk/src/main/java/cc/kune/core/shared/domain/utils/AccessRights.java (rev 0) +++ trunk/src/main/java/cc/kune/core/shared/domain/utils/AccessRights.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -0,0 +1,101 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.core.shared.domain.utils; + +public class AccessRights { + boolean administrable; + boolean editable; + boolean visible; + + public AccessRights() { + this(false, false, false); + } + + public AccessRights(final boolean administrable, final boolean editable, + final boolean visible) { + this.administrable = administrable; + this.editable = editable; + this.visible = visible; + } + + public boolean isAdministrable() { + return administrable; + } + + public boolean isEditable() { + return editable; + } + + public boolean isVisible() { + return visible; + } + + public void setAdministrable(final boolean isAdministrable) { + this.administrable = isAdministrable; + } + + public void setEditable(final boolean isEditable) { + this.editable = isEditable; + } + + public void setVisible(final boolean isVisible) { + this.visible = isVisible; + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final AccessRights other = (AccessRights) obj; + if (administrable != other.administrable) { + return false; + } + if (editable != other.editable) { + return false; + } + if (visible != other.visible) { + return false; + } + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + (administrable ? 1231 : 1237); + result = prime * result + (editable ? 1231 : 1237); + result = prime * result + (visible ? 1231 : 1237); + return result; + } + + @Override + public String toString() { + return "AccessRights[a: " + administrable + ", e: " + editable + + ", v: " + visible + "]"; + } +} Copied: trunk/src/main/java/cc/kune/core/shared/domain/utils/StateToken.java (from rev 1166, trunk/src/main/java/cc/kune/core/shared/dto/StateToken.java) =================================================================== --- trunk/src/main/java/cc/kune/core/shared/domain/utils/StateToken.java (rev 0) +++ trunk/src/main/java/cc/kune/core/shared/domain/utils/StateToken.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -0,0 +1,256 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.core.shared.domain.utils; + +import com.google.gwt.user.client.rpc.IsSerializable; + +/** + * <pre> + * http://code.google.com/p/google-web-toolkit-doc-1-5/wiki/DevGuideHistory + * http://en.wikipedia.org/wiki/Fragment_identifier + * http://www.w3.org/DesignIssues/Fragment.html + * </pre> + * + * <pre> + * When an agent (such as a Web browser) requests a resource from a Web server, the agent sends the URI to the server, but does not send the fragment. + * </pre> + * + */ +public class StateToken implements IsSerializable { + public static final String SEPARATOR = "."; + private static final String[] EMPTYA = new String[0]; + + private static String encode(final String group, final String tool, final String folder, final String document) { + String encoded = ""; + if (group != null) { + encoded += group; + } + if (tool != null) { + encoded += SEPARATOR + tool; + } + if (folder != null) { + encoded += SEPARATOR + folder; + } + if (document != null) { + encoded += SEPARATOR + document; + } + return encoded; + } + + private String group; + private String tool; + private String folder; + private String document; + + private String encoded; + + public StateToken() { + this(null, null, null, null); + } + + public StateToken(final String encoded) { + parse(encoded); + } + + public StateToken(final String group, final String tool) { // NO_UCD + this(group, tool, null, null); + } + + public StateToken(final String group, final String tool, final Long folder) { + this(group, tool, folder == null ? null : folder.toString(), null); + } + + public StateToken(final String group, final String tool, final String folder, final String document) { + this.group = group; + this.tool = tool; + this.folder = folder; + this.document = document; + resetEncoded(); + } + + public StateToken clearDocument() { + this.document = null; + resetEncoded(); + return this; + } + + public StateToken clearFolder() { // NO_UCD + this.folder = null; + resetEncoded(); + return this; + } + + public StateToken copy() { + return new StateToken(this.getEncoded()); + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final StateToken other = (StateToken) obj; + if (getEncoded() == null) { + if (other.getEncoded() != null) { + return false; + } + } else if (!getEncoded().equals(other.getEncoded())) { + return false; + } + return true; + } + + public String getDocument() { + return document; + } + + public String getEncoded() { + if (encoded == null) { + encoded = StateToken.encode(getGroup(), getTool(), getFolder(), getDocument()); + } + return encoded; + } + + public String getFolder() { + return folder; + } + + public String getGroup() { + return group; + } + + public String getTool() { + return tool; + } + + public boolean hasAll() { + return getGroup() != null && getTool() != null && getFolder() != null && getDocument() != null; + } + + public boolean hasGroup() { + return getGroup() != null; + } + + public boolean hasGroupAndTool() { + return getGroup() != null && getTool() != null; + } + + public boolean hasGroupToolAndFolder() { + return getGroup() != null && getTool() != null && getFolder() != null; + } + + @Override + public int hashCode() { + return getEncoded().hashCode(); + } + + public boolean hasNothing() { + return getGroup() == null && getTool() == null && getFolder() == null && getDocument() == null; + } + + public boolean hasSameContainer(final StateToken currentStateToken) { + boolean same = false; + if (copy().clearDocument().getEncoded().equals(currentStateToken.copy().clearDocument().getEncoded())) { + same = true; + } + return same; + } + + public boolean isComplete() { + return getDocument() != null; + } + + public StateToken setDocument(final Long document) { + this.document = document == null ? null : document.toString(); + resetEncoded(); + return this; + } + + public StateToken setDocument(final String document) { + this.document = document; + resetEncoded(); + return this; + } + + public void setEncoded(final String encoded) { + parse(encoded); + } + + public StateToken setFolder(final Long folder) { + this.folder = folder == null ? null : folder.toString(); + resetEncoded(); + return this; + } + + public StateToken setFolder(final String folder) { // NO_UCD + this.folder = folder; + resetEncoded(); + return this; + } + + public StateToken setGroup(final String group) { // NO_UCD + this.group = group; + resetEncoded(); + return this; + } + + public StateToken setTool(final String tool) { // NO_UCD + this.tool = tool; + resetEncoded(); + return this; + } + + @Override + public String toString() { + return getEncoded(); + } + + private String conditionalAssign(final int index, final String[] splitted) { + if (splitted.length > index) { + return splitted[index]; + } else { + return null; + } + } + + private void parse(final String encoded) { + String[] splitted; + if (encoded != null && encoded.length() > 0) { + splitted = encoded.split("\\."); + } else { + splitted = EMPTYA; + } + group = conditionalAssign(0, splitted); + tool = conditionalAssign(1, splitted); + folder = conditionalAssign(2, splitted); + document = conditionalAssign(3, splitted); + resetEncoded(); + } + + private void resetEncoded() { + encoded = null; + } +} Deleted: trunk/src/main/java/cc/kune/core/shared/dto/AccessRightsDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/AccessRightsDTO.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/shared/dto/AccessRightsDTO.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -1,101 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.core.shared.dto; - -import com.google.gwt.user.client.rpc.IsSerializable; - -public class AccessRightsDTO implements IsSerializable { - private boolean administrable; - private boolean editable; - private boolean visible; - - public AccessRightsDTO() { - this(false, false, false); - } - - public AccessRightsDTO(final boolean isAdministrable, final boolean isEditable, final boolean isVisible) { - this.administrable = isAdministrable; - this.editable = isEditable; - this.visible = isVisible; - } - - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final AccessRightsDTO other = (AccessRightsDTO) obj; - if (administrable != other.administrable) { - return false; - } - if (editable != other.editable) { - return false; - } - if (visible != other.visible) { - return false; - } - return true; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + (administrable ? 1231 : 1237); - result = prime * result + (editable ? 1231 : 1237); - result = prime * result + (visible ? 1231 : 1237); - return result; - } - - public boolean isAdministrable() { - return administrable; - } - - public boolean isEditable() { - return editable; - } - - public boolean isVisible() { - return visible; - } - - public void setAdministrable(final boolean administrable) { - this.administrable = administrable; - } - - public void setEditable(final boolean editable) { - this.editable = editable; - } - - public void setVisible(final boolean visible) { - this.visible = visible; - } - - @Override - public String toString() { - return "AccessRightsDTO[a: " + administrable + ", e: " + editable + ", v: " + visible + "]"; - } -} Modified: trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -21,6 +21,8 @@ import java.util.List; +import cc.kune.core.shared.domain.utils.StateToken; + import com.google.gwt.user.client.rpc.IsSerializable; public class ContainerDTO implements IsSerializable { Modified: trunk/src/main/java/cc/kune/core/shared/dto/ContainerSimpleDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/ContainerSimpleDTO.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/shared/dto/ContainerSimpleDTO.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -19,6 +19,8 @@ */ package cc.kune.core.shared.dto; +import cc.kune.core.shared.domain.utils.StateToken; + import com.google.gwt.user.client.rpc.IsSerializable; /** Modified: trunk/src/main/java/cc/kune/core/shared/dto/ContentSimpleDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/ContentSimpleDTO.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/shared/dto/ContentSimpleDTO.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -20,6 +20,8 @@ package cc.kune.core.shared.dto; import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.domain.utils.StateToken; import com.google.gwt.user.client.rpc.IsSerializable; @@ -30,7 +32,7 @@ private String typeId; private StateToken stateToken; private ContentStatus status; - private AccessRightsDTO rights; + private AccessRights rights; private BasicMimeTypeDTO mimeType; public Long getId() { @@ -41,7 +43,7 @@ return mimeType; } - public AccessRightsDTO getRights() { + public AccessRights getRights() { return rights; } @@ -69,7 +71,7 @@ this.mimeType = mimeType; } - public void setRights(final AccessRightsDTO rights) { + public void setRights(final AccessRights rights) { this.rights = rights; } Modified: trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -20,6 +20,7 @@ package cc.kune.core.shared.dto; import cc.kune.core.shared.domain.AdmissionType; +import cc.kune.core.shared.domain.utils.StateToken; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDataDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDataDTO.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDataDTO.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -21,6 +21,7 @@ import cc.kune.core.shared.domain.SocialNetworkVisibility; import cc.kune.core.shared.domain.UserBuddiesVisibility; +import cc.kune.core.shared.domain.utils.AccessRights; import com.google.gwt.user.client.rpc.IsSerializable; @@ -31,7 +32,7 @@ private ParticipationDataDTO userParticipation; private UserBuddiesVisibility userBuddiesVisibility; private UserBuddiesDataDTO userBuddies; - private AccessRightsDTO groupRights; + private AccessRights groupRights; private boolean isBuddiesVisible; private boolean isMembersVisible; @@ -42,7 +43,7 @@ public SocialNetworkDataDTO(final SocialNetworkVisibility socialNetworkVisibility, final SocialNetworkDTO groupMembers, final ParticipationDataDTO userParticipation, final UserBuddiesVisibility userBuddiesVisibility, final UserBuddiesDataDTO userBuddies, - final AccessRightsDTO groupRights, final boolean isBuddiesVisible, final boolean isMembersVisible) { + final AccessRights groupRights, final boolean isBuddiesVisible, final boolean isMembersVisible) { this.socialNetworkVisibility = socialNetworkVisibility; this.groupMembers = groupMembers; this.userParticipation = userParticipation; @@ -57,7 +58,7 @@ return groupMembers; } - public AccessRightsDTO getGroupRights() { + public AccessRights getGroupRights() { return groupRights; } @@ -101,7 +102,7 @@ this.groupMembers = groupMembers; } - public void setGroupRights(final AccessRightsDTO groupRights) { + public void setGroupRights(final AccessRights groupRights) { this.groupRights = groupRights; } Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateAbstractDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/StateAbstractDTO.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/shared/dto/StateAbstractDTO.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -21,6 +21,9 @@ import java.util.List; +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.domain.utils.StateToken; + import com.google.gwt.user.client.rpc.IsSerializable; public abstract class StateAbstractDTO implements IsSerializable { @@ -46,7 +49,7 @@ return socialNetworkData.getGroupMembers(); } - public AccessRightsDTO getGroupRights() { + public AccessRights getGroupRights() { return socialNetworkData.getGroupRights(); } Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -20,6 +20,7 @@ package cc.kune.core.shared.dto; import cc.kune.core.shared.domain.TagCloudResult; +import cc.kune.core.shared.domain.utils.AccessRights; import com.google.gwt.user.client.rpc.IsSerializable; @@ -30,7 +31,7 @@ private String toolName; private ContainerDTO container; private ContainerDTO rootContainer; - private AccessRightsDTO containerRights; + private AccessRights containerRights; private LicenseDTO license; private TagCloudResult tagCloudResult; private AccessListsDTO accessLists; @@ -46,7 +47,7 @@ return container; } - public AccessRightsDTO getContainerRights() { + public AccessRights getContainerRights() { return containerRights; } @@ -86,7 +87,7 @@ this.container = container; } - public void setContainerRights(final AccessRightsDTO containerRights) { + public void setContainerRights(final AccessRights containerRights) { this.containerRights = containerRights; } Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateContentDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/StateContentDTO.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/shared/dto/StateContentDTO.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -24,6 +24,7 @@ import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.RateResult; +import cc.kune.core.shared.domain.utils.AccessRights; import com.google.gwt.user.client.rpc.IsSerializable; @@ -32,7 +33,7 @@ private String documentId; private int version; private String content; - private AccessRightsDTO contentRights; + private AccessRights contentRights; private ContentStatus status; private Double rate; private Integer rateByUsers; @@ -53,7 +54,7 @@ return content; } - public AccessRightsDTO getContentRights() { + public AccessRights getContentRights() { return contentRights; } @@ -101,7 +102,7 @@ this.content = content; } - public void setContentRights(final AccessRightsDTO contentRights) { + public void setContentRights(final AccessRights contentRights) { this.contentRights = contentRights; } Deleted: trunk/src/main/java/cc/kune/core/shared/dto/StateToken.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/StateToken.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/shared/dto/StateToken.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -1,256 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.core.shared.dto; - -import com.google.gwt.user.client.rpc.IsSerializable; - -/** - * <pre> - * http://code.google.com/p/google-web-toolkit-doc-1-5/wiki/DevGuideHistory - * http://en.wikipedia.org/wiki/Fragment_identifier - * http://www.w3.org/DesignIssues/Fragment.html - * </pre> - * - * <pre> - * When an agent (such as a Web browser) requests a resource from a Web server, the agent sends the URI to the server, but does not send the fragment. - * </pre> - * - */ -public class StateToken implements IsSerializable { - public static final String SEPARATOR = "."; - private static final String[] EMPTYA = new String[0]; - - private static String encode(final String group, final String tool, final String folder, final String document) { - String encoded = ""; - if (group != null) { - encoded += group; - } - if (tool != null) { - encoded += SEPARATOR + tool; - } - if (folder != null) { - encoded += SEPARATOR + folder; - } - if (document != null) { - encoded += SEPARATOR + document; - } - return encoded; - } - - private String group; - private String tool; - private String folder; - private String document; - - private String encoded; - - public StateToken() { - this(null, null, null, null); - } - - public StateToken(final String encoded) { - parse(encoded); - } - - public StateToken(final String group, final String tool) { // NO_UCD - this(group, tool, null, null); - } - - public StateToken(final String group, final String tool, final Long folder) { - this(group, tool, folder == null ? null : folder.toString(), null); - } - - public StateToken(final String group, final String tool, final String folder, final String document) { - this.group = group; - this.tool = tool; - this.folder = folder; - this.document = document; - resetEncoded(); - } - - public StateToken clearDocument() { - this.document = null; - resetEncoded(); - return this; - } - - public StateToken clearFolder() { // NO_UCD - this.folder = null; - resetEncoded(); - return this; - } - - public StateToken copy() { - return new StateToken(this.getEncoded()); - } - - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final StateToken other = (StateToken) obj; - if (getEncoded() == null) { - if (other.getEncoded() != null) { - return false; - } - } else if (!getEncoded().equals(other.getEncoded())) { - return false; - } - return true; - } - - public String getDocument() { - return document; - } - - public String getEncoded() { - if (encoded == null) { - encoded = StateToken.encode(getGroup(), getTool(), getFolder(), getDocument()); - } - return encoded; - } - - public String getFolder() { - return folder; - } - - public String getGroup() { - return group; - } - - public String getTool() { - return tool; - } - - public boolean hasAll() { - return getGroup() != null && getTool() != null && getFolder() != null && getDocument() != null; - } - - public boolean hasGroup() { - return getGroup() != null; - } - - public boolean hasGroupAndTool() { - return getGroup() != null && getTool() != null; - } - - public boolean hasGroupToolAndFolder() { - return getGroup() != null && getTool() != null && getFolder() != null; - } - - @Override - public int hashCode() { - return getEncoded().hashCode(); - } - - public boolean hasNothing() { - return getGroup() == null && getTool() == null && getFolder() == null && getDocument() == null; - } - - public boolean hasSameContainer(final StateToken currentStateToken) { - boolean same = false; - if (copy().clearDocument().getEncoded().equals(currentStateToken.copy().clearDocument().getEncoded())) { - same = true; - } - return same; - } - - public boolean isComplete() { - return getDocument() != null; - } - - public StateToken setDocument(final Long document) { - this.document = document == null ? null : document.toString(); - resetEncoded(); - return this; - } - - public StateToken setDocument(final String document) { - this.document = document; - resetEncoded(); - return this; - } - - public void setEncoded(final String encoded) { - parse(encoded); - } - - public StateToken setFolder(final Long folder) { - this.folder = folder == null ? null : folder.toString(); - resetEncoded(); - return this; - } - - public StateToken setFolder(final String folder) { // NO_UCD - this.folder = folder; - resetEncoded(); - return this; - } - - public StateToken setGroup(final String group) { // NO_UCD - this.group = group; - resetEncoded(); - return this; - } - - public StateToken setTool(final String tool) { // NO_UCD - this.tool = tool; - resetEncoded(); - return this; - } - - @Override - public String toString() { - return getEncoded(); - } - - private String conditionalAssign(final int index, final String[] splitted) { - if (splitted.length > index) { - return splitted[index]; - } else { - return null; - } - } - - private void parse(final String encoded) { - String[] splitted; - if (encoded != null && encoded.length() > 0) { - splitted = encoded.split("\\."); - } else { - splitted = EMPTYA; - } - group = conditionalAssign(0, splitted); - tool = conditionalAssign(1, splitted); - folder = conditionalAssign(2, splitted); - document = conditionalAssign(3, splitted); - resetEncoded(); - } - - private void resetEncoded() { - encoded = null; - } -} Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateTokenUtils.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/StateTokenUtils.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/shared/dto/StateTokenUtils.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -1,6 +1,7 @@ package cc.kune.core.shared.dto; import cc.kune.core.client.state.Session; +import cc.kune.core.shared.domain.utils.StateToken; public class StateTokenUtils { Modified: trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -19,6 +19,8 @@ */ package cc.kune.core.shared.dto; +import cc.kune.core.shared.domain.utils.StateToken; + import com.google.gwt.user.client.rpc.IsSerializable; public class UserSimpleDTO implements IsSerializable { Modified: trunk/src/main/java/cc/kune/domain/AccessLists.java =================================================================== --- trunk/src/main/java/cc/kune/domain/AccessLists.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/domain/AccessLists.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -27,8 +27,9 @@ import javax.persistence.Table; import org.hibernate.search.annotations.DocumentId; -import org.ourproject.kune.platf.server.access.AccessRol; +import cc.kune.core.shared.domain.AccessRol; + @Entity @Table(name = "access_lists") public class AccessLists { Modified: trunk/src/main/java/cc/kune/domain/Container.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Container.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/domain/Container.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -49,7 +49,7 @@ import org.hibernate.search.annotations.IndexedEmbedded; import org.hibernate.search.annotations.Store; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.utils.HasId; import cc.kune.domain.utils.HasStateToken; Modified: trunk/src/main/java/cc/kune/domain/Content.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Content.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/domain/Content.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -53,7 +53,7 @@ import org.hibernate.search.annotations.IndexedEmbedded; import cc.kune.core.shared.domain.ContentStatus; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.utils.HasStateToken; import com.google.inject.name.Named; Modified: trunk/src/main/java/cc/kune/domain/Group.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Group.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/domain/Group.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -47,8 +47,8 @@ import org.hibernate.validator.constraints.Length; import cc.kune.core.shared.domain.AdmissionType; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupType; -import cc.kune.core.shared.dto.StateToken; import cc.kune.domain.utils.HasId; import com.google.inject.name.Named; Modified: trunk/src/main/java/cc/kune/domain/GroupList.java =================================================================== --- trunk/src/main/java/cc/kune/domain/GroupList.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/domain/GroupList.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -74,6 +74,17 @@ } } + public boolean checkIfIncludes(final Group group, final List<Group> list, final GroupListMode mode) { + switch (mode) { + case NOBODY: + return false; + case EVERYONE: + return true; + default: + return list.contains(group); + } + } + public ArrayList<Group> duplicate() { return new ArrayList<Group>(list); } @@ -91,7 +102,7 @@ } public boolean includes(final Group group) { - return mode.checkIfIncludes(group, this.list); + return checkIfIncludes(group, this.list, mode); } public boolean isEmpty() { Modified: trunk/src/main/java/cc/kune/domain/User.java =================================================================== --- trunk/src/main/java/cc/kune/domain/User.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/domain/User.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -46,7 +46,7 @@ import org.hibernate.validator.constraints.Length; import cc.kune.core.shared.domain.UserBuddiesVisibility; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.utils.HasId; import com.google.inject.name.Named; Modified: trunk/src/main/java/cc/kune/domain/utils/HasStateToken.java =================================================================== --- trunk/src/main/java/cc/kune/domain/utils/HasStateToken.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/domain/utils/HasStateToken.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -19,7 +19,7 @@ */ package cc.kune.domain.utils; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; public interface HasStateToken { Modified: trunk/src/main/java/cc/kune/domain/utils/SocialNetworkData.java =================================================================== --- trunk/src/main/java/cc/kune/domain/utils/SocialNetworkData.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/cc/kune/domain/utils/SocialNetworkData.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -19,12 +19,13 @@ */ package cc.kune.domain.utils; -import org.ourproject.kune.platf.server.access.AccessRights; + import org.ourproject.kune.platf.server.sn.ParticipationData; import org.ourproject.kune.platf.server.sn.UserBuddiesData; import cc.kune.core.shared.domain.SocialNetworkVisibility; import cc.kune.core.shared.domain.UserBuddiesVisibility; +import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.domain.SocialNetwork; public class SocialNetworkData { Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -28,8 +28,8 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -35,8 +35,8 @@ import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.state.Session; import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.dto.StateToken; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -30,8 +30,8 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.client.utils.TextUtils; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.dto.StateToken; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -28,7 +28,7 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -25,7 +25,7 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.core.client.Scheduler; Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -29,10 +29,10 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.ContainerDTO; import cc.kune.core.shared.dto.ContentSimpleDTO; import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -21,7 +21,7 @@ import org.ourproject.kune.workspace.client.cnt.AbstractContentView; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; public interface GalleryFolderContentView extends AbstractContentView { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionRegistry.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionRegistry.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -21,9 +21,8 @@ import java.util.HashMap; +import cc.kune.core.shared.domain.utils.AccessRights; -import cc.kune.core.shared.dto.AccessRightsDTO; - import com.allen_sauer.gwt.log.client.Log; public class ActionRegistry<T> { @@ -40,7 +39,7 @@ } public void addAction(final ActionDescriptor<T> action, final String... typeIds) { - assert (action != null); + assert action != null; for (final String typeId : typeIds) { String text = action.getText(); Log.debug("Registering action " + (text == null ? "with icon" : "'" + text + "'") + " for " + typeId); @@ -49,13 +48,13 @@ } } - public ActionItemCollection<T> getCurrentActions(final T item, final boolean isLogged, - final AccessRightsDTO rights, final boolean toolbarItems) { + public ActionItemCollection<T> getCurrentActions(final T item, final boolean isLogged, final AccessRights rights, + final boolean toolbarItems) { return getCurrentActions(item, GENERIC, isLogged, rights, toolbarItems); } public ActionItemCollection<T> getCurrentActions(final T item, final String typeId, final boolean isLogged, - final AccessRightsDTO rights, final boolean toolbarItems) { + final AccessRights rights, final boolean toolbarItems) { final ActionItemCollection<T> collection = new ActionItemCollection<T>(); for (final ActionDescriptor<T> action : getActions(typeId)) { @@ -98,7 +97,7 @@ return actionColl; } - private boolean mustAdd(final boolean isLogged, final AccessRightsDTO rights, final ActionDescriptor<T> action) { + private boolean mustAdd(final boolean isLogged, final AccessRights rights, final ActionDescriptor<T> action) { if (action.mustBeAuthenticated()) { if (!isLogged) { return false; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -25,7 +25,7 @@ import org.ourproject.kune.platf.client.utils.UrlParam; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.DOM; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -4,7 +4,7 @@ import org.ourproject.kune.platf.client.ui.rte.insertimg.ContentPosition; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; public class MediaUtils { Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRights.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRights.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRights.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -1,65 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.server.access; - -public class AccessRights { - boolean administrable; - boolean editable; - boolean visible; - - public AccessRights() { - this(false, false, false); - } - - public AccessRights(final boolean administrable, final boolean editable, final boolean visible) { - this.administrable = administrable; - this.editable = editable; - this.visible = visible; - } - - public boolean isAdministrable() { - return administrable; - } - - public boolean isEditable() { - return editable; - } - - public boolean isVisible() { - return visible; - } - - public void setAdministrable(final boolean isAdministrable) { - this.administrable = isAdministrable; - } - - public void setEditable(final boolean isEditable) { - this.editable = isEditable; - } - - public void setVisible(final boolean isVisible) { - this.visible = isVisible; - } - - @Override - public String toString() { - return "AccessRights[a: " + administrable + ", e: " + editable + ", v: " + visible + "]"; - } -} Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsService.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsService.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -19,6 +19,7 @@ */ package org.ourproject.kune.platf.server.access; +import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.domain.AccessLists; import cc.kune.domain.User; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsServiceDefault.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsServiceDefault.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -23,6 +23,8 @@ import java.util.HashSet; +import cc.kune.core.shared.domain.AccessRol; +import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.domain.AccessLists; import cc.kune.domain.Group; import cc.kune.domain.GroupList; Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRol.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRol.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRol.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.platf.server.access; - -public enum AccessRol { - Administrator, Editor, Viewer -} Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessService.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessService.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -21,6 +21,7 @@ import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.shared.domain.AccessRol; import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.domain.User; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessServiceDefault.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessServiceDefault.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -22,6 +22,8 @@ import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.shared.domain.AccessRol; +import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.domain.AccessLists; import cc.kune.domain.Container; import cc.kune.domain.Content; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderService.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderService.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -21,7 +21,7 @@ import cc.kune.core.client.errors.DefaultException; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.Comment; import cc.kune.domain.Container; import cc.kune.domain.Content; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderServiceDefault.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderServiceDefault.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -33,7 +33,7 @@ import cc.kune.core.client.errors.GroupNotFoundException; import cc.kune.core.client.errors.NoDefaultContentException; import cc.kune.core.client.errors.ToolNotFoundException; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.Comment; import cc.kune.domain.Container; import cc.kune.domain.Content; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/auth/Authorizated.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/auth/Authorizated.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/auth/Authorizated.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -22,8 +22,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import org.ourproject.kune.platf.server.access.AccessRol; +import cc.kune.core.shared.domain.AccessRol; + import com.google.inject.BindingAnnotation; /** Modified: trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptor.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptor.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -24,15 +24,15 @@ import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.access.AccessRights; import org.ourproject.kune.platf.server.access.AccessRightsService; -import org.ourproject.kune.platf.server.access.AccessRol; import org.ourproject.kune.platf.server.access.AccessService; import org.ourproject.kune.platf.server.content.ContentUtils; import org.ourproject.kune.platf.server.manager.GroupManager; import cc.kune.core.client.errors.AccessViolationException; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.AccessRol; +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.domain.Group; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -19,6 +19,7 @@ */ package org.ourproject.kune.platf.server.manager; + import org.ourproject.kune.platf.server.sn.ParticipationData; import cc.kune.core.client.errors.AccessViolationException; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -30,7 +30,7 @@ import org.ourproject.kune.platf.client.ui.download.FileConstants; import org.ourproject.kune.platf.server.manager.GroupManager; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.Group; import com.google.inject.Inject; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -30,13 +30,13 @@ import org.apache.commons.fileupload.FileItem; import org.ourproject.kune.platf.client.ui.download.FileConstants; -import org.ourproject.kune.platf.server.access.AccessRol; import org.ourproject.kune.platf.server.auth.ActionLevel; import org.ourproject.kune.platf.server.auth.Authenticated; import org.ourproject.kune.platf.server.auth.Authorizated; import org.ourproject.kune.platf.server.manager.GroupManager; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.AccessRol; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.BasicMimeType; import cc.kune.domain.Group; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -33,7 +33,6 @@ import org.apache.commons.logging.LogFactory; import org.ourproject.kune.platf.client.ui.download.FileConstants; import org.ourproject.kune.platf.client.ui.download.ImageSize; -import org.ourproject.kune.platf.server.access.AccessRol; import org.ourproject.kune.platf.server.auth.ActionLevel; import org.ourproject.kune.platf.server.auth.Authenticated; import org.ourproject.kune.platf.server.auth.Authorizated; @@ -42,7 +41,8 @@ import org.ourproject.kune.platf.server.properties.KuneProperties; import cc.kune.core.client.errors.ContentNotFoundException; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.AccessRol; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.BasicMimeType; import cc.kune.domain.Content; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -28,7 +28,6 @@ import org.apache.commons.fileupload.FileItem; import org.ourproject.kune.platf.client.ui.download.ImageSize; import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.access.AccessRol; import org.ourproject.kune.platf.server.access.AccessService; import org.ourproject.kune.platf.server.auth.ActionLevel; import org.ourproject.kune.platf.server.auth.Authenticated; @@ -39,7 +38,8 @@ import org.ourproject.kune.platf.server.properties.KuneProperties; import org.ourproject.kune.platf.server.utils.StringW; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.AccessRol; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.BasicMimeType; import cc.kune.domain.Container; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -40,7 +40,7 @@ import org.ourproject.kune.platf.client.ui.download.FileConstants; import org.ourproject.kune.platf.server.properties.KuneProperties; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import com.google.inject.Inject; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUtils.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUtils.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -24,7 +24,7 @@ import java.io.IOException; import java.io.InputStream; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; public class FileUtils { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -24,7 +24,6 @@ import javax.persistence.EntityManager; import org.ourproject.kune.platf.server.ServerException; -import org.ourproject.kune.platf.server.access.AccessRights; import org.ourproject.kune.platf.server.access.AccessRightsService; import org.ourproject.kune.platf.server.manager.SocialNetworkManager; import org.ourproject.kune.platf.server.manager.UserManager; @@ -41,6 +40,7 @@ import cc.kune.core.shared.domain.GroupListMode; import cc.kune.core.shared.domain.SocialNetworkVisibility; import cc.kune.core.shared.domain.UserBuddiesVisibility; +import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.core.shared.dto.GroupType; import cc.kune.core.shared.dto.SocialNetworkRequestResult; import cc.kune.domain.Group; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -28,7 +28,6 @@ import org.ourproject.kune.chat.server.managers.XmppManager; import org.ourproject.kune.platf.server.UserSession; import org.ourproject.kune.platf.server.access.AccessRightsService; -import org.ourproject.kune.platf.server.access.AccessRol; import org.ourproject.kune.platf.server.access.AccessService; import org.ourproject.kune.platf.server.access.FinderService; import org.ourproject.kune.platf.server.auth.ActionLevel; @@ -53,10 +52,12 @@ import cc.kune.core.client.errors.NoDefaultContentException; import cc.kune.core.client.errors.ToolNotFoundException; import cc.kune.core.client.rpcservices.ContentService; +import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.RateResult; import cc.kune.core.shared.domain.TagCloudResult; -import cc.kune.core.shared.dto.AccessRightsDTO; +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.CommentDTO; import cc.kune.core.shared.dto.ContentSimpleDTO; import cc.kune.core.shared.dto.I18nLanguageDTO; @@ -64,7 +65,6 @@ import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.dto.StateNoContentDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.domain.AccessLists; import cc.kune.domain.Comment; import cc.kune.domain.Container; @@ -116,6 +116,7 @@ this.mapper = mapper; } + @Override @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor, mustCheckMembership = false) @Transactional(type = TransactionType.READ_WRITE) @@ -126,6 +127,7 @@ contentManager.addAuthor(user, contentId, authorShortName); } + @Override @Authenticated @Authorizated(accessRolRequired = AccessRol.Viewer) @Transactional(type = TransactionType.READ_WRITE) @@ -137,6 +139,7 @@ return mapper.map(comment, CommentDTO.class); } + @Override @Authenticated @Authorizated(accessRolRequired = AccessRol.Viewer) @Transactional(type = TransactionType.READ_WRITE) @@ -148,6 +151,7 @@ return mapper.map(comment, CommentDTO.class); } + @Override @Authenticated @Authorizated(actionLevel = ActionLevel.container, accessRolRequired = AccessRol.Editor, mustCheckMembership = false) @Transactional(type = TransactionType.READ_WRITE) @@ -157,6 +161,7 @@ return createContent(parentToken, title, typeId, body); } + @Override @Authenticated @Authorizated(actionLevel = ActionLevel.container, accessRolRequired = AccessRol.Editor, mustCheckMembership = false) @Transactional(type = TransactionType.READ_WRITE) @@ -168,6 +173,7 @@ return getState(user, container); } + @Override @Authenticated @Authorizated(actionLevel = ActionLevel.container, accessRolRequired = AccessRol.Editor) @Transactional(type = TransactionType.READ_WRITE) @@ -195,6 +201,7 @@ } } + @Override @Authenticated @Authorizated(actionLevel = ActionLevel.container, accessRolRequired = AccessRol.Editor, mustCheckMembership = false) @Transactional(type = TransactionType.READ_WRITE) @@ -203,6 +210,7 @@ return createContent(parentToken, "Wave embeded test", typeId, waveId); } + @Override @Authenticated @Authorizated(accessRolRequired = AccessRol.Administrator) @Transactional(type = TransactionType.READ_WRITE) @@ -211,6 +219,7 @@ return getState(getCurrentUser(), contentManager.setStatus(contentId, ContentStatus.inTheDustbin)); } + @Override @Authenticated(mandatory = false) @Transactional(type = TransactionType.READ_ONLY) public StateAbstractDTO getContent(final String userHash, final StateToken token) throws DefaultException { @@ -237,6 +246,7 @@ } } + @Override @Authenticated(mandatory = false) @Authorizated(accessRolRequired = AccessRol.Viewer) @Transactional(type = TransactionType.READ_ONLY) @@ -245,6 +255,7 @@ return getSummaryTags(group); } + @Override @Authenticated @Authorizated(accessRolRequired = AccessRol.Viewer) @Transactional(type = TransactionType.READ_WRITE) @@ -256,6 +267,7 @@ return mapper.map(comment, CommentDTO.class); } + @Override @Authenticated @Authorizated(accessRolRequired = AccessRol.Viewer) @Transactional(type = TransactionType.READ_WRITE) @@ -271,6 +283,7 @@ } } + @Override @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor, mustCheckMembership = false) @Transactional(type = TransactionType.READ_WRITE) @@ -281,6 +294,7 @@ contentManager.removeAuthor(user, contentId, authorShortName); } + @Override @Authenticated @Authorizated(actionLevel = ActionLevel.container, accessRolRequired = AccessRol.Editor, mustCheckMembership = false) @Transactional(type = TransactionType.READ_WRITE) @@ -290,6 +304,7 @@ return getContent(userHash, token); } + @Override @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor, mustCheckMembership = false) @Transactional(type = TransactionType.READ_WRITE) @@ -305,6 +320,7 @@ return getContent(userHash, token); } + @Override @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor, mustCheckMembership = false) @Transactional(type = TransactionType.READ_WRITE) @@ -316,6 +332,7 @@ creationService.saveContent(user, content, textContent); } + @Override @Authenticated @Authorizated(accessRolRequired = AccessRol.Administrator) @Transactional(type = TransactionType.READ_WRITE) @@ -325,6 +342,7 @@ return mapper.map(content, ContentSimpleDTO.class); } + @Override @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor, mustCheckMembership = false) @Transactional(type = TransactionType.READ_WRITE) @@ -335,6 +353,7 @@ return mapper.map(contentManager.setLanguage(user, contentId, languageCode), I18nLanguageDTO.class); } + @Override @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor, mustCheckMembership = false) @Transactional(type = TransactionType.READ_WRITE) @@ -345,6 +364,7 @@ contentManager.setPublishedOn(user, contentId, publishedOn); } + @Override @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor) @Transactional(type = TransactionType.READ_WRITE) @@ -358,6 +378,7 @@ return getState(getCurrentUser(), content); } + @Override @Authenticated @Authorizated(accessRolRequired = AccessRol.Administrator) @Transactional(type = TransactionType.READ_WRITE) @@ -367,6 +388,7 @@ return getState(getCurrentUser(), content); } + @Override @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor, mustCheckMembership = false) @Transactional(type = TransactionType.READ_WRITE) @@ -379,6 +401,7 @@ return getSummaryTags(group); } + @Override @Authenticated @Authorizated(accessRolRequired = AccessRol.Viewer) @Transactional(type = TransactionType.READ_WRITE) @@ -454,7 +477,7 @@ final ContentSimpleDTO siblingDTO) { final Content sibling = contentManager.find(siblingDTO.getId()); final AccessLists lists = sibling.hasAccessList() ? sibling.getAccessLists() : groupAccessList; - siblingDTO.setRights(mapper.map(rightsService.get(user, lists), AccessRightsDTO.class)); + siblingDTO.setRights(mapper.map(rightsService.get(user, lists), AccessRights.class)); } private StateContainerDTO mapState(final StateContainer state, final User user) { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/GroupRPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/GroupRPC.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/GroupRPC.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -20,7 +20,6 @@ package org.ourproject.kune.platf.server.rpc; import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.access.AccessRol; import org.ourproject.kune.platf.server.auth.ActionLevel; import org.ourproject.kune.platf.server.auth.Authenticated; import org.ourproject.kune.platf.server.auth.Authorizated; @@ -31,11 +30,12 @@ import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.rpcservices.GroupService; +import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.AdmissionType; import cc.kune.core.shared.domain.SocialNetworkVisibility; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.domain.Content; import cc.kune.domain.Group; import cc.kune.domain.User; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SocialNetworkRPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SocialNetworkRPC.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SocialNetworkRPC.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -20,7 +20,6 @@ package org.ourproject.kune.platf.server.rpc; import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.access.AccessRol; import org.ourproject.kune.platf.server.auth.ActionLevel; import org.ourproject.kune.platf.server.auth.Authenticated; import org.ourproject.kune.platf.server.auth.Authorizated; @@ -30,9 +29,10 @@ import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.rpcservices.SocialNetworkService; +import cc.kune.core.shared.domain.AccessRol; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.SocialNetworkDataDTO; import cc.kune.core.shared.dto.SocialNetworkRequestResult; -import cc.kune.core.shared.dto.StateToken; import cc.kune.domain.Group; import cc.kune.domain.User; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -23,7 +23,6 @@ import org.jivesoftware.smack.util.Base64; import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.access.AccessRol; import org.ourproject.kune.platf.server.auth.ActionLevel; import org.ourproject.kune.platf.server.auth.Authenticated; import org.ourproject.kune.platf.server.auth.Authorizated; @@ -38,8 +37,9 @@ import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.errors.UserAuthException; import cc.kune.core.client.rpcservices.UserService; +import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.UserBuddiesVisibility; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.UserDTO; import cc.kune.core.shared.dto.UserInfoDTO; import cc.kune.domain.Group; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -21,11 +21,12 @@ import java.util.List; -import org.ourproject.kune.platf.server.access.AccessRights; import org.ourproject.kune.platf.server.sn.ParticipationData; import org.ourproject.kune.platf.server.sn.UserBuddiesData; -import cc.kune.core.shared.dto.StateToken; + +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.Group; import cc.kune.domain.SocialNetwork; import cc.kune.domain.utils.SocialNetworkData; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/state/StateContainer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/state/StateContainer.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/state/StateContainer.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -19,9 +19,9 @@ */ package org.ourproject.kune.platf.server.state; -import org.ourproject.kune.platf.server.access.AccessRights; import cc.kune.core.shared.domain.TagCloudResult; +import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.domain.AccessLists; import cc.kune.domain.Container; import cc.kune.domain.I18nLanguage; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/state/StateContent.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/state/StateContent.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/platf/server/state/StateContent.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -22,9 +22,9 @@ import java.util.Date; import java.util.List; -import org.ourproject.kune.platf.server.access.AccessRights; import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.domain.BasicMimeType; import cc.kune.domain.User; Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -28,9 +28,9 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.ContainerDTO; import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -55,6 +55,7 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.ContentSimpleDTO; import cc.kune.core.shared.dto.GroupDTO; @@ -62,7 +63,6 @@ import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.dto.StateToken; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -255,7 +255,7 @@ import cc.kune.core.client.state.AccessRightsClientManager; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateTokenUtils; import cc.kune.core.shared.dto.UserSimpleDTO; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbar.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbar.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; public interface ActionContentToolbar extends ActionToolbar<StateToken> { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbarPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbarPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbarPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -22,7 +22,7 @@ import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; public class ActionContentToolbarPresenter extends ActionToolbarPresenter<StateToken> implements ActionContentToolbar { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentActionRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentActionRegistry.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentActionRegistry.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.actions.ActionRegistry; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; public class ContentActionRegistry extends ActionRegistry<StateToken> { } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -29,12 +29,12 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.AccessRightsDTO; +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.BasicMimeTypeDTO; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.events.Listener; @@ -66,11 +66,13 @@ this.i18n = i18n; this.mediaUtils = mediaUtils; stateManager.onStateChanged(new Listener<StateAbstractDTO>() { + @Override public void onEvent(final StateAbstractDTO state) { setState(state); } }); onWaveLoaded = new Listener0() { + @Override public void onEvent() { NotifyUser.hideProgress(); NotifyUser.info("Wave loaded"); @@ -90,6 +92,7 @@ return waveType; } + @Override public void refreshState() { setState(session.getContentState()); } @@ -141,7 +144,7 @@ } private ActionItemCollection<StateToken> getActionCollection(final StateContainerDTO state, - final AccessRightsDTO rights) { + final AccessRights rights) { return actionRegistry.getCurrentActions(state.getStateToken(), state.getTypeId(), session.isLogged(), rights, true); } @@ -153,7 +156,7 @@ private void setNormalContent(final StateContentDTO state) { final String contentBody = getContentBody(state); - if ((contentBody == null || contentBody.length() == 0)) { + if (contentBody == null || contentBody.length() == 0) { if (state.getContentRights().isEditable()) { view.setInfoMessage(i18n.t("There is no text in this page. Feel free to edit this page")); } else { @@ -177,11 +180,11 @@ if (mimeType != null) { final FileDownloadUtils fileDownloadUtils = downloadProvider.get(); if (mimeType.isImage()) { - view.showImage(fileDownloadUtils.getImageUrl(token), fileDownloadUtils.getImageResizedUrl(token, - ImageSize.sized), false); + view.showImage(fileDownloadUtils.getImageUrl(token), + fileDownloadUtils.getImageResizedUrl(token, ImageSize.sized), false); } else if (mimeType.isPdf()) { - view.showImage(fileDownloadUtils.getImageUrl(token), fileDownloadUtils.getImageResizedUrl(token, - ImageSize.sized), true); + view.showImage(fileDownloadUtils.getImageUrl(token), + fileDownloadUtils.getImageResizedUrl(token, ImageSize.sized), true); } else if (mimeType.isMp3()) { view.setRawContent(mediaUtils.get().getMp3Embed(token)); } else if (mimeType.isOgg()) { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigator.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigator.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigator.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -22,8 +22,8 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.dto.StateToken; public interface ContextNavigator { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorItem.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorItem.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorItem.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -22,7 +22,7 @@ import org.ourproject.kune.platf.client.actions.ActionItemCollection; import cc.kune.core.shared.domain.ContentStatus; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; public class ContextNavigatorItem { private final String id; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -26,7 +26,7 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import cc.kune.core.shared.domain.ContentStatus; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import com.allen_sauer.gwt.log.client.Log; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -39,7 +39,8 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.ContentStatus; -import cc.kune.core.shared.dto.AccessRightsDTO; +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.BasicMimeTypeDTO; import cc.kune.core.shared.dto.ContainerDTO; import cc.kune.core.shared.dto.ContainerSimpleDTO; @@ -47,7 +48,6 @@ import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.dto.UserInfoDTO; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -95,8 +95,10 @@ addRenameListener(); } + @Override public void addFileUploaderListener(final FileUploader uploader) { uploader.addOnUploadCompleteListener(new Listener<StateToken>() { + @Override public void onEvent(final StateToken currentUploadStateToken) { if (currentUploadStateToken.hasSameContainer(session.getCurrentStateToken())) { stateManager.reload(); @@ -105,6 +107,7 @@ }); } + @Override public void attach() { // FIXME At the moment detach (removeFromParent) destroy the gwt-ext // TreePanel and the widget must be recreated (cannot be attached again @@ -113,6 +116,7 @@ bottomToolbar.attach(); } + @Override public void clear() { topToolbar.clear(); bottomToolbar.clear(); @@ -120,12 +124,14 @@ actionsByItem.clear(); } + @Override public void detach() { view.detach(); topToolbar.detach(); bottomToolbar.detach(); } + @Override public void editItem(final StateToken stateToken) { view.editItem(genId(stateToken)); } @@ -135,10 +141,12 @@ addListeners(); } + @Override public boolean isSelected(final StateToken stateToken) { return view.isSelected(genId(stateToken)); } + @Override public void refreshState() { final StateAbstractDTO currentState = session.getCurrentState(); if (currentState instanceof StateContainerDTO) { @@ -146,6 +154,7 @@ } } + @Override public void selectItem(final StateToken stateToken) { view.selectItem(genId(stateToken)); topToolbar.disableMenusAndClearButtons(); @@ -155,15 +164,18 @@ bottomToolbar.addActions(itemCollection, AbstractFoldableContentActions.CONTEXT_BOTTOMBAR); } + @Override public void setEditOnNextStateChange(final boolean edit) { editOnNextStateChange = edit; } + @Override public void setItemStatus(final StateToken stateToken, final ContentStatus status) { clear(); refreshState(); } + @Override public void setState(final StateContainerDTO state, final boolean select) { setStateContainer(state, select); } @@ -178,7 +190,7 @@ private ActionItemCollection<StateToken> addItem(final String title, final String contentTypeId, final BasicMimeTypeDTO mimeType, final ContentStatus status, final StateToken stateToken, - final StateToken parentStateToken, final AccessRightsDTO rights, final boolean isNodeSelected) { + final StateToken parentStateToken, final AccessRights rights, final boolean isNodeSelected) { final ActionItemCollection<StateToken> toolbarActions = actionRegistry.getCurrentActions(stateToken, contentTypeId, session.isLogged(), rights, true); @@ -199,11 +211,13 @@ private void addListeners() { session.onUserSignIn(new Listener<UserInfoDTO>() { + @Override public void onEvent(final UserInfoDTO parameter) { clear(); } }); session.onUserSignOut(new Listener0() { + @Override public void onEvent() { clear(); } @@ -212,11 +226,13 @@ private void addRenameListener() { final Listener2<StateToken, String> onSuccess = new Listener2<StateToken, String>() { + @Override public void onEvent(final StateToken token, final String newName) { setItemText(token, newName); } }; final Listener2<StateToken, String> onFail = new Listener2<StateToken, String>() { + @Override public void onEvent(final StateToken token, final String oldName) { setItemText(token, oldName); } @@ -225,7 +241,7 @@ renameAction.onFail(onFail); } - private void createChildItems(final ContainerDTO container, final AccessRightsDTO containerRights) { + private void createChildItems(final ContainerDTO container, final AccessRights containerRights) { for (final ContainerSimpleDTO siblingFolder : container.getChilds()) { addItem(siblingFolder.getName(), siblingFolder.getTypeId(), null, ContentStatus.publishedOnline, siblingFolder.getStateToken(), @@ -239,7 +255,7 @@ } private void createTreePath(final StateToken state, final ContainerSimpleDTO[] absolutePath, - final AccessRightsDTO rights) { + final AccessRights rights) { for (final ContainerSimpleDTO folder : absolutePath) { final StateToken folderStateToken = folder.getStateToken(); final StateToken parentStateToken = state.copy().clearDocument().setFolder(folder.getParentFolderId()); @@ -298,12 +314,12 @@ private void setStateContainer(final StateContainerDTO state, final boolean select) { final StateToken stateToken = state.getStateToken(); - final boolean isContent = (state instanceof StateContentDTO); + final boolean isContent = state instanceof StateContentDTO; StateContentDTO stateContent = null; final ContainerDTO container = state.getContainer(); - final AccessRightsDTO containerRights = state.getContainerRights(); - AccessRightsDTO rights; + final AccessRights containerRights = state.getContainerRights(); + AccessRights rights; showRootFolder(state, containerRights); @@ -343,7 +359,7 @@ bottomToolbar.attach(); } - private void showRootFolder(final StateContainerDTO state, final AccessRightsDTO containerRights) { + private void showRootFolder(final StateContainerDTO state, final AccessRights containerRights) { // If container is not a root folder process root (add // childs to view) final ContainerDTO root = state.getRootContainer(); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorView.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorView.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -22,7 +22,7 @@ import org.ourproject.kune.platf.client.View; import cc.kune.core.shared.domain.ContentStatus; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; public interface ContextNavigatorView extends View { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextBottomToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextBottomToolbar.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextBottomToolbar.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -23,7 +23,7 @@ import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; public class ActionContextBottomToolbar extends ActionToolbarPresenter<StateToken> implements ActionToolbar<StateToken> { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextTopToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextTopToolbar.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextTopToolbar.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -23,7 +23,7 @@ import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; public class ActionContextTopToolbar extends ActionToolbarPresenter<StateToken> implements ActionToolbar<StateToken> { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextActionRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextActionRegistry.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextActionRegistry.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.actions.ActionRegistry; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; public class ContextActionRegistry extends ActionRegistry<StateToken> { } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -6,9 +6,9 @@ import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField; import cc.kune.core.client.state.Session; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.BasicMimeTypeDTO; import cc.kune.core.shared.dto.LinkDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.events.Listener; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -25,8 +25,8 @@ import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.LinkDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.dto.StateTokenUtils; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -5,9 +5,9 @@ import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPanel; import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.BasicMimeTypeDTO; import cc.kune.core.shared.dto.LinkDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.events.Listener; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -5,7 +5,7 @@ import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -31,8 +31,8 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsTheme; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.dto.StateToken; import com.calclab.suco.client.ioc.Provider; import com.google.gwt.user.client.ui.HorizontalPanel; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -23,8 +23,8 @@ import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; import org.ourproject.kune.workspace.client.themes.WsTheme; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.dto.StateToken; public interface EntityHeaderView { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -24,8 +24,8 @@ import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -31,10 +31,10 @@ import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.GroupType; import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -25,8 +25,8 @@ import org.ourproject.kune.workspace.client.options.EntityOptions; import cc.kune.core.client.state.Session; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.core.shared.dto.StateToken; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/GroupOptionsDefLicensePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/GroupOptionsDefLicensePresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/GroupOptionsDefLicensePresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -6,8 +6,8 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.core.shared.dto.StateToken; import com.calclab.suco.client.events.Listener2; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/UserOptionsDefLicensePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/UserOptionsDefLicensePresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/UserOptionsDefLicensePresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -5,8 +5,8 @@ import org.ourproject.kune.workspace.client.options.EntityOptions; import cc.kune.core.client.state.Session; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.dto.UserInfoDTO; import com.calclab.suco.client.events.Listener; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -28,7 +28,7 @@ import org.ourproject.kune.workspace.client.themes.WsThemeSelector; import cc.kune.core.client.utils.TextUtils; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.event.dom.client.ClickEvent; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -8,10 +8,10 @@ import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.ContentSimpleDTO; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.dto.StateToken; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.View; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; public interface EntityOptionsPublicSpaceConfView extends View { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -10,7 +10,7 @@ import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.ToolSimpleDTO; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/GroupOptionsToolsConfPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/GroupOptionsToolsConfPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/GroupOptionsToolsConfPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -27,8 +27,8 @@ import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.ContentSimpleDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.dto.ToolSimpleDTO; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/UserOptionsToolsConfPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/UserOptionsToolsConfPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/UserOptionsToolsConfPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -27,7 +27,7 @@ import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.ToolSimpleDTO; import cc.kune.core.shared.dto.UserInfoDTO; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -23,8 +23,8 @@ import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.LinkDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.events.Listener; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -23,11 +23,11 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupListDTO; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.dto.StateTokenUtils; import com.calclab.suco.client.events.Listener; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -42,7 +42,7 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.UserBuddiesVisibility; -import cc.kune.core.shared.dto.AccessRightsDTO; +import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.SocialNetworkDataDTO; import cc.kune.core.shared.dto.StateAbstractDTO; @@ -85,11 +85,13 @@ this.toolbar = toolbar; this.fileDownUtilsProvider = fileDownUtilsProvider; stateManager.onStateChanged(new Listener<StateAbstractDTO>() { + @Override public void onEvent(final StateAbstractDTO state) { setState(state); } }); stateManager.onSocialNetworkChanged(new Listener<StateAbstractDTO>() { + @Override public void onEvent(final StateAbstractDTO state) { setState(state); } @@ -116,8 +118,8 @@ user.getStateToken()) : BuddiesSummaryView.NOAVATAR; final String tooltip = super.createTooltipWithLogo(user.getShortName(), user.getStateToken(), user.hasLogo(), true); - view.addBuddie(user, actionRegistry.getCurrentActions(user, session.isLogged(), - new AccessRightsDTO(true, true, true), false), avatarUrl, user.getName(), tooltip); + view.addBuddie(user, actionRegistry.getCurrentActions(user, session.isLogged(), new AccessRights( + true, true, true), false), avatarUrl, user.getName(), tooltip); } final boolean hasLocalBuddies = buddies.size() > 0; final int numExtBuddies = userBuddies.getOtherExtBuddies(); @@ -155,6 +157,7 @@ private void createAddNewBuddiesAction() { final ActionToolbarMenuDescriptor<UserSimpleDTO> addNewBuddiesAction = new ActionToolbarMenuDescriptor<UserSimpleDTO>( AccessRolDTO.Administrator, buddiesBottom, new Listener<UserSimpleDTO>() { + @Override public void onEvent(final UserSimpleDTO parameter) { NotifyUser.info("In development"); } @@ -168,16 +171,19 @@ private void createSetBuddiesVisibilityAction(final String textDescription, final UserBuddiesVisibility visibility) { final ActionToolbarMenuRadioDescriptor<UserSimpleDTO> buddiesVisibilityAction = new ActionToolbarMenuRadioDescriptor<UserSimpleDTO>( AccessRolDTO.Administrator, buddiesBottom, new Listener<UserSimpleDTO>() { + @Override public void onEvent(final UserSimpleDTO parameter) { userServiceAsync.get().setBuddiesVisibility(session.getUserHash(), session.getCurrentState().getGroup().getStateToken(), visibility, new AsyncCallbackSimple<Void>() { + @Override public void onSuccess(final Void result) { NotifyUser.info(i18n.t("Buddies visibility changed")); } }); } }, BUDDIES_VISIBILITY_GROUP, new RadioMustBeChecked() { + @Override public boolean mustBeChecked() { final StateAbstractDTO currentState = session.getCurrentState(); if (currentState.getGroup().isPersonal()) { @@ -196,6 +202,7 @@ private void registerActions() { final ActionMenuItemDescriptor<UserSimpleDTO> addAsBuddie = new ActionMenuItemDescriptor<UserSimpleDTO>( AccessRolDTO.Viewer, new Listener<UserSimpleDTO>() { + @Override public void onEvent(final UserSimpleDTO user) { chatEngineProvider.get().addNewBuddie(user.getShortName()); } @@ -204,6 +211,7 @@ addAsBuddie.setTextDescription(i18n.t("Add as a buddie")); addAsBuddie.setIconUrl("images/add-green.png"); addAsBuddie.setEnableCondition(new ActionEnableCondition<UserSimpleDTO>() { + @Override public boolean mustBeEnabled(final UserSimpleDTO user) { return !chatEngineProvider.get().isBuddie(user.getShortName()); } @@ -212,6 +220,7 @@ final ActionMenuItemDescriptor<UserSimpleDTO> go = new ActionMenuItemDescriptor<UserSimpleDTO>( AccessRolDTO.Viewer, new Listener<UserSimpleDTO>() { + @Override public void onEvent(final UserSimpleDTO user) { stateManager.gotoToken(user.getShortName()); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupActionRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupActionRegistry.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupActionRegistry.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.actions.ActionRegistry; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; /** * The Class GroupActionRegistry stores actions over groups (mainly used in SN) Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -30,8 +30,8 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.dto.StateToken; import com.calclab.emiteuimodule.client.users.UserGridPanel; import com.calclab.suco.client.events.Listener; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -45,8 +45,9 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.AdmissionType; import cc.kune.core.shared.domain.SocialNetworkVisibility; +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AccessListsDTO; -import cc.kune.core.shared.dto.AccessRightsDTO; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.InitDataDTO; @@ -54,7 +55,6 @@ import cc.kune.core.shared.dto.SocialNetworkDTO; import cc.kune.core.shared.dto.SocialNetworkDataDTO; import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.dto.StateToken; import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; import com.calclab.suco.client.events.Listener; @@ -95,6 +95,7 @@ this.liveSearcherProvider = liveSearcherProvider; this.groupActionRegistry = groupActionRegistry; final Listener<StateAbstractDTO> setStateListener = new Listener<StateAbstractDTO>() { + @Override public void onEvent(final StateAbstractDTO state) { setState(state); toolbar.disableMenusAndClearButtons(); @@ -106,9 +107,11 @@ stateManager.onStateChanged(setStateListener); stateManager.onSocialNetworkChanged(setStateListener); session.onInitDataReceived(new Listener<InitDataDTO>() { + @Override public void onEvent(final InitDataDTO initData) { addUserOperation(new MenuItem<GroupDTO>("images/new-chat.gif", i18n.t("Start a chat with this member"), new Listener<GroupDTO>() { + @Override public void onEvent(final GroupDTO group) { chatEngineProvider.get().show(); if (chatEngineProvider.get().isLoggedIn()) { @@ -139,6 +142,7 @@ NotifyUser.showProgressProcessing(); snServiceProvider.get().addCollabMember(session.getUserHash(), session.getCurrentState().getStateToken(), groupShortName, new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override public void onSuccess(final SocialNetworkDataDTO result) { NotifyUser.hideProgress(); NotifyUser.info(i18n.t("Member added as collaborator")); @@ -155,8 +159,10 @@ private void createActions() { final ActionToolbarMenuDescriptor<StateToken> addMember = new ActionToolbarMenuDescriptor<StateToken>( AccessRolDTO.Administrator, membersBottom, new Listener<StateToken>() { + @Override public void onEvent(final StateToken parameter) { liveSearcherProvider.get().onSelection(new Listener<LinkDTO>() { + @Override public void onEvent(final LinkDTO link) { view.confirmAddCollab(link.getShortName(), link.getLongName()); } @@ -183,16 +189,19 @@ private void createNewMembersPolicyAction(final String textDescription, final AdmissionType admissionPolicy) { final ActionToolbarMenuRadioDescriptor<StateToken> newMembersPolicy = new ActionToolbarMenuRadioDescriptor<StateToken>( AccessRolDTO.Administrator, membersBottom, new Listener<StateToken>() { + @Override public void onEvent(final StateToken parameter) { groupServiceProvider.get().setGroupNewMembersJoiningPolicy(session.getUserHash(), session.getCurrentState().getGroup().getStateToken(), admissionPolicy, new AsyncCallbackSimple<Void>() { + @Override public void onSuccess(final Void result) { NotifyUser.info(i18n.t("Members joining policy changed")); } }); } }, NEW_MEMBERS_POLICY_GROUP, new RadioMustBeChecked() { + @Override public boolean mustBeChecked() { final StateAbstractDTO currentState = session.getCurrentState(); return currentState.getGroup().getAdmissionType().equals(admissionPolicy); @@ -207,16 +216,19 @@ private void createSetMembersVisibilityAction(final String textDescription, final SocialNetworkVisibility visibility) { final ActionToolbarMenuRadioDescriptor<StateToken> showMembers = new ActionToolbarMenuRadioDescriptor<StateToken>( AccessRolDTO.Administrator, membersBottom, new Listener<StateToken>() { + @Override public void onEvent(final StateToken parameter) { groupServiceProvider.get().setSocialNetworkVisibility(session.getUserHash(), session.getCurrentState().getGroup().getStateToken(), visibility, new AsyncCallbackSimple<Void>() { + @Override public void onSuccess(final Void result) { NotifyUser.info(i18n.t("Members visibility changed")); } }); } }, MEMBERS_VISIBILITY_GROUP, new RadioMustBeChecked() { + @Override public boolean mustBeChecked() { final StateAbstractDTO currentState = session.getCurrentState(); if (!currentState.getGroup().isPersonal()) { @@ -233,7 +245,7 @@ } @SuppressWarnings("unchecked") - private void setGroupMembers(final SocialNetworkDTO socialNetwork, final AccessRightsDTO rights) { + private void setGroupMembers(final SocialNetworkDTO socialNetwork, final AccessRights rights) { final AccessListsDTO accessLists = socialNetwork.getAccessLists(); final List<GroupDTO> adminsList = accessLists.getAdmins().getList(); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -27,8 +27,8 @@ import org.ourproject.kune.workspace.client.skel.SummaryPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.events.Listener; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -32,7 +32,7 @@ import cc.kune.core.client.state.AccessRightsClientManager; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.AccessRightsDTO; +import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.ParticipationDataDTO; import cc.kune.core.shared.dto.StateAbstractDTO; @@ -63,6 +63,7 @@ false); super.addGroupOperation(gotoGroupMenuItem, false); final Listener<StateAbstractDTO> setStateListener = new Listener<StateAbstractDTO>() { + @Override public void onEvent(final StateAbstractDTO state) { setState(state); } @@ -78,7 +79,7 @@ @SuppressWarnings("unchecked") private void setState(final StateAbstractDTO state) { final ParticipationDataDTO participation = state.getParticipation(); - final AccessRightsDTO rights = state.getGroupRights(); + final AccessRights rights = state.getGroupRights(); view.clear(); final List<GroupDTO> groupsIsAdmin = participation.getGroupsIsAdmin(); final List<GroupDTO> groupsIsCollab = participation.getGroupsIsCollab(); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -6,7 +6,7 @@ import cc.kune.core.client.state.AccessRightsClientManager; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.AccessRightsDTO; +import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -17,7 +17,7 @@ public static UIStatus refreshStatus(final AccessRolDTO rolRequired, final boolean authNeed, final boolean isLogged, final boolean visibleForMembers, final boolean visibleForNonMemb, - final AccessRightsDTO newRights) { + final AccessRights newRights) { boolean newVisibility = false; boolean newEnabled = false; if (authNeed && !isLogged) { @@ -27,7 +27,7 @@ newEnabled = RolComparator.isEnabled(rolRequired, newRights); if (newEnabled) { final boolean isMember = RolComparator.isMember(newRights); - newEnabled = newVisibility = ((isMember && visibleForMembers) || (!isMember && visibleForNonMemb)); + newEnabled = newVisibility = isMember && visibleForMembers || !isMember && visibleForNonMemb; } else { newVisibility = false; } @@ -52,8 +52,8 @@ this.visibleForMembers = true; this.visibleForNonMemb = true; this.authNeed = false; - rightsManager.onRightsChanged(new Listener2<AccessRightsDTO, AccessRightsDTO>() { - public void onEvent(final AccessRightsDTO prevRights, final AccessRightsDTO newRights) { + rightsManager.onRightsChanged(new Listener2<AccessRights, AccessRights>() { + public void onEvent(final AccessRights prevRights, final AccessRights newRights) { setStatus(refreshStatus(rolRequired, authNeed, session.isLogged(), visibleForMembers, visibleForNonMemb, newRights)); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolComparator.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolComparator.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolComparator.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -1,11 +1,11 @@ package org.ourproject.kune.workspace.client.socialnet; -import cc.kune.core.shared.dto.AccessRightsDTO; +import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.core.shared.dto.AccessRolDTO; public final class RolComparator { - public static boolean isEnabled(final AccessRolDTO rolRequired, final AccessRightsDTO rights) { + public static boolean isEnabled(final AccessRolDTO rolRequired, final AccessRights rights) { switch (rolRequired) { case Administrator: return rights.isAdministrable(); @@ -17,7 +17,7 @@ return false; } - public static boolean isMember(final AccessRightsDTO newRights) { + public static boolean isMember(final AccessRights newRights) { return newRights.isAdministrable() || newRights.isEditable(); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -40,10 +40,10 @@ import cc.kune.core.client.state.AccessRightsClientManager; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.AccessRightsDTO; +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.SocialNetworkDataDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.events.Listener; @@ -127,7 +127,7 @@ } protected GridItem<GroupDTO> createGridItem(final GridGroup groupCategory, final GroupDTO group, - final AccessRightsDTO rights, final MenuItem<GroupDTO>... gridMenuItems) { + final AccessRights rights, final MenuItem<GroupDTO>... gridMenuItems) { final GridItem<GroupDTO> gridItem = createDefMemberMenu(group, groupCategory); final CustomMenu<GroupDTO> menu = gridItem.getMenu(); if (rights.isAdministrable()) { @@ -195,12 +195,14 @@ private void createMenuActions() { gotoGroupMenuItem = new MenuItem<GroupDTO>("images/group-home.gif", i18n.t("Visit this group homepage"), new Listener<GroupDTO>() { + @Override public void onEvent(final GroupDTO groupDTO) { stateManager.gotoToken(groupDTO.getShortName()); } }); gotoMemberMenuItem = new MenuItem<GroupDTO>("images/group-home.gif", i18n.t("Visit this member homepage"), new Listener<GroupDTO>() { + @Override public void onEvent(final GroupDTO groupDTO) { stateManager.gotoToken(groupDTO.getShortName()); } @@ -208,17 +210,20 @@ unJoinMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n.t("Do not participate anymore in this group"), new Listener<GroupDTO>() { + @Override public void onEvent(final GroupDTO groupDTO) { removeMemberAction(groupDTO); } }); changeToCollabMenuItem = new MenuItem<GroupDTO>("images/arrow-down-green.gif", i18n.t("Change to collaborator"), new Listener<GroupDTO>() { + @Override public void onEvent(final GroupDTO group) { NotifyUser.showProgressProcessing(); snServiceProvider.get().setAdminAsCollab(session.getUserHash(), session.getCurrentState().getStateToken(), group.getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override public void onSuccess(final SocialNetworkDataDTO result) { NotifyUser.hideProgress(); NotifyUser.info(i18n.t("Member type changed")); @@ -229,11 +234,13 @@ }); removeMemberMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n.t("Remove this member"), new Listener<GroupDTO>() { + @Override public void onEvent(final GroupDTO group) { NotifyUser.showProgressProcessing(); snServiceProvider.get().deleteMember(session.getUserHash(), session.getCurrentState().getStateToken(), group.getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override public void onSuccess(final SocialNetworkDataDTO result) { NotifyUser.hideProgress(); NotifyUser.info(i18n.t("Member removed")); @@ -252,11 +259,13 @@ }); changeToAdminMenuItem = new MenuItem<GroupDTO>("images/arrow-up-green.gif", i18n.t("Change to admin"), new Listener<GroupDTO>() { + @Override public void onEvent(final GroupDTO group) { NotifyUser.showProgressProcessing(); snServiceProvider.get().setCollabAsAdmin(session.getUserHash(), session.getCurrentState().getStateToken(), group.getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override public void onSuccess(final SocialNetworkDataDTO result) { NotifyUser.hideProgress(); NotifyUser.info(i18n.t("Member type changed")); @@ -267,11 +276,13 @@ }); acceptJoinGroupMenuItem = new MenuItem<GroupDTO>("images/accept.gif", i18n.t("Accept this member"), new Listener<GroupDTO>() { + @Override public void onEvent(final GroupDTO group) { NotifyUser.showProgressProcessing(); snServiceProvider.get().acceptJoinGroup(session.getUserHash(), session.getCurrentState().getStateToken(), group.getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override public void onSuccess(final SocialNetworkDataDTO result) { NotifyUser.hideProgress(); NotifyUser.info(i18n.t("Member accepted")); @@ -282,11 +293,13 @@ }); denyJoinGroupMenuItem = new MenuItem<GroupDTO>("images/cancel.gif", i18n.t("Reject this member"), new Listener<GroupDTO>() { + @Override public void onEvent(final GroupDTO group) { NotifyUser.showProgressProcessing(); snServiceProvider.get().denyJoinGroup(session.getUserHash(), session.getCurrentState().getStateToken(), group.getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override public void onSuccess(final SocialNetworkDataDTO result) { NotifyUser.hideProgress(); NotifyUser.info(i18n.t("Member rejected")); @@ -301,6 +314,7 @@ NotifyUser.showProgressProcessing(); snServiceProvider.get().unJoinGroup(session.getUserHash(), new StateToken(groupDTO.getShortName()), new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override public void onSuccess(final SocialNetworkDataDTO result) { NotifyUser.hideProgress(); NotifyUser.info(i18n.t("Removed as member")); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -9,9 +9,9 @@ import cc.kune.core.client.state.AccessRightsClientManager; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.SocialNetworkDataDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbar.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbar.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; public interface ActionGroupSummaryToolbar extends ActionToolbar<StateToken> { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbarPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbarPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbarPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -22,7 +22,7 @@ import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; public class ActionGroupSummaryToolbarPresenter extends ActionToolbarPresenter<StateToken> implements ActionGroupSummaryToolbar { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationSummaryToolbarPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationSummaryToolbarPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationSummaryToolbarPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -22,7 +22,7 @@ import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; public class ActionParticipationSummaryToolbarPresenter extends ActionToolbarPresenter<StateToken> implements ActionParticipationToolbar { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationToolbar.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationToolbar.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; public interface ActionParticipationToolbar extends ActionToolbar<StateToken> { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManager.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManager.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -1,7 +1,7 @@ package org.ourproject.kune.workspace.client.themes; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -3,7 +3,7 @@ import org.cobogw.gwt.user.client.CSS; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import com.calclab.suco.client.events.Event; import com.calclab.suco.client.events.Event0; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -25,10 +25,10 @@ import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.ContentSimpleDTO; import cc.kune.core.shared.dto.InitDataDTO; import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.dto.StateToken; import com.calclab.suco.client.events.Event2; import com.calclab.suco.client.events.Listener; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -25,10 +25,10 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.dto.StateToken; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener2; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -25,8 +25,8 @@ import cc.kune.core.client.errors.NameNotPermittedException; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.state.Session; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.events.Event2; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorItemPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorItemPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorItemPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -23,7 +23,7 @@ import org.ourproject.kune.workspace.client.themes.WsTheme; import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import com.calclab.suco.client.events.Listener2; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploader.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploader.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploader.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -20,7 +20,7 @@ package org.ourproject.kune.workspace.client.upload; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import com.calclab.suco.client.events.Listener; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -22,7 +22,7 @@ import org.ourproject.kune.workspace.client.tool.FoldableAbstractClientTool; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import com.calclab.suco.client.events.Event; import com.calclab.suco.client.events.Listener; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsert.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsert.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsert.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -1,6 +1,6 @@ package org.ourproject.kune.workspace.client.wave; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; public interface WaveInsert { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPresenter.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPresenter.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -8,8 +8,8 @@ import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/resources/dozerBeanMapping.xml =================================================================== --- trunk/src/main/resources/dozerBeanMapping.xml 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/main/resources/dozerBeanMapping.xml 2010-12-18 17:00:55 UTC (rev 1169) @@ -75,10 +75,6 @@ </field> </mapping> <mapping> - <class-a> cc.kune.core.shared.dto.AccessRightsDTO </class-a> - <class-b> org.ourproject.kune.platf.server.access.AccessRights </class-b> - </mapping> - <mapping> <class-a>cc.kune.core.shared.dto.StateContentDTO</class-a> <class-b>org.ourproject.kune.platf.server.state.StateContent</class-b> <field> @@ -96,15 +92,15 @@ <class-a>cc.kune.core.shared.dto.StateAbstractDTO</class-a> <class-b>org.ourproject.kune.platf.server.state.StateAbstract</class-b> </mapping> + + + + + + + + <mapping> - <class-a> cc.kune.core.shared.dto.StateToken </class-a> - <class-b> cc.kune.core.shared.dto.StateToken </class-b> - <field> - <a>encoded</a> - <b>encoded</b> - </field> - </mapping> - <mapping> <class-a> cc.kune.core.shared.dto.BasicMimeTypeDTO </class-a> <class-b> cc.kune.domain.BasicMimeType </class-b> </mapping> @@ -250,7 +246,7 @@ </mapping> <mapping> <class-a> cc.kune.core.shared.dto.AccessRolDTO </class-a> - <class-b> org.ourproject.kune.platf.server.access.AccessRol </class-b> + <class-b> cc.kune.core.shared.domain.AccessRol </class-b> </mapping> <mapping> <class-a> cc.kune.core.shared.dto.ToolSimpleDTO </class-a> Modified: trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -10,8 +10,8 @@ import cc.kune.core.client.actions.BeforeActionListener; import cc.kune.core.client.notify.SpinerPresenter; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateAbstractDTO; -import cc.kune.core.shared.dto.StateToken; import com.calclab.suco.testing.events.MockedListener; import com.calclab.suco.testing.events.MockedListener0; Modified: trunk/src/test/java/cc/kune/core/client/state/StateTokenTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/state/StateTokenTest.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/test/java/cc/kune/core/client/state/StateTokenTest.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -6,7 +6,7 @@ import org.junit.Test; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; public class StateTokenTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -7,9 +7,9 @@ import org.mockito.Mockito; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.dto.AccessRightsDTO; +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.dto.StateToken; import com.calclab.suco.client.events.Listener; @@ -26,12 +26,12 @@ @Test public void actionsEmptyButNeverNull() { Mockito.when(session.isLogged()).thenReturn(true); - checkActionLists(0, new AccessRightsDTO(true, true, true), true); - checkActionLists(0, new AccessRightsDTO(true, true, true), false); - checkActionLists(0, new AccessRightsDTO(false, true, true), true); - checkActionLists(0, new AccessRightsDTO(false, true, true), false); - checkActionLists(0, new AccessRightsDTO(false, false, true), true); - checkActionLists(0, new AccessRightsDTO(false, false, true), false); + checkActionLists(0, new AccessRights(true, true, true), true); + checkActionLists(0, new AccessRights(true, true, true), false); + checkActionLists(0, new AccessRights(false, true, true), true); + checkActionLists(0, new AccessRights(false, true, true), false); + checkActionLists(0, new AccessRights(false, false, true), true); + checkActionLists(0, new AccessRights(false, false, true), false); } @Before @@ -40,16 +40,19 @@ registry = new ActionRegistry<StateToken>(); adminAction = new ActionToolbarMenuAndItemDescriptor<StateToken>(AccessRolDTO.Administrator, SOME_ID, new Listener<StateToken>() { + @Override public void onEvent(final StateToken parameter) { } }); editorAction = new ActionToolbarMenuAndItemDescriptor<StateToken>(AccessRolDTO.Editor, SOME_ID, new Listener<StateToken>() { + @Override public void onEvent(final StateToken parameter) { } }); viewerAction = new ActionMenuItemDescriptor<StateToken>(AccessRolDTO.Viewer, new Listener<StateToken>() { + @Override public void onEvent(final StateToken parameter) { } }); @@ -60,32 +63,32 @@ public void mustBeAuthFalse() { Mockito.when(session.isLogged()).thenReturn(false); addDefActions(); - checkActionLists(0, new AccessRightsDTO(false, true, true), true); - checkActionLists(1, new AccessRightsDTO(false, true, true), false); + checkActionLists(0, new AccessRights(false, true, true), true); + checkActionLists(1, new AccessRights(false, true, true), false); } @Test public void testAddWhenAdmin() { Mockito.when(session.isLogged()).thenReturn(true); addDefActions(); - checkActionLists(2, new AccessRightsDTO(true, true, true), true); - checkActionLists(3, new AccessRightsDTO(true, true, true), false); + checkActionLists(2, new AccessRights(true, true, true), true); + checkActionLists(3, new AccessRights(true, true, true), false); } @Test public void testAddWhenEditor() { Mockito.when(session.isLogged()).thenReturn(true); addDefActions(); - checkActionLists(1, new AccessRightsDTO(false, true, true), true); - checkActionLists(2, new AccessRightsDTO(false, true, true), false); + checkActionLists(1, new AccessRights(false, true, true), true); + checkActionLists(2, new AccessRights(false, true, true), false); } @Test public void testAddWhenViewer() { Mockito.when(session.isLogged()).thenReturn(true); addDefActions(); - checkActionLists(0, new AccessRightsDTO(false, false, true), true); - checkActionLists(1, new AccessRightsDTO(false, false, true), false); + checkActionLists(0, new AccessRights(false, false, true), true); + checkActionLists(1, new AccessRights(false, false, true), false); } private void addDefActions() { @@ -94,9 +97,11 @@ registry.addAction(viewerAction, DEF_CONTENT_TYPE_ID); } - private void checkActionLists(final int expectedActions, final AccessRightsDTO accessRightsDTO, + private void checkActionLists(final int expectedActions, final AccessRights AccessRights, final boolean toolbarActions) { - assertEquals(expectedActions, registry.getCurrentActions(new StateToken(), DEF_CONTENT_TYPE_ID, - session.isLogged(), accessRightsDTO, toolbarActions).size()); + assertEquals( + expectedActions, + registry.getCurrentActions(new StateToken(), DEF_CONTENT_TYPE_ID, session.isLogged(), AccessRights, + toolbarActions).size()); } } Modified: trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -11,7 +11,7 @@ import org.ourproject.kune.workspace.client.upload.FileUploaderView; import cc.kune.core.client.state.Session; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; public class FileUploaderPresenterTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceAddTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceAddTest.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceAddTest.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -14,13 +14,13 @@ import cc.kune.core.client.errors.ContentNotFoundException; import cc.kune.core.client.errors.UserMustBeLoggedException; -import cc.kune.core.shared.dto.AccessRightsDTO; +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.ContainerDTO; import cc.kune.core.shared.dto.ContainerSimpleDTO; import cc.kune.core.shared.dto.ContentSimpleDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.dto.StateToken; public class ContentServiceAddTest extends ContentServiceIntegrationTest { @@ -43,9 +43,9 @@ doLogin(); defaultContent = getSiteDefaultContent(); assertEquals(1, defaultContent.getContainer().getContents().size()); - final AccessRightsDTO cntRights = defaultContent.getContentRights(); - final AccessRightsDTO ctxRights = defaultContent.getContainerRights(); - final AccessRightsDTO groupRights = defaultContent.getGroupRights(); + final AccessRights cntRights = defaultContent.getContentRights(); + final AccessRights ctxRights = defaultContent.getContainerRights(); + final AccessRights groupRights = defaultContent.getGroupRights(); final String title = "New Content Title"; final StateContentDTO added = contentService.addContent(session.getHash(), Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceGetTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceGetTest.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceGetTest.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -9,11 +9,11 @@ import org.ourproject.kune.platf.integration.IntegrationTestHelper; import cc.kune.core.client.errors.ContentNotFoundException; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.dto.StateNoContentDTO; -import cc.kune.core.shared.dto.StateToken; public class ContentServiceGetTest extends ContentServiceIntegrationTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceIntegrationTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceIntegrationTest.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceIntegrationTest.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -4,8 +4,8 @@ import cc.kune.core.client.rpcservices.ContentService; import cc.kune.core.client.rpcservices.UserService; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.dto.StateToken; import com.google.inject.Inject; Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -14,12 +14,12 @@ import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.shared.domain.TagCloudResult; import cc.kune.core.shared.domain.TagCount; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.ContainerDTO; import cc.kune.core.shared.dto.ContentSimpleDTO; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.dto.UserSimpleDTO; public class ContentServiceVariousTest extends ContentServiceIntegrationTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -11,8 +11,8 @@ import cc.kune.core.client.errors.AlreadyUserMemberException; import cc.kune.core.client.errors.UserMustBeLoggedException; import cc.kune.core.client.rpcservices.SocialNetworkService; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.SocialNetworkDataDTO; -import cc.kune.core.shared.dto.StateToken; import com.google.inject.Inject; Modified: trunk/src/test/java/org/ourproject/kune/platf/server/access/AccessRightsServiceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/access/AccessRightsServiceTest.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/test/java/org/ourproject/kune/platf/server/access/AccessRightsServiceTest.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -8,6 +8,7 @@ import org.ourproject.kune.platf.server.TestDomainHelper; import org.ourproject.kune.testhelper.ctx.DomainContext; +import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.domain.AccessLists; import cc.kune.domain.Group; import cc.kune.domain.SocialNetwork; Modified: trunk/src/test/java/org/ourproject/kune/platf/server/access/FinderTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/access/FinderTest.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/test/java/org/ourproject/kune/platf/server/access/FinderTest.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -14,7 +14,7 @@ import org.ourproject.kune.platf.server.manager.RateManager; import cc.kune.core.client.errors.ContentNotFoundException; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.domain.Group; Modified: trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptorTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptorTest.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptorTest.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -8,11 +8,11 @@ import org.mockito.Mockito; import org.ourproject.kune.platf.integration.IntegrationTest; import org.ourproject.kune.platf.integration.IntegrationTestHelper; -import org.ourproject.kune.platf.server.access.AccessRol; import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.ContentNotFoundException; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.AccessRol; +import cc.kune.core.shared.domain.utils.StateToken; import com.wideplay.warp.persist.Transactional; Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -15,7 +15,7 @@ import org.ourproject.kune.platf.integration.IntegrationTestHelper; import org.ourproject.kune.platf.server.properties.KuneProperties; -import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.BasicMimeType; import cc.kune.domain.Content; Modified: trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -9,7 +9,6 @@ import org.junit.Test; import org.ourproject.kune.platf.server.TestDomainHelper; import org.ourproject.kune.platf.server.TestHelper; -import org.ourproject.kune.platf.server.access.AccessRights; import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.sn.ParticipationData; import org.ourproject.kune.platf.server.sn.UserBuddiesData; @@ -18,6 +17,8 @@ import cc.kune.core.shared.domain.GroupListMode; import cc.kune.core.shared.domain.SocialNetworkVisibility; import cc.kune.core.shared.domain.UserBuddiesVisibility; +import cc.kune.core.shared.domain.utils.AccessRights; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.CommentDTO; import cc.kune.core.shared.dto.ContainerDTO; import cc.kune.core.shared.dto.ContainerSimpleDTO; @@ -28,7 +29,6 @@ import cc.kune.core.shared.dto.LinkDTO; import cc.kune.core.shared.dto.SocialNetworkDataDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.dto.StateToken; import cc.kune.domain.BasicMimeType; import cc.kune.domain.Comment; import cc.kune.domain.Container; Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader/EntityLogoPresenterTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader/EntityLogoPresenterTest.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader/EntityLogoPresenterTest.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -7,9 +7,9 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.GroupType; -import cc.kune.core.shared.dto.StateToken; public class EntityLogoPresenterTest { Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolActionTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolActionTest.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolActionTest.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -5,24 +5,24 @@ import org.junit.Before; import org.junit.Test; -import cc.kune.core.shared.dto.AccessRightsDTO; +import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.core.shared.dto.AccessRolDTO; public class RolActionTest { - private AccessRightsDTO adminRights; - private AccessRightsDTO editorRights; - private AccessRightsDTO viewerRights; - private AccessRightsDTO noPermRights; + private AccessRights adminRights; + private AccessRights editorRights; + private AccessRights viewerRights; + private AccessRights noPermRights; private UIStatus ff; private UIStatus tt; @Before public void before() { - adminRights = new AccessRightsDTO(true, true, true); - editorRights = new AccessRightsDTO(false, true, true); - viewerRights = new AccessRightsDTO(false, false, true); - noPermRights = new AccessRightsDTO(false, false, false); + adminRights = new AccessRights(true, true, true); + editorRights = new AccessRights(false, true, true); + viewerRights = new AccessRights(false, false, true); + noPermRights = new AccessRights(false, false, false); ff = new UIStatus(false, false); tt = new UIStatus(true, true); } Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java 2010-12-16 02:22:00 UTC (rev 1168) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java 2010-12-18 17:00:55 UTC (rev 1169) @@ -5,17 +5,17 @@ import org.junit.Test; -import cc.kune.core.shared.dto.AccessRightsDTO; +import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.core.shared.dto.AccessRolDTO; public class RolComparatorTest { @Test public void testIsEnabled() { - final AccessRightsDTO adminRights = new AccessRightsDTO(true, true, true); - final AccessRightsDTO editorRights = new AccessRightsDTO(false, true, true); - final AccessRightsDTO viewerRights = new AccessRightsDTO(false, false, true); - final AccessRightsDTO noPermRights = new AccessRightsDTO(false, false, false); + final AccessRights adminRights = new AccessRights(true, true, true); + final AccessRights editorRights = new AccessRights(false, true, true); + final AccessRights viewerRights = new AccessRights(false, false, true); + final AccessRights noPermRights = new AccessRights(false, false, false); assertTrue(RolComparator.isEnabled(AccessRolDTO.Administrator, adminRights)); assertFalse(RolComparator.isEnabled(AccessRolDTO.Administrator, editorRights)); assertFalse(RolComparator.isEnabled(AccessRolDTO.Administrator, viewerRights)); @@ -32,10 +32,10 @@ @Test public void testIsMember() { - assertFalse(RolComparator.isMember(new AccessRightsDTO(false, false, false))); - assertFalse(RolComparator.isMember(new AccessRightsDTO(false, false, true))); - assertTrue(RolComparator.isMember(new AccessRightsDTO(false, true, true))); - assertTrue(RolComparator.isMember(new AccessRightsDTO(true, true, true))); + assertFalse(RolComparator.isMember(new AccessRights(false, false, false))); + assertFalse(RolComparator.isMember(new AccessRights(false, false, true))); + assertTrue(RolComparator.isMember(new AccessRights(false, true, true))); + assertTrue(RolComparator.isMember(new AccessRights(true, true, true))); } }

1 0

r1168 - trunk/src/main/java/org/ourproject/kune/platf/client
by Vicente J. Ruiz Jurado 16 Dec '10

16 Dec '10

Author: vjrj_ Date: 2010-12-16 03:22:00 +0100 (Thu, 16 Dec 2010) New Revision: 1168 Removed: trunk/src/main/java/org/ourproject/kune/platf/client/errors/ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ trunk/src/main/java/org/ourproject/kune/platf/client/state/ Log: NEW - # 9: Roo use/integration http://kune.ourproject.org/issues/ticket/9

1 0