cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dani...@apache.org
Subject svn commit: r234186 - in /cocoon/trunk: cocoon.bat cocoon.sh init.xargs tools/targets/osgi-build.xml
Date Sun, 21 Aug 2005 11:48:45 GMT
Author: danielf
Date: Sun Aug 21 04:48:39 2005
New Revision: 234186

URL: http://svn.apache.org/viewcvs?rev=234186&view=rev
Log:
Making osgi build and execution work again after the library restructing in r225154 :/

Modified:
    cocoon/trunk/cocoon.bat
    cocoon/trunk/cocoon.sh
    cocoon/trunk/init.xargs
    cocoon/trunk/tools/targets/osgi-build.xml

Modified: cocoon/trunk/cocoon.bat
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon.bat?rev=234186&r1=234185&r2=234186&view=diff
==============================================================================
--- cocoon/trunk/cocoon.bat (original)
+++ cocoon/trunk/cocoon.bat Sun Aug 21 04:48:39 2005
@@ -172,7 +172,7 @@
 :: ----- OSGi --------------------------------------------------------
 
 :doOsgiKnopflerfish
-%EXEC% "%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -jar lib/osgi/knopflerfish/knopflerfish-framework-1.3.3.jar
-init %2 %3 %4 %5 %6 %7 %8 %9
+%EXEC% "%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -jar lib/core/knopflerfish-framework-1.3.3.jar
-init %2 %3 %4 %5 %6 %7 %8 %9
 goto end
 
 :: ----- End -------------------------------------------------------------------

Modified: cocoon/trunk/cocoon.sh
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon.sh?rev=234186&r1=234185&r2=234186&view=diff
==============================================================================
--- cocoon/trunk/cocoon.sh (original)
+++ cocoon/trunk/cocoon.sh Sun Aug 21 04:48:39 2005
@@ -174,7 +174,7 @@
   osgi)
         # -init prevents knopflerfish from using its persistent info about bundles, seems
safer for now
         KNOP_OPTIONS="-init"
-        $JAVA $JAVA_OPTIONS -jar lib/osgi/knopflerfish/knopflerfish-framework-1.3.3.jar $KNOP_OPTIONS
$ARGS
+        $JAVA $JAVA_OPTIONS -jar lib/core/knopflerfish-framework-1.3.3.jar $KNOP_OPTIONS
$ARGS
         ;;
 
   *)

Modified: cocoon/trunk/init.xargs
URL: http://svn.apache.org/viewcvs/cocoon/trunk/init.xargs?rev=234186&r1=234185&r2=234186&view=diff
==============================================================================
--- cocoon/trunk/init.xargs (original)
+++ cocoon/trunk/init.xargs Sun Aug 21 04:48:39 2005
@@ -29,9 +29,9 @@
 
 ## Basic KF bundles
 -initlevel 1
--install lib/osgi/knopflerfish/knopflerfish-log_all-1.0.0.jar
--install lib/osgi/knopflerfish/knopflerfish-cm_api-1.0.0.jar
--install lib/osgi/knopflerfish/knopflerfish-console_all-1.0.0.jar
+-install lib/core/knopflerfish-log_all-1.0.0.jar
+-install lib/core/knopflerfish-cm_api-1.0.0.jar
+-install lib/core/knopflerfish-console_all-1.0.0.jar
 
 ## Some library bundles
 -initlevel 2
@@ -40,13 +40,13 @@
 
 ## HTTP Service
 -initlevel 4
--install lib/osgi/knopflerfish/knopflerfish-http_all-1.1.0.jar
+-install lib/core/knopflerfish-http_all-1.1.0.jar
 
 ## console command bundles
 -initlevel 5
--install lib/osgi/knopflerfish/knopflerfish-frameworkcommands-1.0.0.jar
--install lib/osgi/knopflerfish/knopflerfish-logcommands-1.0.0.jar
--install lib/osgi/knopflerfish/knopflerfish-consoletty-1.0.0.jar
+-install lib/core/knopflerfish-frameworkcommands-1.0.0.jar
+-install lib/core/knopflerfish-logcommands-1.0.0.jar
+-install lib/core/knopflerfish-consoletty-1.0.0.jar
 
 -initlevel 7
 -install build/osgi/org.apache.cocoon_webapp_1.0.0.jar
@@ -61,11 +61,11 @@
 # Start of these bundles are delayed since thise makes start
 # order dependencies much easier
 
--start lib/osgi/knopflerfish/knopflerfish-log_all-1.0.0.jar
--start lib/osgi/knopflerfish/knopflerfish-cm_api-1.0.0.jar
--start lib/osgi/knopflerfish/knopflerfish-console_all-1.0.0.jar
--start lib/osgi/knopflerfish/knopflerfish-consoletty-1.0.0.jar
--start lib/osgi/knopflerfish/knopflerfish-frameworkcommands-1.0.0.jar
--start lib/osgi/knopflerfish/knopflerfish-logcommands-1.0.0.jar
--start lib/osgi/knopflerfish/knopflerfish-http_all-1.1.0.jar
+-start lib/core/knopflerfish-log_all-1.0.0.jar
+-start lib/core/knopflerfish-cm_api-1.0.0.jar
+-start lib/core/knopflerfish-console_all-1.0.0.jar
+-start lib/core/knopflerfish-consoletty-1.0.0.jar
+-start lib/core/knopflerfish-frameworkcommands-1.0.0.jar
+-start lib/core/knopflerfish-logcommands-1.0.0.jar
+-start lib/core/knopflerfish-http_all-1.1.0.jar
 -start build/osgi/org.apache.cocoon_servlet_1.0.0.jar

Modified: cocoon/trunk/tools/targets/osgi-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/osgi-build.xml?rev=234186&r1=234185&r2=234186&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/osgi-build.xml (original)
+++ cocoon/trunk/tools/targets/osgi-build.xml Sun Aug 21 04:48:39 2005
@@ -198,6 +198,7 @@
       </fileset>
       <fileset dir="${lib.core}">
         <include name="*.jar"/>
+        <exclude name="knopflerfish-*.jar"/>
       </fileset>
       <fileset dir="${lib.endorsed}">
         <include name="*.jar"/>



Mime
View raw message