svn commit: r190664 - in /incubator/beehive/trunk/wsm: ./ drt/ schemas/ src/axis/ src/axis/org/ src/axis/org/apache/ src/axis/org/apache/beehive/ src/axis/org/apache/beehive/wsm/ src/axis/org/apache/beehive/wsm/axis/ src/core/ src/core/META-INF/ src/core/org/ src/core/org/apache/ src/core/org/apache/beehive/ src/core/org/apache/beehive/wsm/ src/core/org/apache/beehive/wsm/axis/ src/core/org/apache/beehive/wsm/axis/ant/ src/core/org/apache/beehive/wsm/axis/databinding/ src/core/org/apache/beehive/wsm/axis/handlers/ src/core/org/apache/beehive/wsm/axis/registration/ src/core/org/apache/beehive/wsm/axis/tools/ src/core/org/apache/beehive/wsm/axis/util/ src/core/org/apache/beehive/wsm/model/jsr181/ src/runtime/META-INF/ src/runtime/org/apache/beehive/wsm/ src/schema-wsdl/

[ek...@apache.org]

Author: ekoneil
Date: Tue Jun 14 15:36:57 2005
New Revision: 190664

URL: http://svn.apache.org/viewcvs?rev=190664&view=rev
Log:
Rearrange the WSM build to change from:

src/
  api
  runtime

to:

src/
  api/
  core/ -- the core WSM code including the annotation processor
  axis/ -- the Axis implementation of the WSM runtime
  schema-wsdl/ -- the WSDL / SOAP XSDs that used to live in schemas/

BB: self
DRT: Beehive pass / build.dist pass


Added:
    incubator/beehive/trunk/wsm/src/axis/
    incubator/beehive/trunk/wsm/src/axis/org/
    incubator/beehive/trunk/wsm/src/axis/org/apache/
    incubator/beehive/trunk/wsm/src/axis/org/apache/beehive/
    incubator/beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/
    incubator/beehive/trunk/wsm/src/axis/org/apache/beehive/wsm/axis/
      - copied from r190655, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/
    incubator/beehive/trunk/wsm/src/core/
    incubator/beehive/trunk/wsm/src/core/META-INF/
      - copied from r190662, incubator/beehive/trunk/wsm/src/runtime/META-INF/
    incubator/beehive/trunk/wsm/src/core/org/
    incubator/beehive/trunk/wsm/src/core/org/apache/
    incubator/beehive/trunk/wsm/src/core/org/apache/beehive/
    incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/
      - copied from r190655, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/
    incubator/beehive/trunk/wsm/src/schema-wsdl/
      - copied from r190655, incubator/beehive/trunk/wsm/schemas/
Removed:
    incubator/beehive/trunk/wsm/schemas/
    incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/axis/AxisFaultAdaptor.java
    incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/axis/AxisHook.java
    incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/axis/ControlProvider.java
    incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/axis/ant/
    incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/axis/databinding/
    incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/axis/handlers/
    incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/axis/registration/
    incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/axis/tools/
    incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/axis/util/
    incubator/beehive/trunk/wsm/src/runtime/META-INF/
    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/
Modified:
    incubator/beehive/trunk/wsm/build-schema.xml
    incubator/beehive/trunk/wsm/build.xml
    incubator/beehive/trunk/wsm/drt/build.xml
    incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/jsr181/Jsr181ObjectModelStore.java

Modified: incubator/beehive/trunk/wsm/build-schema.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/build-schema.xml?rev=190664&r1=190663&r2=190664&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/build-schema.xml (original)
+++ incubator/beehive/trunk/wsm/build-schema.xml Tue Jun 14 15:36:57 2005
@@ -1,13 +1,14 @@
 <?xml version="1.0"?>
 
 <project name="Beehive/WSM/Schema Build" default="build" basedir=".">
+
     <import file="../beehive-imports.xml"/>
 
-    <property name="xsd.schema.dir" location="src/runtime/schema" />
+    <property name="xsd.schema.dir" location="src/schema-wsdl"/>
     <property name="schema.jar" location="${beehive.home}/wsm/wsm-schema.jar"/>
     <property name="schema.build.dir" location="${beehive.home}/wsm/build-schema"/>
 
-    <target name="build" depends="build-schema, make-jar" />
+    <target name="build" depends="build-schema, make-jar"/>
 
     <target name="build-schema">
         <echo message="generate"/>

