svn commit: r1465276 - in /ofbiz/trunk: ./ framework/ framework/appserver/ framework/start/src/org/ofbiz/base/start/ specialpurpose/ specialpurpose/appserver/

[jacopoc]

Author: jacopoc
Date: Sat Apr  6 17:25:01 2013
New Revision: 1465276

URL: http://svn.apache.org/r1465276
Log:
Moved the appserver component from framework to specialpurpose.

Added:
    ofbiz/trunk/specialpurpose/appserver/
      - copied from r1465255, ofbiz/trunk/framework/appserver/
Removed:
    ofbiz/trunk/framework/appserver/
Modified:
    ofbiz/trunk/.classpath
    ofbiz/trunk/build.xml
    ofbiz/trunk/framework/build.xml
    ofbiz/trunk/framework/component-load.xml
    ofbiz/trunk/framework/start/src/org/ofbiz/base/start/setup.properties
    ofbiz/trunk/specialpurpose/appserver/build.xml
    ofbiz/trunk/specialpurpose/appserver/ofbiz-component.xml
    ofbiz/trunk/specialpurpose/build.xml
    ofbiz/trunk/specialpurpose/component-load.xml

Modified: ofbiz/trunk/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1465276&r1=1465275&r2=1465276&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Sat Apr  6 17:25:01 2013
@@ -174,7 +174,7 @@
     <classpathentry excluding="org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java" kind="src" path="applications/securityext/src"/>
     <classpathentry kind="src" path="applications/humanres/src"/>
     <classpathentry kind="src" path="applications/workeffort/src"/>
-    <classpathentry kind="src" path="framework/appserver/src"/>
+    <classpathentry kind="src" path="specialpurpose/appserver/src"/>
     <classpathentry kind="src" path="framework/base/build/gen-src/javacc"/>
     <classpathentry excluding="org/ofbiz/base/config/CoberturaInstrumenter.java" kind="src" path="framework/base/src"/>
     <classpathentry kind="src" path="framework/bi/src"/>

Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1465276&r1=1465275&r2=1465276&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Sat Apr  6 17:25:01 2013
@@ -1054,7 +1054,7 @@ under the License.
         </exec>
         <xmlproperty file="runtime/svninfo_tmp.xml"/>
 
-        <property name="sonar.sources" value="framework/appserver/src, framework/base/src, framework/bi/src,
+        <property name="sonar.sources" value="specialpurpose/appserver/src, framework/base/src, framework/bi/src,
             framework/catalina/src, framework/common/src, framework/datafile/src, framework/entity/src, framework/entityext/src,
             framework/example/src, framework/geronimo/src, framework/jetty/src,
             framework/minilang/src, framework/security/src, framework/service/src, framework/sql/src, framework/start/src,

Modified: ofbiz/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/build.xml?rev=1465276&r1=1465275&r2=1465276&view=diff
==============================================================================
--- ofbiz/trunk/framework/build.xml (original)
+++ ofbiz/trunk/framework/build.xml Sat Apr  6 17:25:01 2013
@@ -30,7 +30,7 @@ under the License.
                webapp/build.xml,widget/build.xml,
                common/build.xml,datafile/build.xml,
                testtools/build.xml,
-               appserver/build.xml,webtools/build.xml"/>
+               webtools/build.xml"/>
 
     <filelist id="test-builds" dir="." files="base/build.xml,sql/build.xml,entity/build.xml"/>
 

Modified: ofbiz/trunk/framework/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/component-load.xml?rev=1465276&r1=1465275&r2=1465276&view=diff
==============================================================================
--- ofbiz/trunk/framework/component-load.xml (original)
+++ ofbiz/trunk/framework/component-load.xml Sat Apr  6 17:25:01 2013
@@ -35,7 +35,6 @@ under the License.
     <load-component component-location="bi"/>
     <load-component component-location="webapp"/>
     <load-component component-location="widget"/>
-    <load-component component-location="appserver"/>
     <load-component component-location="testtools"/>
     <load-component component-location="webtools"/>
     <load-component component-location="images"/>

Modified: ofbiz/trunk/framework/start/src/org/ofbiz/base/start/setup.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/setup.properties?rev=1465276&r1=1465275&r2=1465276&view=diff
==============================================================================
--- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/setup.properties (original)
+++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/setup.properties Sat Apr  6 17:25:01 2013
@@ -39,7 +39,7 @@
 #ofbiz.log.dir=runtime/logs
 
 # --- Location (relative to ofbiz.home) for (normal) container configuration
-ofbiz.container.config=framework/appserver/config/ofbiz-containers.xml
+ofbiz.container.config=specialpurpose/appserver/config/ofbiz-containers.xml
 
 # --- StartupLoader implementations to load (in order)
 ofbiz.start.loader1=org.ofbiz.base.container.ContainerLoader

Modified: ofbiz/trunk/specialpurpose/appserver/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/appserver/build.xml?rev=1465276&r1=1465255&r2=1465276&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/appserver/build.xml (original)
+++ ofbiz/trunk/specialpurpose/appserver/build.xml Sat Apr  6 17:25:01 2013
@@ -30,10 +30,10 @@ under the License.
     <property name="ofbiz.home.dir" value="../.."/>
 
     <path id="local.class.path">
-        <fileset dir="../base/lib" includes="*.jar"/>
-        <fileset dir="../start/build/lib" includes="*.jar"/>
-        <fileset dir="../base/build/lib" includes="*.jar"/>
-        <fileset dir="../webapp/lib" includes="*.jar"/>
-        <fileset dir="../webapp/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib" includes="*.jar"/>
+        <fileset dir="../../framework/start/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/base/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/webapp/lib" includes="*.jar"/>
+        <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
     </path>
 </project>

Modified: ofbiz/trunk/specialpurpose/appserver/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/appserver/ofbiz-component.xml?rev=1465276&r1=1465255&r2=1465276&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/appserver/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/appserver/ofbiz-component.xml Sat Apr  6 17:25:01 2013
@@ -18,7 +18,7 @@ specific language governing permissions
 under the License.
 -->
 
-<ofbiz-component name="appservers"
+<ofbiz-component name="appservers" enabled="true"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>

Modified: ofbiz/trunk/specialpurpose/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/build.xml?rev=1465276&r1=1465275&r2=1465276&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/build.xml (original)
+++ ofbiz/trunk/specialpurpose/build.xml Sat Apr  6 17:25:01 2013
@@ -22,6 +22,7 @@
     <import file="../macros.xml"/>
     <filelist id="specialpurpose-builds" dir="."
         files="
+        appserver/build.xml,
         ecommerce/build.xml,
         pos/build.xml,
         hhfacility/build.xml,

Modified: ofbiz/trunk/specialpurpose/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/component-load.xml?rev=1465276&r1=1465275&r2=1465276&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/component-load.xml (original)
+++ ofbiz/trunk/specialpurpose/component-load.xml Sat Apr  6 17:25:01 2013
@@ -20,6 +20,7 @@ under the License.
 
 <component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd">
+    <load-component component-location="appserver"/>
     <load-component component-location="ecommerce"/>
     <load-component component-location="pos"/>
     <load-component component-location="hhfacility"/>