Author: mmerz
Date: Fri Oct 29 10:26:46 2004
New Revision: 55983
Added:
incubator/beehive/branches/v1/alpha/samples/wsm-blank/
- copied from rev 55978,
incubator/beehive/branches/v1/alpha/wsm/src/webapp-template/default/
Removed:
incubator/beehive/branches/v1/alpha/wsm/src/webapp-template/default/
Modified:
incubator/beehive/branches/v1/alpha/build.xml
incubator/beehive/branches/v1/alpha/user/webappRuntimeCore.xml
incubator/beehive/branches/v1/alpha/wsm/build.xml
incubator/beehive/branches/v1/alpha/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java
Log:
Lined wsm-blank up with other samples; added target for wsm-only (non-netui)
deployment to webRuntimeCore (needs more work); fixed duplicate
sample-libraries.
Modified: incubator/beehive/branches/v1/alpha/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/build.xml Fri Oct 29 10:26:46 2004
@@ -245,10 +245,23 @@
<fileset file="${controls.jar}"/>
</copy>
+ <!-- WSM jars -->
<copy todir="${dist.dir}/lib/wsm" failOnError="true">
- <fileset dir="${os.BEEHIVE_HOME}/wsm/external"
includes="**/*.jar"/>
- <fileset dir="${os.BEEHIVE_HOME}/wsm/lib" includes="**/*.jar"/>
- <fileset dir="${os.BEEHIVE_HOME}/wsm/build/jars"
includes="**/*.jar"/>
+ <fileset dir="${os.BEEHIVE_HOME}/wsm/build/jars">
+ <include name="wsm.jar"/>
+ <include name="wsm-axis.jar"/>
+ </fileset>
+ <fileset dir="${os.BEEHIVE_HOME}/wsm/lib">
+ <include name="wsdltypes.jar"/>
+ </fileset>
+ <fileset dir="${os.BEEHIVE_HOME}/wsm/external">
+ <include name="axis.jar"/>
+ <include name="axis-ant.jar"/>
+ <include name="jaxrpc.jar"/>
+ <include name="saaj.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="commons-discovery.jar"/>
+ </fileset>
</copy>
<copy todir="${dist.dir}/lib/netui" failOnError="true" flatten="true">
@@ -347,6 +360,18 @@
<!-- Build the controls database template app distro -->
<copy todir="${dist.dir}/samples/controls-db" failOnError="true">
<fileset dir="samples/controls-db"/>
+ </copy>
+
+ <!-- Build the wsm blank template app distro -->
+ <copy todir="${dist.dir}/samples/wsm-blank" failOnError="true">
+ <fileset dir="samples/wsm-blank"/>
+ </copy>
+
+ <!-- Build the WSM/AddressBook sample -->
+ <copy todir="${dist.dir}/samples/AddressBookWS" failOnError="true">
+ <fileset dir="samples/AddressBookWS">
+ <exclude name="build.xml"/>
+ </fileset>
</copy>
</target>
Modified: incubator/beehive/branches/v1/alpha/user/webappRuntimeCore.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/user/webappRuntimeCore.xml
(original)
+++ incubator/beehive/branches/v1/alpha/user/webappRuntimeCore.xml Fri Oct
29 10:26:46 2004
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project name="Beehive/Webapp Build" default="usage" basedir=".">
+<project name="Beehive/Webapp Deploy" default="usage" basedir=".">
<property environment="os"/>
<property file="${os.BEEHIVE_HOME}/beehive.properties"/>
@@ -36,6 +36,25 @@
<copy todir="${webapp.dir}/resources/">
<fileset dir="${os.BEEHIVE_HOME}/lib/netui/resources">
<include name="**/*"/>
+ </fileset>
+ </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="${os.BEEHIVE_HOME}/lib/common">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${os.BEEHIVE_HOME}/lib/controls">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${os.BEEHIVE_HOME}/lib/wsm/">
+ <include name="*.jar"/>
</fileset>
</copy>
</target>
Modified: incubator/beehive/branches/v1/alpha/wsm/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/wsm/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/wsm/build.xml Fri Oct 29 10:26:46 2004
@@ -26,8 +26,6 @@
<property name="classes.dir" value="${build.dir}/classes"/>
<property name="jars.dir" value="${build.dir}/jars"/>
<property name="docs.dir" value="${build.dir}/docs"/>
- <property name="wsm.dist.dir" value="${build.dir}/dist"/>
- <property name="webapp.dist.dir" value="${wsm.dist.dir}/webapp" />
<property name="template.dir" value="src/webapp-template/default" />
<property name="api.dir" value="src/api"/>
<property name="api.classes" value="${classes.dir}/api"/>
@@ -112,7 +110,6 @@
<mkdir dir="${runtime.classes}"/>
<mkdir dir="${jars.dir}"/>
<mkdir dir="${docs.dir}"/>
- <mkdir dir="${wsm.dist.dir}"/>
</target>
<!-- ====================================================================
-->
<!-- Compiles the source code of the project. -->
@@ -227,28 +224,7 @@
<echo message="--------------------------------------------------"/>
<echo message="| WSM deploy starting |"/>
<echo message="--------------------------------------------------"/>
- <mkdir dir="${webapp.dist.dir}"/>
- <!-- the template -->
- <copy todir="${webapp.dist.dir}">
- <fileset dir="${template.dir}" includes="**" />
- </copy>
- <!-- wsdltypes.jar -->
- <copy todir="${webapp.dist.dir}/WEB-INF/lib">
- <fileset dir="${lib.dir}">
- <include name="wsdltypes.jar"/>
- </fileset>
- </copy>
- <!-- Axis files -->
- <copy todir="${webapp.dist.dir}/WEB-INF/lib">
- <fileset dir="${ext.lib.dir}">
- <include name="axis.jar"/>
- <include name="axis-ant.jar"/>
- <include name="jaxrpc.jar"/>
- <include name="saaj.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="commons-discovery.jar"/>
- </fileset>
- </copy>
+
<echo message="--------------------------------------------------"/>
<echo message="| WSM deploy ending |"/>
<echo message="--------------------------------------------------"/>
Modified:
incubator/beehive/branches/v1/alpha/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java
==============================================================================
---
incubator/beehive/branches/v1/alpha/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java
(original)
+++
incubator/beehive/branches/v1/alpha/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java
Fri Oct 29 10:26:46 2004
@@ -54,6 +54,13 @@
import
org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
+/**
+ * WsmAnnotationProcessor provides an API for IDEs and other applications to
+ * perform code validation.
+ *
+ * todo This class is currently disabled; the object model is solely built
+ * through reflection.
+ */
public class WsmAnnotationProcessor extends TwoPhaseAnnotationProcessor
{
/**
@@ -70,6 +77,11 @@
@Override
public void check(Declaration decl)
{
+ if (null != decl)
+ {
+ return;
+ }
+
// check type of declaration
if (null == decl)
{
@@ -100,17 +112,16 @@
{
try {
Class seiClass = Class.forName(ws.endpointInterface());
-/*
// todo this code is currently not used; it will be needed for
the IDE milestone
-
+/*
// todo proper error checking -- e.g. check if all interface
methods are implemented in sib
if (null ==
WsmReflectionAnnotationProcessor.getInstance().getObjectModel(null, seiClass))
{
throw new ProcessorException("Failed to create object
model for class: " + seiClass.getName());
// todo: proper error handling
}
-*/
+ */
}
catch (ClassNotFoundException e) {
e.printStackTrace(); // todo: proper error handling
@@ -126,6 +137,8 @@
{
// jws-class file is the only artifact to be generated, which is
// done automatically as part of apt
+
+ return;
}
/**
