You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fm...@apache.org on 2010/10/15 22:26:31 UTC

svn commit: r1023098 - in /incubator/chemistry/opencmis/trunk: chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/ src/main/assembly/

Author: fmui
Date: Fri Oct 15 20:26:30 2010
New Revision: 1023098

URL: http://svn.apache.org/viewvc?rev=1023098&view=rev
Log:
- fixed workbench start scripts

Modified:
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench.bat
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench.sh
    incubator/chemistry/opencmis/trunk/src/main/assembly/workbench-assembly.xml

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench.bat
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench.bat?rev=1023098&r1=1023097&r2=1023098&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench.bat (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench.bat Fri Oct 15 20:26:30 2010
@@ -18,4 +18,8 @@ rem @version@
 
 cd %~dp0
 
+if exist "lib\@workbench.jar@" goto run
+move /Y lib\chemistry-opencmis-workbench*.jar lib\@workbench.jar@
+
+:run
 start /B javaw -jar lib\@workbench.jar@
\ No newline at end of file

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench.sh
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench.sh?rev=1023098&r1=1023097&r2=1023098&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench.sh (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench.sh Fri Oct 15 20:26:30 2010
@@ -33,4 +33,9 @@ fi
 SCRIPT_DIR=$(dirname $0)
 cd $SCRIPT_DIR
 
-exec $JAVA -jar ./lib/@workbench.jar@ &
\ No newline at end of file
+if ! [ -f lib/@workbench.jar@ ];
+then
+mv -f lib/chemistry-opencmis-workbench*.jar lib/@workbench.jar@
+fi
+
+exec $JAVA -jar lib/@workbench.jar@ &
\ No newline at end of file

Modified: incubator/chemistry/opencmis/trunk/src/main/assembly/workbench-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/src/main/assembly/workbench-assembly.xml?rev=1023098&r1=1023097&r2=1023098&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/src/main/assembly/workbench-assembly.xml (original)
+++ incubator/chemistry/opencmis/trunk/src/main/assembly/workbench-assembly.xml Fri Oct 15 20:26:30 2010
@@ -38,12 +38,20 @@
                 <include>DEPENDENCIES*</include>
             </includes>
         </fileSet>
-        <fileSet>
-            <directory>chemistry-opencmis-workbench/chemistry-opencmis-workbench/target/start</directory>
+    </fileSets>
+    <files>
+        <file>
+            <source>chemistry-opencmis-workbench/chemistry-opencmis-workbench/target/start/workbench.sh</source>
             <outputDirectory></outputDirectory>
+            <lineEnding>unix</lineEnding>
             <fileMode>0755</fileMode>
-        </fileSet>
-    </fileSets>
+        </file>        
+        <file>
+            <source>chemistry-opencmis-workbench/chemistry-opencmis-workbench/target/start/workbench.bat</source>
+            <outputDirectory></outputDirectory>
+            <lineEnding>dos</lineEnding>
+        </file>
+    </files>
   
     <moduleSets>
         <moduleSet>