[kune-commits] r1120 - in trunk: .
src/main/java/org/ourproject/kune/app/server
src/main/java/org/ourproject/kune/platf/client/ui
src/main/java/org/ourproject/kune/workspace/client/rate
src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic
src/main/rails src/main/webapp src/main/webapp/WEB-INF
vjrj
vjrj at ourproject.org
Mon Jun 8 16:16:53 CEST 2009
Author: vjrj
Date: 2009-06-08 16:16:52 +0200 (Mon, 08 Jun 2009)
New Revision: 1120
Removed:
trunk/src/main/rails/publicspace/
trunk/src/main/webapp/WEB-INF/gems/
trunk/src/main/webapp/images
trunk/src/main/webapp/javascripts
trunk/src/main/webapp/templates
Modified:
trunk/DEV-GUIDE
trunk/INSTALL
trunk/pom.xml
trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconHyperlink.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java
trunk/src/main/webapp/WEB-INF/web.xml
Log:
Incomplete - task upgrade to gwt 1.6.4
Modified: trunk/DEV-GUIDE
===================================================================
--- trunk/DEV-GUIDE 2009-06-08 14:16:23 UTC (rev 1119)
+++ trunk/DEV-GUIDE 2009-06-08 14:16:52 UTC (rev 1120)
@@ -189,7 +189,7 @@
For start the hosted mode, you can both execute from command line:
- mvn com.totsp.gwt:maven-googlewebtoolkit2-plugin:gwt
+ mvn gwt-maven:gwt
Also, you can generate a hosted mode launch configuration in eclipse. We have a "Run configuration" (Run > Open Run Dialog) in eclipse with Project: "org.ourproject.kune" with Main class: "com.google.gwt.dev.GWTShell", with this program arguments (or similar): "-noserver -out gwt-out /ws/?locale=en&log_level=INFO -port 8080" and in the "Classpath User Entries":
* gwt-dev-[linux|mac|windows].jar (Add External Jar and choose it from your gwt installation directory)
@@ -200,7 +200,7 @@
-Xmx512M
before run hosted mode compile once with:
- mvn com.totsp.gwt:maven-googlewebtoolkit2-plugin:compile
+ mvn gwt-maven:compile
and deploy with:
script/deploy_gwt.sh
and then we run jetty (with "script/server.sh" also you can run server in debug mode, see TROUBLESHOOT). This is quite useful to put breakpoints in the server code.
Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL 2009-06-08 14:16:23 UTC (rev 1119)
+++ trunk/INSTALL 2009-06-08 14:16:52 UTC (rev 1120)
@@ -49,7 +49,7 @@
- Compile with maven:
# (in the trunk directory)
mvn compile -Dliquibase.should.run=false
- mvn com.totsp.gwt:maven-googlewebtoolkit2-plugin:compile
+ mvn gwt-maven:compile
- Copy the target to src directory (only for test):
./script/deploy_gwt.sh
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-06-08 14:16:23 UTC (rev 1119)
+++ trunk/pom.xml 2009-06-08 14:16:52 UTC (rev 1120)
@@ -122,7 +122,7 @@
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-web-gwt-dom</artifactId>
- <version>2.0-SNAPSHOT-mine</version>
+ <version>2.0-SNAPSHOT-g164</version>
</dependency>
<!-- xmpp -->
@@ -265,20 +265,19 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>6.1.5</version>
- <!-- <version>7.0.0.pre5</version> -->
+ <!--
+ <version>7.0.0.pre5</version>
+ -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.5</version>
+ <artifactId>maven-jetty-plugin</artifactId>
<!--
<artifactId>jetty-maven-plugin</artifactId>
- <version>7.0.0.pre5</version>
- <configuration>
- <webAppSourceDirectory>war</webAppSourceDirectory>
- </configuration>
+ <version>7.0.0.1beta0</version>
-->
+ <version>6.1.5</version>
<scope>provided</scope>
</dependency>
@@ -320,7 +319,7 @@
<dependency>
<groupId>org.jruby.rack</groupId>
<artifactId>jruby-rack</artifactId>
- <version>0.9.3</version>
+ <version>0.9.4</version>
</dependency>
</dependencies>
@@ -525,14 +524,15 @@
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.5</version>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.5</version>
<!--
- <artifactId>jetty-maven-plugin</artifactId>
- <version>7.0.0.pre5</version>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>7.0.0.1beta0</version>
-->
<configuration>
<contextPath>/</contextPath>
+ <webAppSourceDirectory>war</webAppSourceDirectory>
<reload>manual</reload>
<scanIntervalSeconds>0</scanIntervalSeconds>
</configuration>
@@ -722,8 +722,8 @@
</executions>
</plugin>
</plugins>
- <outputDirectory>${project.build.directory}/WEB-INF/classes</outputDirectory>
- <testOutputDirectory>${project.build.directory}/WEB-INF/test-classes</testOutputDirectory>
+ <outputDirectory>war/WEB-INF/classes</outputDirectory>
+ <testOutputDirectory>war/WEB-INF/test-classes</testOutputDirectory>
<resources>
<resource>
<directory>src/main/resources</directory>
Modified: trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2009-06-08 14:16:23 UTC (rev 1119)
+++ trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2009-06-08 14:16:52 UTC (rev 1120)
@@ -100,7 +100,7 @@
builder.at("^/ws").install(new RedirectFilter("/ws/"));
builder.at("^/ws/$").install(new ListenerFilter(KuneApplicationListener.class),
- new ForwardFilter("/gwt/ws/ws.html"));
+ new ForwardFilter("/ws/ws.html"));
builder.installGWTServices("^/ws/", SiteService.class, GroupService.class, ContentService.class,
UserService.class, SocialNetworkService.class, I18nService.class);
@@ -109,7 +109,7 @@
builder.installServlet("^/ws/servlets/", FileUploadManager.class, FileDownloadManager.class,
EntityLogoUploadManager.class, EntityLogoDownloadManager.class);
- builder.at("^/ws/(.*)$").install(new ForwardFilter("^/ws/(.*)$", "/gwt/ws/{0}"));
+ builder.at("^/ws/(.*)$").install(new ForwardFilter("^/ws/(.*)$", "/ws/{0}"));
}
private void installGuiceModules(final RackBuilder builder) {
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconHyperlink.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconHyperlink.java 2009-06-08 14:16:23 UTC (rev 1119)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconHyperlink.java 2009-06-08 14:16:52 UTC (rev 1120)
@@ -81,7 +81,7 @@
}
public HandlerRegistration addClickHandler(final ClickHandler handler) {
- return addHandler(handler, ClickEvent.getType());
+ return addDomHandler(handler, ClickEvent.getType());
}
public HandlerRegistration addDoubleClickHandler(final DoubleClickHandler handler) {
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabel.java 2009-06-08 14:16:23 UTC (rev 1119)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabel.java 2009-06-08 14:16:52 UTC (rev 1120)
@@ -144,7 +144,7 @@
}
public HandlerRegistration addClickHandler(final ClickHandler handler) {
- return addHandler(handler, ClickEvent.getType());
+ return addDomHandler(handler, ClickEvent.getType());
}
public HandlerRegistration addDoubleClickHandler(final DoubleClickHandler handler) {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPresenter.java 2009-06-08 14:16:23 UTC (rev 1119)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPresenter.java 2009-06-08 14:16:52 UTC (rev 1120)
@@ -54,7 +54,7 @@
stateManager.onStateChanged(new Listener<StateAbstractDTO>() {
public void onEvent(final StateAbstractDTO state) {
if (state instanceof StateContentDTO) {
- StateContentDTO stateContentDTO = (StateContentDTO) state;
+ final StateContentDTO stateContentDTO = (StateContentDTO) state;
setState(capabilitiesRegistry.isRateable(stateContentDTO.getTypeId()),
stateContentDTO.getCurrentUserRate());
} else {
@@ -99,7 +99,7 @@
new AsyncCallbackSimple<RateResultDTO>() {
public void onSuccess(final RateResultDTO result) {
NotifyUser.hideProgress();
- NotifyUser.info(i18n.t("Content rated"));
+ // NotifyUser.info(i18n.t("Content rated"));
if (currentState.getStateToken().equals(session.getCurrentStateToken())) {
session.getContentState().setRate(result);
setState(true, result.getCurrentUserRate());
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java 2009-06-08 14:16:23 UTC (rev 1119)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java 2009-06-08 14:16:52 UTC (rev 1120)
@@ -63,7 +63,6 @@
gotoPublic.setTitle(i18n.t("Leave the workspace and go to this group public space"));
gotoPublic.addStyleName("k-sitebar-labellink");
contentNoPublic.addStyleName("k-sitebar-labellink");
-
}
public void attach() {
Modified: trunk/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/src/main/webapp/WEB-INF/web.xml 2009-06-08 14:16:23 UTC (rev 1119)
+++ trunk/src/main/webapp/WEB-INF/web.xml 2009-06-08 14:16:52 UTC (rev 1120)
@@ -20,27 +20,44 @@
<param-value>/WEB-INF/publicspace/
</param-value>
</context-param>
+
<context-param>
+ <param-name>files.default</param-name>
+ <param-value>/WEB-INF/publicspace/public
+ </param-value>
+ <description>
+ The files servlet should forward to the rails servlet
+ if no file could be found
+ </description>
+ </context-param>
+
+ <context-param>
<param-name>files.prefix</param-name>
<param-value>/WEB-INF/publicspace/public
</param-value>
+ <description>Prefix added to static files</description>
</context-param>
+
<context-param>
+ <param-name>public.root</param-name>
+ <param-value>/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-name>jruby.min.runtimes</param-name>
<param-value>1</param-value>
</context-param>
<context-param>
- <param-name>public.root</param-name>
- <param-value>/public/</param-value>
+ <param-name>jruby.max.runtimes</param-name>
+ <param-value>1</param-value>
</context-param>
-
<filter>
<filter-name>RackFilter</filter-name>
<filter-class>org.jruby.rack.RackFilter
@@ -48,7 +65,7 @@
</filter>
<filter-mapping>
<filter-name>RackFilter</filter-name>
- <url-pattern>/public/*</url-pattern>
+ <url-pattern>/*</url-pattern>
</filter-mapping>
<listener>
@@ -56,7 +73,6 @@
</listener-class>
</listener>
-
<filter>
<filter-name>rack</filter-name>
<filter-class>
@@ -110,15 +126,11 @@
<url-pattern>/ws/gwt-log</url-pattern>
</servlet-mapping>
-<!--
- <servlet>
- <servlet-name>jUnitHostImpl</servlet-name>
+ <!--
+ <servlet> <servlet-name>jUnitHostImpl</servlet-name>
<servlet-class>com.google.gwt.junit.server.JUnitHostImpl
- </servlet-class>
- </servlet>
- <servlet-mapping>
+ </servlet-class> </servlet> <servlet-mapping>
<servlet-name>jUnitHostImpl</servlet-name>
- <url-pattern>/ws/junithost</url-pattern>
- </servlet-mapping>
- -->
+ <url-pattern>/ws/junithost</url-pattern> </servlet-mapping>
+ -->
</web-app>
Deleted: trunk/src/main/webapp/images
===================================================================
--- trunk/src/main/webapp/images 2009-06-08 14:16:23 UTC (rev 1119)
+++ trunk/src/main/webapp/images 2009-06-08 14:16:52 UTC (rev 1120)
@@ -1 +0,0 @@
-link ../rails/publicspace/public/images/
\ No newline at end of file
Deleted: trunk/src/main/webapp/javascripts
===================================================================
--- trunk/src/main/webapp/javascripts 2009-06-08 14:16:23 UTC (rev 1119)
+++ trunk/src/main/webapp/javascripts 2009-06-08 14:16:52 UTC (rev 1120)
@@ -1 +0,0 @@
-link ../rails/publicspace/public/javascripts/
\ No newline at end of file
Deleted: trunk/src/main/webapp/templates
===================================================================
--- trunk/src/main/webapp/templates 2009-06-08 14:16:23 UTC (rev 1119)
+++ trunk/src/main/webapp/templates 2009-06-08 14:16:52 UTC (rev 1120)
@@ -1 +0,0 @@
-link ../rails/publicspace/public/templates/
\ No newline at end of file
More information about the kune-commits
mailing list