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 2005/09/20 08:16:22 UTC
svn commit: r290371 - in /beehive/branches/v1/final: ./ ant/ docs/dist-docs/
docs/forrest/release/src/documentation/content/xdocs/
docs/forrest/release/src/documentation/content/xdocs/controls/
docs/forrest/release/src/documentation/content/xdocs/infra...
Author: ekoneil
Date: Mon Sep 19 23:16:11 2005
New Revision: 290371
URL: http://svn.apache.org/viewcvs?rev=290371&view=rev
Log:
Remove WSM and the web service control from the Beehive 1.0 branch.
BB: self
Test: Beehive DRT and build.dist pass; manual checking to ensure removal of WSM APIs, Ant targets, JARs, and documentation
Removed:
beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/system-controls/webservices/
beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/wsm/
Modified:
beehive/branches/v1/final/ant/beehive-tools.xml
beehive/branches/v1/final/beehive-imports.xml
beehive/branches/v1/final/distribution.xml
beehive/branches/v1/final/docs/dist-docs/README.txt
beehive/branches/v1/final/docs/dist-docs/toplvl-readme-trailer.txt
beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/controls/containment.xml
beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/index.xml
beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/infra/beehive-ant-macros.xml
beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/samples/index.xml
beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/site.xml
beehive/branches/v1/final/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml
beehive/branches/v1/final/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build-svn.xml
beehive/branches/v1/final/samples/wsm-blank/WEB-INF/src/build-svn.xml
beehive/branches/v1/final/samples/wsm-employee/WEB-INF/src/build-svn.xml
beehive/branches/v1/final/samples/wsm-samples/WEB-INF/src/build-svn.xml
beehive/branches/v1/final/system-controls/test/src/webservice/build.xml
beehive/branches/v1/final/user/beehive-imports.xml
beehive/branches/v1/final/user/beehive-runtime.xml
beehive/branches/v1/final/user/samples-README.txt
beehive/branches/v1/final/wsm/build.xml
beehive/branches/v1/final/wsm/test/build.xml
Modified: beehive/branches/v1/final/ant/beehive-tools.xml
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/ant/beehive-tools.xml?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/ant/beehive-tools.xml (original)
+++ beehive/branches/v1/final/ant/beehive-tools.xml Mon Sep 19 23:16:11 2005
@@ -130,33 +130,6 @@
</sequential>
</macrodef>
- <!-- This macrodef is intended for the compilation of the *web services" portions of a web application. -->
- <macrodef name="build-webservices">
- <attribute name="srcdir"/>
- <attribute name="destdir"/>
- <attribute name="tempdir"/>
- <attribute name="classpathref"/>
- <sequential>
- <taskdef name="apt"
- classname="org.apache.beehive.controls.runtime.generator.AptTask"
- classpathref="apt.task.classpath"
- onerror="fail" />
-
- <path id="_webservices.build.classpath">
- <path refid="@{classpathref}"/>
- </path>
-
- <apt srcdir="@{srcdir}"
- destdir="@{destdir}"
- gendir="@{tempdir}"
- classpathref="_webservices.build.classpath"
- compileByExtension="true"
- srcExtensions="*.java,*.jcx,*.jcs,*.jws"
- debug="true" />
- </sequential>
- </macrodef>
-
-
<!-- create a jar of a control -->
<taskdef name="control-jar"
classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
Modified: beehive/branches/v1/final/beehive-imports.xml
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/beehive-imports.xml?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/beehive-imports.xml (original)
+++ beehive/branches/v1/final/beehive-imports.xml Mon Sep 19 23:16:11 2005
@@ -29,7 +29,7 @@
<property name="ant.dir" location="${os.ANT_HOME}"/>
<property name="forrest.dir" location="${os.FORREST_HOME}"/>
- <property name="beehive.version" value="svn-snapshot"/>
+ <property name="beehive.version" value="1.0-final"/>
<property name="dist.base.name" value="apache-beehive-"/>
<property name="dist.name" value="${dist.base.name}${beehive.version}"/>
Modified: beehive/branches/v1/final/distribution.xml
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/distribution.xml?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/distribution.xml (original)
+++ beehive/branches/v1/final/distribution.xml Mon Sep 19 23:16:11 2005
@@ -82,9 +82,6 @@
<copy todir="${samples.verify.dir}">
<fileset dir="${dist.dir}"/>
</copy>
-<!--
- <ant antfile="${samples.verify.dir}/samples/wsm-blank/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
--->
<ant antfile="${samples.verify.dir}/samples/netui-blank/build.xml" target="build" inheritAll="false"/>
<ant antfile="${samples.verify.dir}/samples/controls-blank/build.xml" target="build" inheritAll="false"/>
@@ -98,12 +95,6 @@
<property name="myfaces.dir" location="${myfaces.dir}"/>
</ant>
-<!--
- <ant antfile="${samples.verify.dir}/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
- <ant antfile="${samples.verify.dir}/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build.xml" target="all" inheritAll="false"/>
- <ant antfile="${samples.verify.dir}/samples/controls-webservices-blank/build.xml" target="build" inheritAll="false"/>
--->
-
<ant antfile="${samples.verify.dir}/samples/controls-spring/integration/build.xml" target="build" inheritAll="false"/>
<ant antfile="${samples.verify.dir}/samples/controls-spring/web/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
</target>
@@ -121,18 +112,10 @@
<copy todir="${lib.dir}/controls" failOnError="true">
<fileset refid="controls.fileset"/>
- <fileset refid="system-controls.fileset"/>
- </copy>
-
- <!-- todo: this needs to be cleaned up; axis shouldn't be in the Beehive distribution -->
- <copy todir="${lib.dir}/wsm" failOnError="true">
- <fileset dir="${beehive.home}/wsm/external">
- <include name="**/*.jar"/>
- <exclude name="commons-codec.jar"/>
- <exclude name="commons-discovery.jar"/>
- <exclude name="commons-logging.jar"/>
+ <fileset dir="system-controls/build/jars">
+ <include name="*.jar"/>
+ <exclude name="beehive-webservice-control.jar"/>
</fileset>
- <fileset dir="${beehive.home}/wsm/build/jars" includes="**/*.jar"/>
</copy>
<copy todir="${lib.dir}/netui" failOnError="true" flatten="true">
@@ -145,10 +128,6 @@
<exclude name="WEB-INF/lib/commons-discovery-0.2.jar"/>
<exclude name="WEB-INF/lib/commons-logging.jar"/>
<exclude name="WEB-INF/lib/beehive-controls.jar"/>
- <exclude name="WEB-INF/lib/beehive-jdbc-control.jar"/>
- <exclude name="WEB-INF/lib/beehive-ejb-control.jar"/>
- <exclude name="WEB-INF/lib/beehive-wsm-control.jar"/>
- <exclude name="WEB-INF/lib/beehive-jms-control.jar"/>
<exclude name="WEB-INF/lib/log4j*.jar"/>
<include name="WEB-INF/*.tld"/>
</fileset>
@@ -198,8 +177,9 @@
<fileset dir="${beehive.home}">
<include name="controls/src/**"/>
<include name="netui/src/**"/>
- <include name="wsm/src/**"/>
- <include name="system-controls/src/*/**"/>
+ <include name="system-controls/src/*/**">
+ <exclude name="system-controls/src/webservice/**"/>
+ </include>
<exclude name="**/.svn/**"/>
<exclude name="**/build/**"/>
<exclude name="**/*.log"/>
@@ -293,43 +273,6 @@
</fileset>
</copy>
- <!-- Build the sample: wsm-blank -->
-<!--
- <copy todir="${dist.dir}/samples/wsm-blank" failOnError="true">
- <fileset dir="samples/wsm-blank">
- <exclude name="WEB-INF/src/build*svn.xml"/>
- </fileset>
- </copy>
--->
-
- <!-- Build the sample: controls-webservices-blank -->
-<!--
- <copy todir="${dist.dir}/samples/controls-webservices-blank" failOnError="true">
- <fileset dir="samples/controls-webservices-blank">
- <exclude name="build*svn.xml"/>
- <exclude name="systemcontrols-imports.xml"/>
- </fileset>
- </copy>
--->
-
- <!-- Build the sample: wsm-addressbook-enhanced -->
-<!--
- <copy todir="${dist.dir}/samples/wsm-addressbook-enhanced" failOnError="true">
- <fileset dir="samples/wsm-addressbook-enhanced">
- <exclude name="WEB-INF/src/build*svn.xml"/>
- </fileset>
- </copy>
--->
-
- <!-- Build the sample: wsm-addressbook-enhanced -->
-<!--
- <copy todir="${dist.dir}/samples/wsm-addressbook-fromWSDL" failOnError="true">
- <fileset dir="samples/wsm-addressbook-fromWSDL">
- <exclude name="WEB-INF/src/build*svn.xml"/>
- </fileset>
- </copy>
--->
-
<!-- copy samples README.txt -->
<copy tofile="${dist.dir}/samples/README.txt" failOnError="true">
<fileset file="user/samples-README.txt"/>
@@ -388,7 +331,6 @@
<copy todir="${release.docs.build.dir}/apidocs" failOnError="true">
<fileset dir="controls/build/docs/apidocs"/>
<fileset dir="netui/build/docs/apidocs"/>
- <fileset dir="wsm/build/docs/apidocs"/>
<fileset dir="system-controls/build/docs/apidocs"/>
</copy>
Modified: beehive/branches/v1/final/docs/dist-docs/README.txt
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/docs/dist-docs/README.txt?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/docs/dist-docs/README.txt (original)
+++ beehive/branches/v1/final/docs/dist-docs/README.txt Mon Sep 19 23:16:11 2005
@@ -1,35 +1,31 @@
-
-
-APACHE BEEHIVE
+Apache Beehive
+==============
- Welcome to Beehive!
+Welcome to Beehive!
What is Beehive?
================
- The goal of Beehive is to make J2EE programming easier by using JSR-175 metadata annotations
- to simplify the most complex J2EE coding tasks. Beehive is divided into three
- sub-projects:
-
- Page Flows -- Page Flows are built on top of Struts. The JSR-175 programming model
- allows for automatic updating of Struts configuration files as well as
- easy tooling inside of IDEs.
-
- Controls -- Controls are a framework for building lightweight J2EE components.
+The goal of Beehive is to make J2EE programming easier by using JSR-175 metadata annotations
+to simplify the most complex J2EE coding tasks. Beehive is divided into three
+sub-projects:
+
+ Page Flows -- Page Flows are built on top of Struts. The JSR-175 programming model
+ allows for automatic updating of Struts configuration files as well as
+ easy tooling inside of IDEs.
- Web Services -- The web services project implements JSR-181, a metadata annotation
- driven programming model for web services.
+ Controls -- Controls are a framework for building lightweight J2EE components.
Documentation
=============
- Complete documentation, including a users guide, tutorials, and instructions for running samples,
- is available locally at
+Complete documentation, including a users guide, tutorials, and instructions for running samples,
+is available locally at:
- BEEHIVE_HOME/docs/index.html
+ <beehive-root>/docs/index.html
- and online at
+and online at:
- http://beehive.apache.org/index.html
+ http://beehive.apache.org/
Modified: beehive/branches/v1/final/docs/dist-docs/toplvl-readme-trailer.txt
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/docs/dist-docs/toplvl-readme-trailer.txt?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/docs/dist-docs/toplvl-readme-trailer.txt (original)
+++ beehive/branches/v1/final/docs/dist-docs/toplvl-readme-trailer.txt Mon Sep 19 23:16:11 2005
@@ -2,8 +2,8 @@
Download
------------
Please download
- apache-beehive-svn-snapshot-*.{tar.gz or zip}
- apache-beehive-svn-snapshot-lib-*.{tar.gz or zip}
+ apache-beehive-1.0-final.{tar.gz or zip}
+ apache-beehive-1.0-final-lib-*.{tar.gz or zip}
And also a local copy of the documentation if you wish
- apache-beehive-svn-snapshot-docs-*.{tar.gz or zip}
+ apache-beehive-1.0-final-docs-*.{tar.gz or zip}
Modified: beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/controls/containment.xml
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/controls/containment.xml?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/controls/containment.xml (original)
+++ beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/controls/containment.xml Mon Sep 19 23:16:11 2005
@@ -17,7 +17,7 @@
<ul>
<li>Servlet Container</li>
<li>EJB Container</li>
- <li>Web Services (WSM)</li>
+ <li>Web Services</li>
<li>Client JVM</li>
<li>JUnit Test Container (standalone testing)</li>
<li>...</li>
Modified: beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/index.xml?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/index.xml (original)
+++ beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/index.xml Mon Sep 19 23:16:11 2005
@@ -2,7 +2,7 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
<document>
<header>
- <title>Beehive $VERSION Documentation</title>
+ <title>Beehive 1.0 Documentation</title>
</header>
<body>
<p>
@@ -29,35 +29,27 @@
complexity of being a client of enterprise resources. Controls provide a unified client abstraction that
can be implemented to access a diverse set of enterprise resources using a single configuration model.
</li>
- <li>
- <strong>Web Service Metadata (WSM)</strong>: An implementation of <a href="site:jsr/n181">JSR 181</a> which
- standardizes a simplified, annotation-driven model for building Java web services.
- </li>
</ul>
<p>
In addition, Beehive includes a set of <em>system controls</em> that are abstractions for low-level J2EE resource APIs such
- as EJB, JMS, JDBC, and web services.
+ as EJB, JMS, and JDBC.
</p>
<p>
The Beehive documentation package contains tutorials, user guies, samples, and project templates for getting started building
- various kinds of applications. If you are new to Beehive, the overview documentation for NetUI, Controls, and WSM are
+ various kinds of applications. If you are new to Beehive, the overview documentation for NetUI and Controls are
good starting points:
</p>
<ul>
<li><a href="site:control_overview">Controls</a></li>
<li><a href="site:pageflow_overview">NetUI</a></li>
- <li><a href="site:wsm_overview">Web Service Metadata</a></li>
</ul>
<p>
To get started building Beehive-enabled projects, follow the <a href="site:setup">Setup</a> instructions and look at the
- Beehive <strong>project templates</strong> which are skeletons for building new Beehive-enabled web, control, and web
- service projects:
+ Beehive <strong>project templates</strong> which are skeletons for building new Beehive-enabled web and control projects:
</p>
<ul>
<li><a href="site:netui-blank">Blank NetUI</a></li>
<li><a href="site:control-blank">Blank Control</a></li>
- <li><a href="site:wsm-blank">Web Service Metadata</a></li>
- <li><a href="site:ws-control-blank">Web Service Control</a></li>
</ul>
<p>
More detailed information on starting projects is available in the <strong>getting started</strong> guides:
@@ -65,7 +57,6 @@
<ul>
<li><a href="site:control_getting_started">Controls</a></li>
<li><a href="site:pageflow_getting_started">NetUI</a></li>
- <li><a href="site:wsm_getting_started">Web Service metadata</a></li>
</ul>
<p>
The <strong>tutorials</strong> are end-to-end examples of how to build projects with Beehive features:
@@ -73,7 +64,6 @@
<ul>
<li><a href="site:tutorial_control">Controls</a></li>
<li><a href="site:tutorial_pageflow">NetUI</a></li>
- <li><a href="site:wsm/tutorial">Web Service Metadata</a></li>
</ul>
<p>
The <strong>samples</strong> are another good starting point for learning about Beehive.
@@ -82,8 +72,6 @@
<li><a href="site:petstore">Petstore Sample</a></li>
<li><a href="site:netui-samples">NetuI Samples</a></li>
<li><a href="site:netui-jsf">NetUI + JSF Integration</a></li>
- <li><a href="site:address-enhanced">Web Service Metadata: AddressBook</a></li>
- <li><a href="site:address-wsdl">Web Service Metadata: Address Book starting with WSDL</a></li>
</ul>
</body>
<footer>
Modified: beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/infra/beehive-ant-macros.xml
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/infra/beehive-ant-macros.xml?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/infra/beehive-ant-macros.xml (original)
+++ beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/infra/beehive-ant-macros.xml Mon Sep 19 23:16:11 2005
@@ -180,59 +180,5 @@
<source><build-schemas srcdir="WEB-INF/schemas" destdir="WEB-INF/classes"/></source>
</section>
</section>
- <section id="buildWebservices">
- <title>The build-webservices Ant Macro</title>
- <p>This macro is intended for the compilation of the <strong>web service</strong> portions of a web application.
- This macro will <strong>not</strong> compile controls inside of a web application. If the web application
- contains controls, they must be compiled first using the <code>build-controls</code> macro (see above).
- 0nce the compilation of the controls is complete, the web servcies within the web app can be compiled.</p>
-
- <p><code>build-webservices</code> accepts the following pararmeters:</p>
- <table>
- <tr><th>Parameter Name</th><th>Required</th><th>Description</th></tr>
- <tr>
- <td>srcdir</td>
- <td>Yes</td>
- <td>The directory containing web services to build.</td>
- </tr>
- <tr>
- <td>destdir</td>
- <td>Yes</td>
- <td>The destination directory for the compiled web service files.</td>
- </tr>
- <tr>
- <td>tempdir</td>
- <td>Yes</td>
- <td>A temporary directory for any generated java files.</td>
- </tr>
- <tr>
- <td>classpathref</td>
- <td>Yes</td>
- <td>A classpath reference for building the web service files. Required.</td>
- </tr>
- </table>
-
- <section>
- <title>Sample</title>
- <p>
- The following project has a source directory, a destination directory, and a temporary directory for
- generated files.
- </p>
- <source>
-project
- build
- classes
- src
- tempsrc </source>
- <p>
- For this project, the <code>build-webservices</code> call would look like this:
- </p>
- <source>
-<build-webservices srcdir="project/src"
- destdir="project/build/classes"
- tempdir="project/tempsrc"
- classpathref="<em>build.classpath</em>"/></source>
- </section>
- </section>
</body>
</document>
Modified: beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/samples/index.xml
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/samples/index.xml?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/samples/index.xml (original)
+++ beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/samples/index.xml Mon Sep 19 23:16:11 2005
@@ -17,12 +17,6 @@
<li>
<a href="site:netui-jsf">NetUI: JSF Integration</a>
</li>
- <li>
- <a href="site:address-enhanced">Web Service: AddressBook Enhanced</a>
- </li>
- <li>
- <a href="site:address-wsdl">Web Service: AddressBook from WSDL</a>
- </li>
</ul>
<p>
<strong>Project Templates</strong>
@@ -33,12 +27,6 @@
</li>
<li>
<a href="site:control-blank">Project: Control</a>
- </li>
- <li>
- <a href="site:wsm-blank">Project: Web Service</a>
- </li>
- <li>
- <a href="site:ws-control-blank">Project: Web Service Control</a>
</li>
</ul>
</body>
Modified: beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/site.xml?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/site.xml (original)
+++ beehive/branches/v1/final/docs/forrest/release/src/documentation/content/xdocs/site.xml Mon Sep 19 23:16:11 2005
@@ -107,26 +107,14 @@
<ejb_control label="EJB Control" href="system-controls/ejb/ejbDoc.html"/>
<jdbc_control label="JDBC Control" href="system-controls/jdbc/jdbcControlDevGuide.html"/>
<jms_control label="JMS Control" href="system-controls/jms/jmsDoc.html"/>
- <webservices_control label="Web Services Control" href="system-controls/webservices/webservicesDoc.html"/>
</controls>
- <wsm label="Web Services">
- <wsm_getting_started label="Getting Started" href="wsm/getting_started.html"/>
- <wsm_overview label="Overview" href="wsm/wsm_overview.html"/>
- <tutorial label="Tutorial" href="wsm/tutorial_wsm.html"/>
- <jws_files label="Java Web Services" href="wsm/wsm_JWSFiles.html"/>
- <supported_datatypes label="Supported Data Types" href="wsm/datatypes.html"/>
- </wsm>
<samples label="Samples">
<sam_index label="Overview" href="samples/index.html"/>
<petstore label="Petstore" href="samples/petstore.html"/>
<netui-samples label="NetUI Samples" href="netui/netui-samples.html"/>
<netui-jsf label="NetUI: JSF Integration" href="netui/sample_jpf_jsf_integration.html"/>
- <address-enhanced label="Web Service: AddressBook Enhanced" href="wsm/sample_AddressBookEnhanced.html"/>
- <address-wsdl label="Web Service: AddressBook from WSDL" href="wsm/sample_AddressBookFromWSDL.html"/>
<netui-blank label="Project: NetUI" href="netui/sample_netui-blank.html"/>
<control-blank label="Project: Control" href="controls/sampleControlsBlank.html"/>
- <wsm-blank label="Project: Web Service" href="wsm/sample_wsm-blank.html"/>
- <ws-control-blank label="Project: Web Service Control" href="system-controls/webservices/sample-ws-control-blank.html" />
</samples>
<reference label="Reference">
<infra label="Build Tools">
@@ -148,10 +136,6 @@
<config_id_javascript href="#id-javascript" />
</config>
</netui>
- <ws label="Web Services">
- <annotations label="Annotations" href="wsm/annotations/wsm_annotations.html"/>
- <javadoc label="API Javadoc" href="apidocs/classref_wsm/index.html"/>
- </ws>
<system-controls label="System Controls">
<ejb_control_reference label="EJB">
<annotations label="Annotations" href="system-controls/ejb/ejb-annotations.html"/>
@@ -165,15 +149,10 @@
<annotations label="Annotations" href="system-controls/jms/jms-annotations.html"/>
<javadoc label="API Javadoc" href="apidocs/classref_systemcontrol/index.html"/>
</jms_control_reference>
- <ws_control_reference label="Web Service">
- <annotations label="Annotations" href="system-controls/webservices/webservices-annotations.html"/>
- <javadoc label="API Javadoc" href="apidocs/classref_systemcontrol/index.html"/>
- </ws_control_reference>
</system-controls>
<javadoc label="API Javadoc">
<controls label="Controls" href="apidocs/classref_controls/index.html"/>
<netui label="NetUI" href="apidocs/classref_netui/index.html"/>
- <wsm label="Web Services" href="apidocs/classref_wsm/index.html"/>
<system-controls label="System Controls" href="apidocs/classref_systemcontrols/index.html"/>
</javadoc>
</reference>
Modified: beehive/branches/v1/final/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml (original)
+++ beehive/branches/v1/final/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml Mon Sep 19 23:16:11 2005
@@ -21,6 +21,7 @@
<project name="Enhanced Address Book Sample" default="build" basedir=".">
<import file="../../../../beehive-imports.xml" />
+ <import file="../../../../wsm/build.xml" />
<property name="service.name" value="EnhancedAddressBook" />
Modified: beehive/branches/v1/final/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build-svn.xml
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build-svn.xml?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build-svn.xml (original)
+++ beehive/branches/v1/final/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build-svn.xml Mon Sep 19 23:16:11 2005
@@ -22,6 +22,7 @@
<import file="../../../../beehive-imports.xml" />
<import file="../../../../ant/beehive-tools.xml" />
+ <import file="../../../../wsm/build.xml" />
<property name="service.name" value="fromWSDL" />
<property name="webapp.dir" location="../.." />
Modified: beehive/branches/v1/final/samples/wsm-blank/WEB-INF/src/build-svn.xml
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/samples/wsm-blank/WEB-INF/src/build-svn.xml?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/samples/wsm-blank/WEB-INF/src/build-svn.xml (original)
+++ beehive/branches/v1/final/samples/wsm-blank/WEB-INF/src/build-svn.xml Mon Sep 19 23:16:11 2005
@@ -22,6 +22,7 @@
<import file="../../../../beehive-imports.xml" />
<import file="../../../../ant/beehive-tools.xml" />
+ <import file="../../../../wsm/build.xml" />
<property name="service.name" value="blank" />
Modified: beehive/branches/v1/final/samples/wsm-employee/WEB-INF/src/build-svn.xml
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/samples/wsm-employee/WEB-INF/src/build-svn.xml?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/samples/wsm-employee/WEB-INF/src/build-svn.xml (original)
+++ beehive/branches/v1/final/samples/wsm-employee/WEB-INF/src/build-svn.xml Mon Sep 19 23:16:11 2005
@@ -21,6 +21,7 @@
<project name="Employee Sample" default="build" basedir=".">
<import file="../../../../beehive-imports.xml" />
+ <import file="../../../../wsm/build.xml" />
<property name="service.name" value="Employee" />
Modified: beehive/branches/v1/final/samples/wsm-samples/WEB-INF/src/build-svn.xml
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/samples/wsm-samples/WEB-INF/src/build-svn.xml?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/samples/wsm-samples/WEB-INF/src/build-svn.xml (original)
+++ beehive/branches/v1/final/samples/wsm-samples/WEB-INF/src/build-svn.xml Mon Sep 19 23:16:11 2005
@@ -22,6 +22,7 @@
<import file="../../../../beehive-imports.xml" />
<import file="../../../../ant/beehive-tools.xml" />
+ <import file="../../../../wsm/build.xml" />
<property name="service.name" value="wsm-samples" />
Modified: beehive/branches/v1/final/system-controls/test/src/webservice/build.xml
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/system-controls/test/src/webservice/build.xml?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/system-controls/test/src/webservice/build.xml (original)
+++ beehive/branches/v1/final/system-controls/test/src/webservice/build.xml Mon Sep 19 23:16:11 2005
@@ -21,6 +21,7 @@
<property environment="os"/>
<import file="../../../systemcontrols-imports.xml"/>
+ <import file="../../../../wsm/build.xml"/>
<!-- client properties -->
<property name="junit-source.dir" location="tests"/>
Modified: beehive/branches/v1/final/user/beehive-imports.xml
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/user/beehive-imports.xml?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/user/beehive-imports.xml (original)
+++ beehive/branches/v1/final/user/beehive-imports.xml Mon Sep 19 23:16:11 2005
@@ -40,28 +40,11 @@
<pathelement location="${this.dir}/lib/common/velocity-dep-1.4.jar"/>
</path>
-<!--
- <path id="xbean.dependency.path">
- <pathelement location="${this.dir}/lib/common/apache-xbean.jar"/>
- <pathelement location="${this.dir}/lib/common/jsr173_1.0_api.jar"/>
- </path>
--->
-
<macrodef name="deploy-netui">
<attribute name="webappDir"/>
<sequential>
<echo>Deploy NetUI to webapp @{webappDir}</echo>
<ant antfile="${this.dir}/ant/beehive-runtime.xml" target="deploy.beehive.webapp.runtime" inheritAll="false">
- <property name="webapp.dir" location="@{webappDir}"/>
- </ant>
- </sequential>
- </macrodef>
-
- <macrodef name="deploy-wsm">
- <attribute name="webappDir"/>
- <sequential>
- <echo>Deploy WSM to webapp @{webappDir}</echo>
- <ant antfile="${this.dir}/ant/beehive-runtime.xml" target="deploy.wsm.webapp.runtime" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
</ant>
</sequential>
Modified: beehive/branches/v1/final/user/beehive-runtime.xml
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/user/beehive-runtime.xml?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/user/beehive-runtime.xml (original)
+++ beehive/branches/v1/final/user/beehive-runtime.xml Mon Sep 19 23:16:11 2005
@@ -48,27 +48,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/branches/v1/final/user/samples-README.txt
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/user/samples-README.txt?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/user/samples-README.txt (original)
+++ beehive/branches/v1/final/user/samples-README.txt Mon Sep 19 23:16:11 2005
@@ -3,16 +3,16 @@
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/releases/v1.0/samples/index.html
and locally at:
- <BeehiveRoot>/docs/samples/index.html
+ <beehive-root>/docs/samples/index.html
The following list describes the function of each sample.
@@ -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.
@@ -42,13 +39,3 @@
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.
Modified: beehive/branches/v1/final/wsm/build.xml
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/wsm/build.xml?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/wsm/build.xml (original)
+++ beehive/branches/v1/final/wsm/build.xml Mon Sep 19 23:16:11 2005
@@ -259,4 +259,30 @@
<ant dir="test" target="bvt" inheritAll="false"/>
</target>
+ <!-- This macrodef is intended for the compilation of the *web services" portions of a web application. -->
+ <macrodef name="build-webservices">
+ <attribute name="srcdir"/>
+ <attribute name="destdir"/>
+ <attribute name="tempdir"/>
+ <attribute name="classpathref"/>
+ <sequential>
+ <taskdef name="apt"
+ classname="org.apache.beehive.controls.runtime.generator.AptTask"
+ classpathref="apt.task.classpath"
+ onerror="fail" />
+
+ <path id="_webservices.build.classpath">
+ <path refid="@{classpathref}"/>
+ </path>
+
+ <apt srcdir="@{srcdir}"
+ destdir="@{destdir}"
+ gendir="@{tempdir}"
+ classpathref="_webservices.build.classpath"
+ compileByExtension="true"
+ srcExtensions="*.java,*.jcx,*.jcs,*.jws"
+ debug="true" />
+ </sequential>
+ </macrodef>
+
</project>
Modified: beehive/branches/v1/final/wsm/test/build.xml
URL: http://svn.apache.org/viewcvs/beehive/branches/v1/final/wsm/test/build.xml?rev=290371&r1=290370&r2=290371&view=diff
==============================================================================
--- beehive/branches/v1/final/wsm/test/build.xml (original)
+++ beehive/branches/v1/final/wsm/test/build.xml Mon Sep 19 23:16:11 2005
@@ -136,9 +136,9 @@
<deploy-wsm webappDir="${webapp.dir}"/>
<build-webapp webappDir="${webapp.dir}"/>
<build-webservices srcdir="${webapp.dir}/WEB-INF/src-ws"
- destdir="${webapp.dir}/WEB-INF/classes"
- tempdir="${webapp.dir}/WEB-INF/temp"
- classpathref="drt.classpath"/>
+ destdir="${webapp.dir}/WEB-INF/classes"
+ tempdir="${webapp.dir}/WEB-INF/temp"
+ classpathref="drt.classpath"/>
</target>
<target name="clean.webapp">
@@ -171,7 +171,10 @@
</classpath>
</wsdl2AJava>
- <build-webservices srcdir="${build.gen-src-wsdl}" destdir="${build.gen-tests}" tempdir="${build.gen-src-apt}" classpathRef="drt.classpath"/>
+ <build-webservices srcdir="${build.gen-src-wsdl}"
+ destdir="${build.gen-tests}"
+ tempdir="${build.gen-src-apt}"
+ classpathRef="drt.classpath"/>
</target>
<target name="run.drt">