You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2006/02/02 21:44:12 UTC

svn commit: r374489 - in /beehive/trunk: beehive-imports.xml distribution.xml user/beehive-runtime.xml user/samples-README.txt

Author: ekoneil
Date: Thu Feb  2 12:44:09 2006
New Revision: 374489

URL: http://svn.apache.org/viewcvs?rev=374489&view=rev
Log:
Tying up distribution loose ends:

- remove web service control JAR from the distribution
- remove web service control source files from the distribution
- remove unused NetUI source code from the distribution (compiler-xdoclet, pageflow-jdk14, simple-tags, testRecorder, tomcat*, etc)
- remove mention of WSM samples from the distribution
- remove wsm runtime target from distribution's ant/beehive-runtime.xml

BB: self
Test: build.dist pass


Modified:
    beehive/trunk/beehive-imports.xml
    beehive/trunk/distribution.xml
    beehive/trunk/user/beehive-runtime.xml
    beehive/trunk/user/samples-README.txt

Modified: beehive/trunk/beehive-imports.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/beehive-imports.xml?rev=374489&r1=374488&r2=374489&view=diff
==============================================================================
--- beehive/trunk/beehive-imports.xml (original)
+++ beehive/trunk/beehive-imports.xml Thu Feb  2 12:44:09 2006
@@ -45,7 +45,11 @@
 
     <fileset id="controls.fileset" file="${beehive.home}/controls/build/jars/beehive-controls.jar"/>
 
-    <fileset id="system-controls.fileset" file="${beehive.home}/system-controls/build/jars/*.jar"/>
+    <fileset id="system-controls.fileset" dir="${beehive.home}/system-controls/build/jars">
+        <include name="beehive-jdbc-control.jar"/>
+        <include name="beehive-jms-control.jar"/>
+        <include name="beehive-ejb-control.jar"/>
+    </fileset>
 
     <fileset id="velocity.fileset" dir="${beehive.home}/external/velocity">
         <include name="velocity-dep-1.4.jar"/>

Modified: beehive/trunk/distribution.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/distribution.xml?rev=374489&r1=374488&r2=374489&view=diff
==============================================================================
--- beehive/trunk/distribution.xml (original)
+++ beehive/trunk/distribution.xml Thu Feb  2 12:44:09 2006
@@ -182,12 +182,24 @@
             <fileset dir="${beehive.home}">
                 <include name="controls/src/**"/>
                 <include name="netui/src/**"/>
-                <include name="system-controls/src/*/**"/>
+                <include name="system-controls/src/ejb/**"/>
+                <include name="system-controls/src/jms/**"/>
+                <include name="system-controls/src/jdbc/**"/>
                 <exclude name="**/.svn/**"/>
                 <exclude name="**/build/**"/>
                 <exclude name="**/*.log"/>
                 <exclude name="**/build.xml"/>
                 <exclude name="**/*.jar"/>
+                <exclude name="system-controls/src/webservice/**"/>
+                <exclude name="netui/src/bootstrap/**"/>
+                <exclude name="netui/src/compiler-xdoclet/**"/>
+                <exclude name="netui/src/jar-assembly/**"/>
+                <exclude name="netui/src/javascript/**"/>
+                <exclude name="netui/src/pageflow-jdk14/**"/>
+                <exclude name="netui/src/simple-tags/**"/>
+                <exclude name="netui/src/testRecorder/**"/>
+                <exclude name="netui/src/tomcat-*/**"/>
+                <exclude name="netui/src/webapp-template/**"/>
             </fileset>
         </copy>
 

Modified: beehive/trunk/user/beehive-runtime.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/user/beehive-runtime.xml?rev=374489&r1=374488&r2=374489&view=diff
==============================================================================
--- beehive/trunk/user/beehive-runtime.xml (original)
+++ beehive/trunk/user/beehive-runtime.xml Thu Feb  2 12:44:09 2006
@@ -53,27 +53,6 @@
         </copy>
     </target>
 
-    <target name="deploy.wsm.webapp.runtime" description="Deploy the Beehive/WSM webapp runtime given a webapp root as -Dwebapp.dir">
-        <available property="webapp.dir.available" file="${webapp.dir}" type="dir"/>
-        <fail unless="webapp.dir.available" message="Can't find the webapp directory ${webapp.dir}"/>
-
-        <echo>Deploy WSM to webapp rooted at: ${webapp.dir}</echo>
-
-        <copy todir="${webapp.dir}/WEB-INF/lib">
-            <fileset dir="../lib/common">
-                <include name="*.jar"/>
-                <exclude name="commons-cli*.jar"/>
-            </fileset>
-            <fileset dir="../lib/controls">
-                <include name="*.jar"/>
-                <exclude name="beehive-*-control.jar"/>
-            </fileset>
-            <fileset dir="../lib/wsm/">
-                <include name="*.jar"/>
-            </fileset>
-        </copy>
-    </target>
-
     <target name="deploy.beehive.controls.runtime" description="Deploy the Beehive Controls runtime given a destination directory as -Ddest.dir">
         <available property="dest.dir.available" file="${dest.dir}" type="dir"/>
         <fail unless="dest.dir.available" message="Can't find the JAR destination directory ${dest.dir}"/>

Modified: beehive/trunk/user/samples-README.txt
URL: http://svn.apache.org/viewcvs/beehive/trunk/user/samples-README.txt?rev=374489&r1=374488&r2=374489&view=diff
==============================================================================
--- beehive/trunk/user/samples-README.txt (original)
+++ beehive/trunk/user/samples-README.txt Thu Feb  2 12:44:09 2006
@@ -3,12 +3,12 @@
 
 This directory contains:
 
-- samples that demonstrate the capabilities of Beehive Controls, Page Flows, and web services
+- samples that demonstrate the capabilities of Beehive Controls and Page Flows
 - application templates you can use as development starting points
 
 Instructions for running these samples are located at:
 
-    http://beehive.apache.org/releases/v1.0m1/samples/index.html
+    http://beehive.apache.org/docs/1.0.1/samples/index.html
 
 and locally at:
 
@@ -24,9 +24,6 @@
        A basic controls enabled web project that demonstrates creating and using Beehive 
        controls via Spring.
 
-    controls-webservices-blank
-       A basic project that creates and builds a web service control from a WSDL.
-
     netui-blank
        A simple Page Flow to be used as a template for building a Page Flow enabled web project.
 
@@ -41,14 +38,4 @@
        This sample demonstrates all three Beehive sub-projects: controls, 
        Page Flows, and web services.  Petstore includes (1) a Page Flow based web site, 
        (2) controls for managing state and data retrieval, and (3) a web service 
-       interface for inventory management.
-
-    wsm-addressbook-enhanced
-       An annotation-aware version of the Apahce Axis AddressBook sample.
-
-    wsm-addressbook-fromWSDL
-       An example of generating annotated web services from an existing WSDL.
-
-    wsm-blank 
-       A simple HelloWorld web service to be used a template for a web services 
-       enabled web project.
+       interface for inventory management.
\ No newline at end of file