[kune-commits] 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
Vicente J. Ruiz Jurado
vjrj_ at ourproject.org
Mon Dec 20 03:20:51 CET 2010
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>
- <!-- Available versions: http://repo1.maven.org/maven2/com/google/gwt/gwt-dev/ -->
- <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>
- <!-- guice -->
- <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>
- <!-- cc -->
- <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>
- <!-- utilities -->
- <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>
- <!-- <version>2.0-SNAPSHOT-g164</version> -->
- <!-- <version>2.0-SNAPSHOT</version> -->
- <!-- <version>2.0-SNAPSHOT-g20s</version> -->
- </dependency>
- <!-- xmpp -->
- <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>
- <!-- mysql -->
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.13</version>
- </dependency>
- <!-- hibernate JPA -->
- <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-ehcache</artifactId>
- <version>3.3.1.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>
- <!-- =roo -->
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- <!-- =roo -->
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <!-- =roo -->
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- <!-- =roo -->
- </dependency>
- <!-- REST: xml and json (stax) -->
- <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>
- <!-- File upload -->
- <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>
- <!-- db upgrades -->
- <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>
- <!-- jetty dependencies -->
- <!-- <dependency> -->
- <!-- <groupId>org.mortbay.jetty</groupId> -->
- <!-- <artifactId>jetty-util</artifactId> -->
- <!-- <version>6.1.11</version> -->
- <!-- <version>7.0.0.pre5</version> -->
- <!-- <scope>provided</scope> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.mortbay.jetty</groupId> -->
- <!-- <artifactId>jetty-maven-plugin</artifactId> -->
- <!-- <version>7.2.1.v20101111</version> -->
- <!-- <artifactId>maven-jetty-plugin</artifactId> <version>6.1.11</version> -->
- <!-- <scope>runtime</scope> -->
- <!-- </dependency> -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <!-- testing dependencies -->
- <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>
- <!-- =roo -->
- <scope>test</scope>
- </dependency>
- <!-- <dependency> -->
- <!-- <groupId>org.openqa.selenium.client-drivers</groupId> -->
- <!-- <artifactId>selenium-java-client-driver</artifactId> -->
- <!-- <version>1.0-beta-1</version> -->
- <!-- <scope>test</scope> -->
- <!-- </dependency> -->
- <!-- public side -->
- <dependency>
- <groupId>org.jruby.rack</groupId>
- <artifactId>jruby-rack</artifactId>
- <version>1.0.3</version>
- <!-- <version>0.9.4</version> -->
- </dependency>
- <!-- wave -->
- <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>dom4j</groupId> -->
- <!-- <artifactId>dom4j</artifactId> -->
- <!-- <version>1.6.1</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>
- <!-- cc -->
- <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>
- <!-- cc -->
- <!-- <pluginRepository> <id>gwt-maven</id> <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url>
- </pluginRepository> -->
- <pluginRepository>
- <id>Codehaus Snapshots</id>
- <url>http://snapshots.repository.codehaus.org/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled> <!-- Workaround for MNG-2974, see note below -->
- </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>
- <!-- cc -->
- <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>
+ <!-- Available versions: http://repo1.maven.org/maven2/com/google/gwt/gwt-dev/ -->
+ <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 at gmail.com</email>
- </developer>
- <developer>
- <name>Samer Hassan</name>
- <email>samer2004 at gmail.com</email>
- </developer>
- <developer>
- <name>Vicente J. Ruiz Jurado</name>
- <email>vjrj at 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>
- <!-- Uncomment and run mvn with -X -e if we have same compile problems
- <compilerArgument>-verbose</compilerArgument> <fork>true</fork> <verbose>true</verbose> -->
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>gwt-maven-plugin</artifactId>
- <version>2.1.0-1</version>
- <executions>
- <execution>
- <configuration>
- <!-- <extraJvmArgs>-Xmx512M</extraJvmArgs> -->
- <soyc>false</soyc>
- <style>OBF</style>
- <inline>true</inline>
- </configuration>
- <goals>
- <!-- gwt:* goals to be executed during build -->
- <goal>compile</goal>
- <!-- http://mojo.codehaus.org/gwt-maven-plugin/user-guide/library.html -->
- <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.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId>
- <version>2.1</version> <executions> <execution> <phase>compile</phase> <goals>
- <goal>exploded</goal> </goals> </execution> </executions> <configuration>
- <webappDirectory>/war</webappDirectory> </configuration> </plugin> -->
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>7.2.1.v20101111</version>
- <!--<artifactId>maven-jetty-plugin</artifactId> <version>6.1.14</version> -->
- <configuration>
- <!-- <contextPath>/</contextPath> -->
- <!-- <webAppSourceDirectory>${basedir}/target/${project.artifactId}-${version}</webAppSourceDirectory> -->
- <!-- <webAppSourceDirectory>war</webAppSourceDirectory> -->
- <webAppSourceDirectory>war</webAppSourceDirectory>
- <reload>manual</reload>
- <scanIntervalSeconds>0</scanIntervalSeconds>
- </configuration>
- </plugin>
- <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>deb-maven-plugin</artifactId>
- <version>1.0-SNAPSHOT</version> <configuration> <description>kune free/open/libre
- collaboration platform</description> <maintainer>Kune Development Team <kune-devel at lists.ourproject.org></maintainer>
- <section>web</section> <priority>optional</priority> <architecture>all</architecture>
- </configuration> <executions> <execution> <goals> <goal>deb</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>
- <!-- <configuration> <verbose>true</verbose> <propertiesFile> src/main/resources/db/liquibase.properties
- </propertiesFile> </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>
- <!-- <include>**/platf/**</include> <include>**/platf/client/extend/**</include>
- <include>**/platf/client/*java</include> <include>**/platf/client/app/**</include>
- <include>**/platf/client/dispatch/**</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.codehaus.mojo</groupId> -->
- <!-- <artifactId>selenium-maven-plugin</artifactId> -->
- <!-- <configuration> -->
- <!-- <port>4441</port> -->
- <!-- </configuration> -->
- <!-- <executions> -->
- <!-- <execution> -->
- <!-- <phase>pre-integration-test</phase> -->
- <!-- <goals> -->
- <!-- <goal>start-server</goal> -->
- <!-- </goals> -->
- <!-- <configuration> -->
- <!-- <background>true</background> -->
- <!-- </configuration> -->
- <!-- </execution> -->
- <!-- </executions> -->
- <!-- </plugin> -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <!-- Skip the normal tests, we'll run them in the integration-test phase -->
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- <plugin> <artifactId>maven-clean-plugin</artifactId> <version>2.2</version>
- <configuration> <filesets> <fileset> <directory>src/main/webapp/gwt/</directory>
- <includes> <include>**/org.ourproject.kune.app.Kune*</include> <followSymlinks>false</followSymlinks>
- </includes> </fileset> </filesets> </configuration> </plugin> -->
- </plugins>
- <!-- <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory> -->
- <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>
- <!-- Activate only when within eclipse -->
- <id>m2eclipse</id>
- <activation>
- <property>
- <name>!m2e.version</name>
- </property>
- </activation>
- <!-- GWT SDK is provided by GWT SDK Classpath Container -->
- <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>
+ <!-- cc -->
+ <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>
+ <!-- cc -->
+ <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>
+ <!-- cc -->
+ <!-- <pluginRepository> <id>gwt-maven</id> <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url>
+ </pluginRepository> -->
+ <pluginRepository>
+ <id>Codehaus Snapshots</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled> <!-- Workaround for MNG-2974, see note below -->
+ </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>
+ <!-- guice -->
+ <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>
+ <!-- cc -->
+ <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>
+ <!-- utilities -->
+ <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>
+ <!-- <version>2.0-SNAPSHOT-g164</version> -->
+ <!-- <version>2.0-SNAPSHOT</version> -->
+ <!-- <version>2.0-SNAPSHOT-g20s</version> -->
+ </dependency>
+ <!-- xmpp -->
+ <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>
+ <!-- mysql -->
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.13</version>
+ </dependency>
+ <!-- hibernate JPA -->
+ <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-ehcache</artifactId>
+ <version>3.3.1.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>
+ <!-- =roo -->
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ <!-- =roo -->
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ <!-- =roo -->
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ <!-- =roo -->
+ </dependency>
+ <!-- REST: xml and json (stax) -->
+ <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>
+ <!-- File upload -->
+ <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>
+ <!-- db upgrades -->
+ <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>
+ <!-- testing dependencies -->
+ <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>
+ <!-- =roo -->
+ <scope>test</scope>
+ </dependency>
+ <!-- <dependency> -->
+ <!-- <groupId>org.openqa.selenium.client-drivers</groupId> -->
+ <!-- <artifactId>selenium-java-client-driver</artifactId> -->
+ <!-- <version>1.0-beta-1</version> -->
+ <!-- <scope>test</scope> -->
+ <!-- </dependency> -->
+ <!-- public side -->
+ <dependency>
+ <groupId>org.jruby.rack</groupId>
+ <artifactId>jruby-rack</artifactId>
+ <version>1.0.3</version>
+ <!-- <version>0.9.4</version> -->
+ </dependency>
+ <!-- wave -->
+ <dependency>
+ <groupId>org.waveprotocol</groupId>
+ <artifactId>kune-wave-server</artifactId>
+ <!-- <version>0.0.3.1</version> -->
+ <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>dom4j</groupId> -->
+ <!-- <artifactId>dom4j</artifactId> -->
+ <!-- <version>1.6.1</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 at gmail.com</email>
+ </developer>
+ <developer>
+ <name>Samer Hassan</name>
+ <email>samer2004 at gmail.com</email>
+ </developer>
+ <developer>
+ <name>Vicente J. Ruiz Jurado</name>
+ <email>vjrj at ourproject.org</email>
+ </developer>
+ </developers>
+ <scm>
+ <url>svn://scm.ourproject.org/svnroot/kune/trunk</url>
+ </scm>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- =roo -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1-beta-1</version>
+ <!-- <configuration> <webXml>target/web.xml</webXml> </configuration> -->
+ </plugin>
+ <plugin>
+ <!-- =roo -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <!-- Uncomment and run mvn with -X -e if we have same compile problems
+ <compilerArgument>-verbose</compilerArgument> <fork>true</fork> <verbose>true</verbose> -->
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- =roo -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.2</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- =roo + custom -->
+ <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 the normal tests, we'll run them in the integration-test
+ phase -->
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!-- =roo -->
+ <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>
+ <!-- =roo sin spring executions -->
+ <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>
+ <!-- =roo -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <!-- =roo -->
+ <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>
+ <!-- =roo -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <version>1.0</version>
+<configuration>
+ <path>/</path>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- =roo -->
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>7.1.2.v20100523</version>
+ <!-- <version>7.2.1.v20101111</version> -->
+ <configuration>
+ <webAppConfig>
+ <!-- FIXME: ws?
+ <contextPath>/${project.name}</contextPath>
+ -->
+ <contextPath>/</contextPath>
+ </webAppConfig>
+ <reload>manual</reload>
+ <scanIntervalSeconds>0</scanIntervalSeconds>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- pensar/probar: openjpa-maven-plugin -->
+ <!-- gwtp & GenEvent need this 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>
+ <!-- =roo -->
+ <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>
+ <!-- http://mojo.codehaus.org/gwt-maven-plugin/user-guide/library.html -->
+ <!-- <goal>resources</goal> -->
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>deb-maven-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version> <configuration> <description>kune free/open/libre
+ collaboration platform</description> <maintainer>Kune Development Team <kune-devel at lists.ourproject.org></maintainer>
+ <section>web</section> <priority>optional</priority> <architecture>all</architecture>
+ </configuration> <executions> <execution> <goals> <goal>deb</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>
+ <!-- <configuration> <verbose>true</verbose> <propertiesFile>
+ src/main/resources/db/liquibase.properties </propertiesFile> </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>-->
+<!-- <include>**/platf/**</include> <include>**/platf/client/extend/**</include> -->
+<!-- <include>**/platf/client/*java</include> <include>**/platf/client/app/**</include> -->
+<!-- <include>**/platf/client/dispatch/**</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.codehaus.mojo</groupId> -->
+ <!-- <artifactId>selenium-maven-plugin</artifactId> -->
+ <!-- <configuration> -->
+ <!-- <port>4441</port> -->
+ <!-- </configuration> -->
+ <!-- <executions> -->
+ <!-- <execution> -->
+ <!-- <phase>pre-integration-test</phase> -->
+ <!-- <goals> -->
+ <!-- <goal>start-server</goal> -->
+ <!-- </goals> -->
+ <!-- <configuration> -->
+ <!-- <background>true</background> -->
+ <!-- </configuration> -->
+ <!-- </execution> -->
+ <!-- </executions> -->
+ <!-- </plugin> -->
+ <!-- <plugin> <artifactId>maven-clean-plugin</artifactId> <version>2.2</version>
+ <configuration> <filesets> <fileset> <directory>src/main/webapp/gwt/</directory>
+ <includes> <include>**/org.ourproject.kune.app.Kune*</include> <followSymlinks>false</followSymlinks>
+ </includes> </fileset> </filesets> </configuration> </plugin> -->
+ </plugins>
+ <!-- <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory> -->
+ <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
+ <!-- <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>
</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%; <!--
- padding: 0px; -->
+ 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">
+ <!-- TODO: Add <servlet> tags for each servlet here. -->
+ <!-- TODO: Add <servlet-mapping> tags for each <servlet> here. -->
+ <!-- TODO: Optionally add a <welcome-file-list> tag to display a welcome
+ file. -->
+ <display-name>ws</display-name>
+ <description>kune workspace</description>
+ <!-- Default page to serve -->
+ <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">
- <!-- TODO: Add <servlet> tags for each servlet here. -->
- <!-- TODO: Add <servlet-mapping> tags for each <servlet> here. -->
- <!-- TODO: Optionally add a <welcome-file-list> tag to display a welcome
- file. -->
- <display-name>ws</display-name>
- <description>kune workspace</description>
- <!-- Default page to serve -->
- <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
More information about the kune-commits
mailing list