Modified: incubator/beehive/trunk/wsm/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/build.xml?rev=190664&r1=190663&r2=190664&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/build.xml (original)
+++ incubator/beehive/trunk/wsm/build.xml Tue Jun 14 15:36:57 2005
@@ -26,18 +26,24 @@
     <property name="classes.dir" location="${build.dir}/classes"/>
     <property name="jars.dir" location="${build.dir}/jars"/>
     <property name="docs.dir" location="${build.dir}/docs"/>
+
     <property name="api.dir" location="src/api"/>
     <property name="api.classes" location="${classes.dir}/api"/>
-    <property name="runtime.dir" location="src/runtime"/>
-    <property name="runtime.classes" location="${classes.dir}/runtime"/>
-    <property name="ext.lib.dir" location="external"/>
+
+    <property name="core.dir" location="src/core"/>
+    <property name="core.classes" location="${classes.dir}/core"/>
+
+    <property name="axis.dir" location="src/axis"/>
+    <property name="axis.classes" location="${classes.dir}/axis"/>
+
+    <property name="wsdl.schema.dir" location="src/schema-wsdl"/>
+    <property name="temp.wsdl.classes.dir" location="${build.dir}/temp-wsdltypes"/>
+
     <property name="wsm.jar" location="${jars.dir}/beehive-wsm.jar"/>
     <property name="wsm-axis.jar" location="${jars.dir}/beehive-wsm-axis.jar"/>
     <property name="jsr181.jar" location="${build.dir}/jars/jsr181.jar"/>
-    <property name="wsdl.schema.dir" location="schemas"/>
-    <property name="temp.wsdl.classes.dir" location="${build.dir}/temp-wsdltypes"/>
 
-    <path id="runtime.classpath">
+    <path id="core.classpath">
         <path refid="velocity.dependency.path"/>
         <path refid="commons-logging.dependency.path"/>
         <path refid="xbean.dependency.path"/>
@@ -48,14 +54,14 @@
         <pathelement location="${api.classes}"/>
         <pathelement location="${jars.dir}/beehive-wsdltypes.jar"/>
         <pathelement location="${jsr181.jar}"/>
-        <pathelement location="${ext.lib.dir}/jaxrpc.jar"/>
+        <pathelement location="external/jaxrpc.jar"/>
     </path>
  
     <path id="axis.classpath">
+        <path refid="core.classpath"/>
         <path refid="controls.dependency.path"/>
-        <path refid="runtime.classpath"/>
         <path refid="webservice.classpath"/>
-        <pathelement location="${runtime.classes}"/>
+        <pathelement location="${core.classes}"/>
     </path>
         
     <!-- ==================================================================== -->
@@ -63,7 +69,8 @@
     <!-- ==================================================================== -->
     <target name="dirs">
         <mkdir dir="${api.classes}"/>
-        <mkdir dir="${runtime.classes}"/>
+        <mkdir dir="${core.classes}"/>
+        <mkdir dir="${axis.classes}"/>
         <mkdir dir="${jars.dir}"/>
         <mkdir dir="${docs.dir}"/>
     </target>
@@ -133,28 +140,21 @@
         <echo message="--------------------------------------------------"/>
 
         <echo message="--------------------------------------------------"/>
-        <echo message="|      WSM Runtime build starting                |"/>
+        <echo message="|      WSM Core build starting                   |"/>
         <echo message="--------------------------------------------------"/>
 
-        <!-- Build the runtime classes -->
-        <javac destdir="${runtime.classes}" classpathref="runtime.classpath" debug="on">
-            <src path="${runtime.dir}"/>
-            <exclude name="**/axis/**"/>
+        <!-- Build the core classes -->
+        <javac destdir="${core.classes}" classpathref="core.classpath" debug="on">
+            <src path="${core.dir}"/>
         </javac>
     	
-        <copy todir="${runtime.classes}" overwrite="true">
-            <fileset dir="${runtime.dir}" includes="**/*.template,**/*.vm,META-INF/**"/>
-        </copy>
-
-        <!-- Copy property files into the build -->
-        <copy todir="${runtime.classes}" overwrite="true">
-            <fileset dir="${runtime.dir}" includes="**/*.properties"/>
+        <copy todir="${core.classes}" overwrite="true">
+            <fileset dir="${core.dir}" includes="**/*.template,**/*.vm,META-INF/**"/>
+            <fileset dir="${core.dir}" includes="**/*.properties"/>
         </copy>
         
         <jar jarfile="${wsm.jar}">
