svn commit: r1487042 - in /incubator/wave/trunk: build.properties run-server.sh

[al]

Author: al
Date: Tue May 28 19:05:01 2013
New Revision: 1487042

URL: http://svn.apache.org/r1487042
Log:
Make name compatible with requirements

Modified:
    incubator/wave/trunk/build.properties
    incubator/wave/trunk/run-server.sh

Modified: incubator/wave/trunk/build.properties
URL: 
http://svn.apache.org/viewvc/incubator/wave/trunk/build.properties?rev=1487042&r1=1487041&r2=1487042&view=diff
==============================================================================
--- incubator/wave/trunk/build.properties (original)
+++ incubator/wave/trunk/build.properties Tue May 28 19:05:01 2013
@@ -12,7 +12,8 @@
 #
 
 # Current versions
-waveinabox.version=0.3
+name=apache-wave
+waveinabox.version=0.3-incubating
 
 # Build file paths
 build.classpath.path=${basedir}/build-classpath.xml
@@ -53,10 +54,10 @@ dist.dir=${basedir}/dist
 dist.libraries.dir=${basedir}/dist/libraries
 test.out.dir=${basedir}/test_out
 docs.dir=${basedir}/doc
-api.jar.out=${dist.dir}/waveinabox-api-${waveinabox.version}.jar
-server.jar.out=${dist.dir}/waveinabox-server-${waveinabox.version}.jar
-consoleclient.jar.out=${dist.dir}/waveinabox-client-console-${waveinabox.version}.jar
-robotclient.jar.out=${dist.dir}/wave-api-${waveinabox.version}.jar
-export-import.jar.out=${dist.dir}/waveinabox-export-import-${waveinabox.version}.jar
+api.jar.out=${dist.dir}/${name}-api-${waveinabox.version}.jar
+server.jar.out=${dist.dir}/${name}-server-${waveinabox.version}.jar
+consoleclient.jar.out=${dist.dir}/${name}-client-console-${waveinabox.version}.jar
+robotclient.jar.out=${dist.dir}/${name}-wave-api-${waveinabox.version}.jar
+export-import.jar.out=${dist.dir}/${name}-export-import-${waveinabox.version}.jar
 
 missing.dependencies.test=You need to execute the get-third-party target to 
download dependencies required for tests compilation, i.e. ant get-third-party.

Modified: incubator/wave/trunk/run-server.sh
URL: 
http://svn.apache.org/viewvc/incubator/wave/trunk/run-server.sh?rev=1487042&r1=1487041&r2=1487042&view=diff
==============================================================================
--- incubator/wave/trunk/run-server.sh (original)
+++ incubator/wave/trunk/run-server.sh Tue May 28 19:05:01 2013
@@ -22,6 +22,7 @@ fi
 
 # The version of Wave in a Box, extracted from the build.properties file
 WAVEINABOX_VERSION=`sed "s/[\\t ]*=[\\t ]*/=/g" build.properties | grep 
^waveinabox.version= | cut -f2 -d=`
+NAME=`sed "s/[\\t ]*=[\\t ]*/=/g" build.properties | grep ^name= | cut -f2 -d=`
 
 . process-script-args.sh
 
@@ -29,4 +30,4 @@ exec java $DEBUG_FLAGS \
   -Dorg.eclipse.jetty.LEVEL=DEBUG \
   -Djava.security.auth.login.config=jaas.config \
   -Dwave.server.config=server.config \
-  -jar dist/waveinabox-server-$WAVEINABOX_VERSION.jar
+  -jar dist/$NAME-server-$WAVEINABOX_VERSION.jar