Author: yurize
Date: Sat Dec 10 16:25:05 2011
New Revision: 1212820
URL: http://svn.apache.org/viewvc?rev=1212820&view=rev
Log:
Updates build.xml - removes artifact creation from dist + updates
README.
Removed:
incubator/wave/trunk/run-client-console.sh
Modified:
incubator/wave/trunk/README
incubator/wave/trunk/build.xml
incubator/wave/trunk/server-config.xml
Modified: incubator/wave/trunk/README
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/README?rev=1212820&r1=1212819&r2=1212820&view=diff
==============================================================================
--- incubator/wave/trunk/README (original)
+++ incubator/wave/trunk/README Sat Dec 10 16:25:05 2011
@@ -1,3 +1,8 @@
+
+"Wave in a Box" (WIAB) project is a stand alone wave server and rich web
client that serves as an Apache Wave reference implementation.
+Apache Wave site: http://incubator.apache.org/wave/
+This project lets developers and enterprise users run wave servers and host
waves on their own hardware. And then share those waves with other wave servers.
+
Build:
This code requires Java 6. If you are on MacOS 10.5 (Leopard) or earlier,
@@ -11,25 +16,40 @@ Wave in a Box uses Ant to build. To run
ant test
</code>
-To build the server, run just
+To run tests and then build the server and client run:
<code>
ant
</code>
-It will be left in dist/waveinabox-X.Y.jar.
+To build the client and server without tests (faster) run:
+<code>
+ ant compile-gwt dist-server
+</code>
+
+
+It will be created in dist/waveinabox-X.Y.jar.
-If you want to use the web client, you will also need to run:
+You need to configure your instance before you can use it. To create a default
simple configuration run:
<code>
- ant compile_gwt
+ ant -f server-config.xml
</code>
-The server can be started by running
+To override default values pass them to the ant script.
+For example, to override wave_server_domain run : ant -f server-config.xml
-Dwave_server_domain=example.com
+Take a look at the server.config.example to learn about configuration and
possible/default values.
+
+The server can be started (on Linux/MacOS) by running
./run-server.sh
-The simple web client will be accessable at
-http://localhost:9898/
+Or, you can run the server from the compiled classes with ant:
+<code>
+ ant run-server
+</code>
+The web client will be accessible at http://localhost:9898/
-To configure the server, copy run-config.sh.example to run-config.sh and edit
-it.
+To learn more about Wave in a Box and Wave Federation Protocol:
+1. Look at the whitepapers folder - the information is a bit old but still
usable.
+2. Watch the Wave Summit videos on YouTube, find the links at:
https://cwiki.apache.org/confluence/display/WAVE/Wave+Summit+Talks
+3. Subscribe to the wave-dev mailing list, find instructions at
http://incubator.apache.org/wave/mailing-lists.html
Wave Protocol communicates using Protocol Buffers
<http://code.google.com/p/protobuf/>
Modified: incubator/wave/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/build.xml?rev=1212820&r1=1212819&r2=1212820&view=diff
==============================================================================
--- incubator/wave/trunk/build.xml (original)
+++ incubator/wave/trunk/build.xml Sat Dec 10 16:25:05 2011
@@ -523,9 +523,8 @@
<touch file="${dep}/stage"/>
</target>
- <target name="dist" depends="test, dist-libraries, dist-server,
- dist-client-console, dist-robot-client-api, compile-gwt"
- description="Compiles, tests and assembles artifacts">
+ <target name="dist" depends="test, compile-gwt, dist-server"
+ description="Compiles, tests and creates the binary executable.">
</target>
<target name="dist-proto" depends="compile-proto" description="Builds the
proto jar">
@@ -653,31 +652,6 @@
<touch file="${dep}/dist-server"/>
</target>
- <target name="dist-client-console" depends="stage" description="Assembles
the Wave in a Box console client">
- <jar destfile="${consoleclient.jar.out}">
- <fileset dir="${staging.dir}">
- <include name="com/google/common/**/*" />
- <include name="com/google/gson/**/*" />
- <include name="com/google/inject/**/*" />
- <include name="com/google/protobuf/**/*" />
- <include name="com/sixfire/websocket/*" />
- <include name="javax/inject/**/*" />
- <include name="jline/**/*" />
- <include name="org/apache/commons/codec/**/*" />
- <include name="org/codehaus/jackson/**/*" />
- <include name="org/waveprotocol/**/*" />
- </fileset>
- <manifest>
- <!-- Application entry point -->
- <attribute name="Main-Class"
- value="org.waveprotocol.box.consoleclient.ConsoleClient"/>
- <attribute name="Implementation-Vendor" value="Google, Inc."/>
- <attribute name="Implementation-Title" value="Wave in a Box Console
Client"/>
- <attribute name="Implementation-Version"
value="${waveinabox.version}"/>
- </manifest>
- </jar>
- </target>
-
<!-- This rule should be run whenever the build configuration (i.e. build
files, libraries) is changed -->
<target name="dist-test" depends="dist, test" description="Runs all the unit
tests in the project against the jar files">
<taskdef name="junit"
classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
Modified: incubator/wave/trunk/server-config.xml
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/server-config.xml?rev=1212820&r1=1212819&r2=1212820&view=diff
==============================================================================
--- incubator/wave/trunk/server-config.xml (original)
+++ incubator/wave/trunk/server-config.xml Sat Dec 10 16:25:05 2011
@@ -7,10 +7,10 @@
<property name="http_frontend_addresses"
value="${http_frontend_public_address}" />
<property name="resource_bases" value="./war" />
- <property name="signer_info_store_type" value="memory" />
+ <property name="signer_info_store_type" value="file" />
<property name="attachment_store_type" value="disk" />
- <property name="account_store_type" value="memory" />
- <property name="delta_store_type" value="memory" />
+ <property name="account_store_type" value="file" />
+ <property name="delta_store_type" value="file" />
<property name="signer_info_store_directory" value="_certificates" />
<property name="attachment_store_directory" value="_attachments" />
<property name="account_store_directory" value="_accounts" />
