[kune-commits] r1009 - in trunk: . script
src/main/java/org/ourproject/kune/app/server
src/main/rails/publicspace/app/views/kunedbg src/main/webapp
src/main/webapp/WEB-INF
dani matas
danigb at ourproject.org
Sun Dec 21 04:55:26 CET 2008
Author: danigb
Date: 2008-12-21 04:55:25 +0100 (Sun, 21 Dec 2008)
New Revision: 1009
Added:
trunk/script/server.sh
trunk/src/main/webapp/images
trunk/src/main/webapp/javascripts
trunk/src/main/webapp/stylesheets
Modified:
trunk/INSTALL
trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java
trunk/src/main/rails/publicspace/app/views/kunedbg/list.html.erb
trunk/src/main/webapp/WEB-INF/web.xml
Log:
rails assets now public available. new script/server.sh
Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL 2008-12-21 03:20:35 UTC (rev 1008)
+++ trunk/INSTALL 2008-12-21 03:55:25 UTC (rev 1009)
@@ -85,9 +85,18 @@
)
- Run jetty: mvn jetty:run -Dliquibase.should.run=false
-- Once started (and initialized the db), you should stop a run jetty with de db migrator to insert initial data and migrate:
- mvn jetty:run
+- Once started (and initialized the db), you should stop
+ (next restart of jetty the db migrator will run and insert the initial data)
+ you can start the server using the script:
+ ./script/server
+
+ or directly (windows):
+ mvn jetty:run -Dorg.mortbay.util.FileResource.checkAliases=False
+
+ (TODO: put the aliases stuff into a jetty config file)
+
+
- And connect to http://yourIP:8080/kune
Appendix A: Configuration of maven
Added: trunk/script/server.sh
===================================================================
--- trunk/script/server.sh 2008-12-21 03:20:35 UTC (rev 1008)
+++ trunk/script/server.sh 2008-12-21 03:55:25 UTC (rev 1009)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+mvn jetty:run -Dorg.mortbay.util.FileResource.checkAliases=False
+
+
Property changes on: trunk/script/server.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2008-12-21 03:20:35 UTC (rev 1008)
+++ trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2008-12-21 03:55:25 UTC (rev 1009)
@@ -90,6 +90,9 @@
builder.exclude("/http-bind.*");
builder.exclude("/services/fileupload.*");
builder.exclude("/public/.*");
+ // builder.exclude("/images/.*");
+ // builder.exclude("/stylesheets/.*");
+ // builder.exclude("/javascripts/.*");
builder.at(".*").install(new LogFilter());
builder.at(".*").install(new GuiceFilter());
Modified: trunk/src/main/rails/publicspace/app/views/kunedbg/list.html.erb
===================================================================
--- trunk/src/main/rails/publicspace/app/views/kunedbg/list.html.erb 2008-12-21 03:20:35 UTC (rev 1008)
+++ trunk/src/main/rails/publicspace/app/views/kunedbg/list.html.erb 2008-12-21 03:55:25 UTC (rev 1009)
@@ -1,5 +1,4 @@
-
<table>
<thead><tr>
<% for name in @mclass.column_names -%>
Modified: trunk/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/src/main/webapp/WEB-INF/web.xml 2008-12-21 03:20:35 UTC (rev 1008)
+++ trunk/src/main/webapp/WEB-INF/web.xml 2008-12-21 03:55:25 UTC (rev 1009)
@@ -1,27 +1,11 @@
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
+<?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/j2ee/web-app_2_4.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
<display-name>kune</display-name>
<description>kune</description>
- <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>
-
-
<context-param>
<param-name>jruby.standalone</param-name>
<param-value>true</param-value>
@@ -32,7 +16,8 @@
</context-param>
<context-param>
<param-name>files.prefix</param-name>
- <param-value>/WEB-INF/publicspace/public</param-value>
+ <param-value>/WEB-INF/publicspace/public
+ </param-value>
</context-param>
<context-param>
<param-name>rails.env</param-name>
@@ -52,7 +37,8 @@
<filter>
<filter-name>RackFilter</filter-name>
- <filter-class>org.jruby.rack.RackFilter</filter-class>
+ <filter-class>org.jruby.rack.RackFilter
+ </filter-class>
</filter>
<filter-mapping>
<filter-name>RackFilter</filter-name>
@@ -60,12 +46,34 @@
</filter-mapping>
<listener>
- <listener-class>org.jruby.rack.rails.RailsServletContextListener</listener-class>
+ <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>
+ <servlet-class>de.spieleck.servlets.ProxyServlet
+ </servlet-class>
<init-param>
<param-name>remotePath</param-name>
<param-value>/http-bind/</param-value>
Added: trunk/src/main/webapp/images
===================================================================
--- trunk/src/main/webapp/images 2008-12-21 03:20:35 UTC (rev 1008)
+++ trunk/src/main/webapp/images 2008-12-21 03:55:25 UTC (rev 1009)
@@ -0,0 +1 @@
+link ../rails/publicspace/public/images/
\ No newline at end of file
Property changes on: trunk/src/main/webapp/images
___________________________________________________________________
Name: svn:special
+ *
Added: trunk/src/main/webapp/javascripts
===================================================================
--- trunk/src/main/webapp/javascripts 2008-12-21 03:20:35 UTC (rev 1008)
+++ trunk/src/main/webapp/javascripts 2008-12-21 03:55:25 UTC (rev 1009)
@@ -0,0 +1 @@
+link ../rails/publicspace/public/javascripts/
\ No newline at end of file
Property changes on: trunk/src/main/webapp/javascripts
___________________________________________________________________
Name: svn:special
+ *
Added: trunk/src/main/webapp/stylesheets
===================================================================
--- trunk/src/main/webapp/stylesheets 2008-12-21 03:20:35 UTC (rev 1008)
+++ trunk/src/main/webapp/stylesheets 2008-12-21 03:55:25 UTC (rev 1009)
@@ -0,0 +1 @@
+link ../rails/publicspace/public/stylesheets/
\ No newline at end of file
Property changes on: trunk/src/main/webapp/stylesheets
___________________________________________________________________
Name: svn:special
+ *
More information about the kune-commits
mailing list