Improved openfire connection, debian init and wave offline render and…

… cache.
comunes · Apr 3, 2012 · c26d143 · c26d143
1 parent 0c512bc
commit c26d143
Show file tree

Hide file tree

Showing 26 changed files with 532 additions and 297 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.project b/.project
@@ -1,42 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>kune</name>
-  <comment>kune free/open/libre collaboration platform. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>com.google.gdt.eclipse.core.webAppProjectValidator</name>
-    </buildCommand>
-    <buildCommand>
-      <name>com.google.gwt.eclipse.core.gwtProjectValidator</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.wst.common.project.facet.core.builder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.wst.validation.validationbuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>com.instantiations.assist.eclipse.coverage.instrumentationBuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.recommenders.rcp.analysis.RecommendersBuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-    <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-    <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-    <nature>org.eclipse.ajdt.ui.ajnature</nature>
-    <nature>com.google.gwt.eclipse.core.gwtNature</nature>
-    <nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>
-    <nature>com.instantiations.assist.eclipse.coverage.codeCoverageNature</nature>
-    <nature>org.eclipse.recommenders.rcp.analysis.RecommendersNature</nature>
-  </natures>
-</projectDescription>
+	<name>kune</name>
+	<comment>kune free/open/libre collaboration platform. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.google.gdt.eclipse.core.webAppProjectValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.google.gwt.eclipse.core.gwtProjectValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.instantiations.assist.eclipse.coverage.instrumentationBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.recommenders.rcp.analysis.RecommendersBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.ajdt.ui.ajnature</nature>
+		<nature>com.google.gwt.eclipse.core.gwtNature</nature>
+		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>
+		<nature>com.instantiations.assist.eclipse.coverage.codeCoverageNature</nature>
+		<nature>org.eclipse.recommenders.rcp.analysis.RecommendersNature</nature>
+	</natures>
+</projectDescription>
diff --git a/core/.project b/core/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>kune-core</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/core/.settings/org.eclipse.m2e.core.prefs b/core/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/core/kune-cli/.classpath b/core/kune-cli/.classpath
@@ -0,0 +1,9 @@
+<classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+  <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/org/naturalcli/naturalcli/1.2.3/naturalcli-1.2.3.jar" sourcepath="M2_REPO/org/naturalcli/naturalcli/1.2.3/naturalcli-1.2.3-sources.jar"/>
+</classpath>
diff --git a/core/kune-cli/.project b/core/kune-cli/.project
@@ -0,0 +1,17 @@
+<projectDescription>
+  <name>kune-cli</name>
+  <comment>Kune command line interface</comment>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.m2e.core.maven2Builder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+    <nature>org.eclipse.m2e.core.maven2Nature</nature>
+  </natures>
+</projectDescription>
diff --git a/core/kune-cli/.settings/org.eclipse.jdt.core.prefs b/core/kune-cli/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/core/kune-cli/.settings/org.eclipse.m2e.core.prefs b/core/kune-cli/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/core/kune-cli/pom.xml b/core/kune-cli/pom.xml
@@ -0,0 +1,19 @@
+<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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>kune-core</artifactId>
+    <groupId>cc.kune</groupId>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>kune-cli</artifactId>
+  <description>Kune command line interface</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.naturalcli</groupId>
+      <artifactId>naturalcli</artifactId>
+      <version>1.2.3</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/core/kune-cli/src/main/java/cc/kune/kunecli/KuneCliMain.java b/core/kune-cli/src/main/java/cc/kune/kunecli/KuneCliMain.java
@@ -0,0 +1,74 @@
+/*
+ *
+ * Copyright (C) 2007-2012 The kune development team (see CREDITS for details)
+ * This file is part of kune.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package cc.kune.kunecli;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.naturalcli.Command;
+import org.naturalcli.ExecutionException;
+import org.naturalcli.ICommandExecutor;
+import org.naturalcli.InvalidSyntaxException;
+import org.naturalcli.NaturalCLI;
+import org.naturalcli.ParseResult;
+import org.naturalcli.commands.ExecuteFileCommand;
+import org.naturalcli.commands.HTMLHelpCommand;
+import org.naturalcli.commands.HelpCommand;
+import org.naturalcli.commands.SleepCommand;
+
+public class KuneCliMain {
+
+  public static void main(String[] args) throws InvalidSyntaxException, ExecutionException {
+    Command showDateCommand =
+        new Command(
+          "hello world [<name:string>]", 
+          "Says hello to the world and, may be, especially to some one.", 
+          new ICommandExecutor ()
+          {
+            public void execute(ParseResult pr) 
+            {  
+              System.out.print("Hello world!");
+              String p0 = pr.getParameterValue(0).toString();
+              if (p0 == null)
+                System.out.println();
+              else
+                System.out.println(" And hello especially to "+p0);  
+            }
+          }   
+        );
+    // Create an empty command set
+    Set<Command> cs = new HashSet<Command>();
+
+    // Create the interpreter
+    NaturalCLI nc = new NaturalCLI(cs);
+
+    // Add the commands that can be understood
+    cs.add(showDateCommand);
+    cs.add(new HelpCommand(cs)); // help
+    cs.add(new HTMLHelpCommand(cs)); // htmlhelp
+    cs.add(new SleepCommand());  // sleep <seconds:number> 
+    cs.add(new ExecuteFileCommand(nc)); // execute file <filename:string>
+
+    // Execute the command line 
+    nc.execute(args, 0);
+
+  }
+}
diff --git a/core/pom.xml b/core/pom.xml
@@ -0,0 +1,17 @@
+<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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>cc.kune</groupId>
+  <artifactId>kune-core</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <modules>
+    <module>kune-cli</module>
+  </modules>
+<!--   <repositories> -->
+<!--     <repository> -->
+<!--       <id>kune-maven</id> -->
+<!--       <url>http://kune.ourproject.org/mavenrepo/</url> -->
+<!--     </repository> -->
+<!--   </repositories> -->
+</project>
diff --git a/debian/changelog b/debian/changelog
@@ -1,6 +1,6 @@
 kune (0.1.0+b7) oneiric; urgency=low
 
-  * Improved openfire connection. Improved debian init
+  * Improved openfire connection, debian init andº wave offline render and cache.
 
  -- Vicente J. Ruiz Jurado <[email protected]>  Mon, 02 Apr 2012 22:51:59 +0200