svn commit: r499595 - in /ofbiz/trunk/framework: base/config/jetty-containers.xml base/config/ofbiz-containers.xml base/config/test-containers.xml build.xml component-load.xml

Author: jleroux
Date: Wed Jan 24 14:32:45 2007
New Revision: 499595

URL: http://svn.apache.org/viewvc?view=rev&rev=499595
Log:
Revert shark enabling changes commited by error with update of ASL2 headers

Modified:
    ofbiz/trunk/framework/base/config/jetty-containers.xml
    ofbiz/trunk/framework/base/config/ofbiz-containers.xml
    ofbiz/trunk/framework/base/config/test-containers.xml
    ofbiz/trunk/framework/build.xml
    ofbiz/trunk/framework/component-load.xml

Modified: ofbiz/trunk/framework/base/config/jetty-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/jetty-containers.xml?view=diff&rev=499595&r1=499594&r2=499595
==============================================================================
--- ofbiz/trunk/framework/base/config/jetty-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/jetty-containers.xml Wed Jan 24 14:32:45 2007
@@ -58,7 +58,7 @@
     </container>
 
     <!-- load Shark Workflow Engine -->
-    <!-- NOTE: before uncommenting this please see the instructions in the ofbiz/OPTIONAL_LIBRARIES file. -->
+    <!-- NOTE: before uncommenting this please see the instructions in the ofbiz/OPTIONAL_LIBRARIES file.
     <container name="shark-container" class="org.ofbiz.shark.container.SharkContainer">
         <property name="engine-name" value="Shark"/>
         <property name="delegator-name" value="default"/>
@@ -68,7 +68,7 @@
         <property name="iiop-host" value="127.0.0.1"/>
         <property name="iiop-port" value="2000"/>
     </container>
-    <!-- -->
+     -->
 
     <!-- load jetty and all web applications -->
     <container name="jetty-container" class="org.ofbiz.jetty.container.JettyContainer">

Modified: ofbiz/trunk/framework/base/config/ofbiz-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/ofbiz-containers.xml?view=diff&rev=499595&r1=499594&r2=499595
==============================================================================
--- ofbiz/trunk/framework/base/config/ofbiz-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/ofbiz-containers.xml Wed Jan 24 14:32:45 2007
@@ -70,7 +70,7 @@
     -->
 
     <!-- load Shark Workflow Engine -->
-    <!-- NOTE: before uncommenting this please see the instructions in the ofbiz/OPTIONAL_LIBRARIES file. -->
+    <!-- NOTE: before uncommenting this please see the instructions in the ofbiz/OPTIONAL_LIBRARIES file.
     <container name="shark-container" class="org.ofbiz.shark.container.SharkContainer">
         <property name="engine-name" value="Shark"/>
         <property name="delegator-name" value="default"/>
@@ -80,7 +80,7 @@
         <property name="iiop-host" value="127.0.0.1"/>
         <property name="iiop-port" value="2000"/>
     </container>
-    <!-- -->
+    -->
 
     <!-- load catalina (tomcat) and all web applications -->
     <container name="catalina-container" class="org.ofbiz.catalina.container.CatalinaContainer">

Modified: ofbiz/trunk/framework/base/config/test-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/test-containers.xml?view=diff&rev=499595&r1=499594&r2=499595
==============================================================================
--- ofbiz/trunk/framework/base/config/test-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/test-containers.xml Wed Jan 24 14:32:45 2007
@@ -43,7 +43,7 @@
     </container>
 
     <!-- load Shark Workflow Engine -->
-    <!-- NOTE: before uncommenting this please see the instructions in the ofbiz/OPTIONAL_LIBRARIES file. -->
+    <!-- NOTE: before uncommenting this please see the instructions in the ofbiz/OPTIONAL_LIBRARIES file.
     <container name="shark-container" class="org.ofbiz.shark.container.SharkContainer">
         <property name="engine-name" value="Shark"/>
         <property name="delegator-name" value="test"/>
@@ -53,7 +53,7 @@
         <property name="iiop-host" value="127.0.0.1"/>
         <property name="iiop-port" value="2000"/>
     </container>
-    <!-- -->
+     -->
 
     <!-- load JUnit test container -->
     <container name="junit-container" class="org.ofbiz.base.container.JunitContainer">

Modified: ofbiz/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/build.xml?view=diff&rev=499595&r1=499594&r2=499595
==============================================================================
--- ofbiz/trunk/framework/build.xml (original)
+++ ofbiz/trunk/framework/build.xml Wed Jan 24 14:32:45 2007
@@ -27,7 +27,6 @@
                security/build.xml,service/build.xml,entityext/build.xml,
                datafile/build.xml,minilang/build.xml,
                common/build.xml,workflow/build.xml,
-                 shark/build.xml,
                webapp/build.xml,guiapp/build.xml,widget/build.xml,
                testtools/build.xml,
                appserver/build.xml,webtools/build.xml,example/build.xml"/>

Modified: ofbiz/trunk/framework/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/component-load.xml?view=diff&rev=499595&r1=499594&r2=499595
==============================================================================
--- ofbiz/trunk/framework/component-load.xml (original)
+++ ofbiz/trunk/framework/component-load.xml Wed Jan 24 14:32:45 2007
@@ -35,7 +35,7 @@
     <load-component component-location="${ofbiz.home}/framework/widget"/>
     <load-component component-location="${ofbiz.home}/framework/appserver"/>
     <load-component component-location="${ofbiz.home}/framework/workflow"/>
-    <load-component component-location="${ofbiz.home}/framework/shark"/>
+    <!-- load-component component-location="${ofbiz.home}/framework/shark"/-->
     <load-component component-location="${ofbiz.home}/framework/testtools"/>
     <load-component component-location="${ofbiz.home}/framework/webtools"/>
     <load-component component-location="${ofbiz.home}/framework/images"/>