-            <fileset dir="${runtime.classes}">
-                <exclude name="**/axis/**"/>
-            </fileset>
+            <fileset dir="${core.classes}"/>
             <manifest> 
                 <attribute name="Extension-Name" value="Beehive WSM Library"/> 
                 <attribute name="Specification-Title" value="Beehive WSM Library"/> 
@@ -167,23 +167,19 @@
             </manifest> 
         </jar>
         <echo message="--------------------------------------------------"/>
-        <echo message="|      WSM Runtime build ending                  |"/>
+        <echo message="|      WSM Core build ending                     |"/>
         <echo message="--------------------------------------------------"/>
 
         <echo message="--------------------------------------------------"/>
         <echo message="|      WSM AXIS build starting                   |"/>
         <echo message="--------------------------------------------------"/>
 
-        <!-- Build the axis classes -->
-        <javac destdir="${runtime.classes}" classpathref="axis.classpath" debug="on">
-            <src path="${runtime.dir}"/>
-            <include name="**/axis/**"/>
+        <javac destdir="${axis.classes}" classpathref="axis.classpath" debug="on">
+            <src path="${axis.dir}"/>
         </javac>
 
         <jar jarfile="${wsm-axis.jar}">
-            <fileset dir="${runtime.classes}">
-                <include name="**/axis/**"/>
-            </fileset>
+            <fileset dir="${axis.classes}"/>
             <manifest> 
                 <attribute name="Extension-Name" value="Axis Runtime for Beehive WSM"/> 
                 <attribute name="Specification-Title" value="Axis Runtime for Beehive WSM"/> 
@@ -243,7 +239,8 @@
                  additionalparam="-breakiterator -noqualifier all -notimestamp " 
                  useexternalfile="true" 
                  classpathref="axis.classpath">
-            <packageset dir="${runtime.dir}" defaultexcludes="yes"/>
+            <packageset dir="${core.dir}" defaultexcludes="yes"/>
+            <packageset dir="${axis.dir}" defaultexcludes="yes"/>
         </javadoc>
         <fixcrlf srcDir="${docs.dir}/apidocs/classref_wsm" includes="**/*.html"/>
     </target>

Modified: incubator/beehive/trunk/wsm/drt/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/build.xml?rev=190664&r1=190663&r2=190664&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/drt/build.xml (original)
+++ incubator/beehive/trunk/wsm/drt/build.xml Tue Jun 14 15:36:57 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 
-<project name="wsmdrt" default="drt">
+<project name="wsmdrt" default="drt" basedir=".">
 
     <import file="../../beehive-imports.xml"/>
     <import file="../../ant/beehive-tools.xml"/>
@@ -16,7 +16,7 @@
     <property name="build.tests" location="${build.classes}/tests"/>
     <property name="build.gen-tests" location="${build.classes}/gen-tests"/>
     <property name="webapp.dir" location="${drt.root}/webapp"/>
-    <property name="ext.lib.dir" value="../external"/>
+    <property name="ext.lib.dir" location="../external"/>
     <property name="drt.wsdl.file" location="${drt.src}/org/apache/beehive/wsm/jsr181/wsdl/web/wsdl2javatest.wsdl"/>
 
     <fileset id="axis.jars" dir="${ext.lib.dir}">

Modified: incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/jsr181/Jsr181ObjectModelStore.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/jsr181/Jsr181ObjectModelStore.java?rev=190664&r1=190655&r2=190664&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/jsr181/Jsr181ObjectModelStore.java (original)
+++ incubator/beehive/trunk/wsm/src/core/org/apache/beehive/wsm/model/jsr181/Jsr181ObjectModelStore.java Tue Jun 14 15:36:57 2005
@@ -76,7 +76,11 @@
         String resourceName = getLocation(clazz.getName()).toString();
         URL url = clazz.getClassLoader().getResource(resourceName);
 
-        BeehiveWsTypeMetadata typeMetadata = null;
+        /* todo: IOException is the wrong thing to throw here, but it's what's done elsewhere in this code... */
+        if(url == null)
+            throw new IOException("Unable to load URL for object model represented by '" + resourceName + "'");
+
+            BeehiveWsTypeMetadata typeMetadata = null;
         InputStream is = null;
         try {
             is = url.openStream();