Author: mmerz
Date: Fri Jan 7 15:12:06 2005
New Revision: 124585
URL: http://svn.apache.org/viewcvs?view=rev&rev=124585
Log:
More drt reorg: Moved WebService files into drt webapp and modified
drt/build.xml and affected classes accordingly. Added webapp artifacts to
wsm-drt webapp to make it deployable as beehive webapp/web service.
Note that WsmReflectionAnnotationProcessor has been deprecated and will be
removed soon.
Added:
incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/server-config.wsdd
incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/
incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/
incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/
incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/
incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/axis/
incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/axis/FakeWebService.jws
- copied unchanged from r124549,
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/FakeWebService.java
incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/axis/ModeratelyComplexObject.java
- copied unchanged from r124549,
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/ModeratelyComplexObject.java
incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/jsr181/
incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/jsr181/wsdl/
incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/jsr181/wsdl/StarWars.jws
- copied unchanged from r124549,
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/StarWars.java
incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/web.xml
Removed:
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/FakeWebService.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/ModeratelyComplexObject.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/StarWars.java
Modified:
incubator/beehive/trunk/wsm/drt/build.xml
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandlerTest.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java
Modified: incubator/beehive/trunk/wsm/drt/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/build.xml?view=diff&rev=124585&p1=incubator/beehive/trunk/wsm/drt/build.xml&r1=124584&p2=incubator/beehive/trunk/wsm/drt/build.xml&r2=124585
==============================================================================
--- incubator/beehive/trunk/wsm/drt/build.xml (original)
+++ incubator/beehive/trunk/wsm/drt/build.xml Fri Jan 7 15:12:06 2005
@@ -4,13 +4,14 @@
<property environment="os"/>
<property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <property name="test.root" location="${basedir}"/>
- <property name="drt.logs" location="${test.root}/logs"/>
- <property name="webapp.dir" location="${test.root}/webapp"/>
- <property name="tests.src" location="${test.root}/tests"/>
- <property name="build.dir" location="${test.root}/build"/>
+ <property name="drt.root" location="${basedir}"/>
+ <property name="drt.logs" location="${drt.root}/logs"/>
+ <property name="drt.src" location="${drt.root}/tests"/>
+ <property name="drt.schemas" location="${drt.src}/schemas"/>
+ <property name="build.dir" location="${drt.root}/build"/>
<property name="build.classes" location="${build.dir}/classes"/>
<property name="build.tests" location="${build.classes}/tests"/>
+ <property name="webapp.dir" location="${drt.root}/webapp"/>
<condition property="drt.os" value="windows">
<os family="windows"/>
</condition>
@@ -59,7 +60,7 @@
<echo message="build - Build all classes needed for running the
tests."/>
<echo message="clean - Delete all classes needed for running the
tests."/>
<echo message="run.drt - Run the drts."/>
- <echo message="drt - Run 'clean', 'build' and then 'run.drt'."/>
+ <echo message="drt - Run 'build', 'run.drt'."/>
<echo
message="----------------------------------------------------------------"/>
</target>
@@ -67,7 +68,6 @@
<echo message="--------------------------------------------------"/>
<echo message="| WSM drt starting |"/>
<echo message="--------------------------------------------------"/>
- <antcall target="clean"/>
<antcall target="build"/>
<antcall target="run.drt"/>
<echo message="--------------------------------------------------"/>
@@ -75,7 +75,7 @@
<echo message="--------------------------------------------------"/>
</target>
- <target name="build" depends="dirs, build.webapp, build.tests"/>
+ <target name="build" depends="dirs, xbean, build.webapp, build.tests"/>
<target name="clean" depends="clean.tests, clean.webapp" />
@@ -86,9 +86,9 @@
<mkdir dir="${drt.logs}"/>
</target>
- <target name="build.tests" depends="dirs, xbean, build.webapp">
+ <target name="build.tests">
<!-- Build the test source directory -->
- <javac srcdir="${tests.src}"
+ <javac srcdir="${drt.src}"
destdir="${build.tests}"
classpathref="drt.classpath"
debug="on"
@@ -97,7 +97,7 @@
failonerror="true"
/>
<copy todir="${build.tests}">
- <fileset dir="${tests.src}" includes="**/*.xml"/>
+ <fileset dir="${drt.src}" includes="**/*.xml"/>
</copy>
</target>
@@ -114,7 +114,7 @@
<delete dir="${build.dir}"/>
<delete dir="${drt.logs}"/>
<delete>
- <fileset dir="${tests.src}" includes="*.class"/>
+ <fileset dir="${drt.src}" includes="*.class"/>
</delete>
<delete dir="${webapp.dir}/WEB-INF/temp"/>
</target>
@@ -129,18 +129,18 @@
<target name="xbean">
<!-- XMLBean build -->
- <taskdef name="xmlbeanbuild"
- classname="org.apache.xmlbeans.impl.tool.XMLBean">
+ <taskdef name="xmlbeanbuild"
classname="org.apache.xmlbeans.impl.tool.XMLBean">
<classpath>
<path refid="drt.classpath"/>
</classpath>
</taskdef>
<xmlbeanbuild
- schema="${tests.src}/schemas"
- classgendir="${build.tests}"
+ schema="tests/schemas"
+ classgendir="${webapp.dir}/WEB-INF/classes"
failonerror="true">
<classpath>
<path refid="drt.classpath"/>
+ <pathelement location="${webapp.dir}/WEB-INF/classes"/>
</classpath>
</xmlbeanbuild>
</target>
Modified:
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandlerTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandlerTest.java?view=diff&rev=124585&p1=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandlerTest.java&r1=124584&p2=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandlerTest.java&r2=124585
==============================================================================
---
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandlerTest.java
(original)
+++
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandlerTest.java
Fri Jan 7 15:12:06 2005
@@ -43,12 +43,15 @@
*/
public class AnnotatedWebServiceDeploymentHandlerTest extends TestCase {
- SOAPService fakeSOAPService;
+ private final static String CLASSNAME =
"org.apache.beehive.wsm.axis.FakeWebService";
+
+ private SOAPService fakeSOAPService;
public void setUp() throws Exception {
AnnotatedWebServiceDeploymentHandler hdlr =
new AnnotatedWebServiceDeploymentHandler();
- fakeSOAPService = hdlr.getSOAPService(FakeWebService.class);
+ Class clazz = Class.forName(CLASSNAME);
+ fakeSOAPService = hdlr.getSOAPService(clazz);
}
public void tearDown() {
Deleted:
/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/FakeWebService.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/FakeWebService.java?view=auto&rev=124584
==============================================================================
Deleted:
/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/ModeratelyComplexObject.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/ModeratelyComplexObject.java?view=auto&rev=124584
==============================================================================
Deleted:
/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/StarWars.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/StarWars.java?view=auto&rev=124584
==============================================================================
Modified:
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java?view=diff&rev=124585&p1=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java&r1=124584&p2=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java&r2=124585
==============================================================================
---
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java
(original)
+++
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java
Fri Jan 7 15:12:06 2005
@@ -40,7 +40,8 @@
import org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadata;
import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
-import
org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
+import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadataImpl;
+//import
org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
/*******************************************************************************
*
@@ -58,8 +59,10 @@
File f = new File(BEEHIVE_HOME,
"wsm/drt/tests/schemas/starwars.wsdl");
- serverModel = (Jsr181TypeMetadata)WsmReflectionAnnotationProcessor
- .getInstance().getObjectModel(StarWars.class);
+// serverModel = (Jsr181TypeMetadata)WsmReflectionAnnotationProcessor
+// .getInstance().getObjectModel(StarWars.class);
+ Class clazz =
Class.forName("org.apache.beehive.wsm.jsr181.wsdl.StarWars");
+ serverModel = Jsr181TypeMetadataImpl.load(clazz);
XmlBeanWSDLProcessor xbwp = new XmlBeanWSDLProcessor();
clientModel = xbwp.createObjectModel(new FileInputStream(f));
Added: incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/server-config.wsdd
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/server-config.wsdd?view=auto&rev=124585
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/server-config.wsdd Fri Jan
7 15:12:06 2005
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="http://xml.apache.org/axis/wsdd/";
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";>
+ <globalConfiguration>
+ <parameter name="adminPassword" value="admin"/>
+ <parameter name="disablePrettyXML" value="true"/>
+ <parameter name="attachments.implementation"
value="org.apache.axis.attachments.AttachmentsImpl"/>
+ <parameter name="sendXsiTypes" value="true"/>
+ <parameter name="sendXMLDeclaration" value="true"/>
+ <requestFlow>
+ <handler
type="java:org.apache.beehive.wsm.axis.AnnotatedWebServiceDeploymentHandler">
+ <parameter name="scope" value="session"/>
+ </handler>
+ <handler type="java:org.apache.axis.handlers.JWSHandler">
+ <parameter name="scope" value="session"/>
+ </handler>
+ </requestFlow>
+ </globalConfiguration>
+ <handler name="LocalResponder"
type="java:org.apache.axis.transport.local.LocalResponder"/>
+ <handler name="URLMapper"
type="java:org.apache.axis.handlers.http.URLMapper"/>
+ <handler name="Authenticate"
type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/>
+ <service name="AdminService" provider="java:MSG">
+ <parameter name="allowedMethods" value="AdminService"/>
+ <parameter name="enableRemoteAdmin" value="false"/>
+ <parameter name="className" value="org.apache.axis.utils.Admin"/>
+ <namespace>http://xml.apache.org/axis/wsdd/</namespace>
+ </service>
+ <service name="Version" provider="java:RPC">
+ <parameter name="allowedMethods" value="getVersion"/>
+ <parameter name="className" value="org.apache.axis.Version"/>
+ </service>
+ <transport name="http">
+ <requestFlow>
+ <handler type="URLMapper"/>
+ <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
+ </requestFlow>
+ <parameter name="qs:list"
value="org.apache.axis.transport.http.QSListHandler"/>
+ <parameter name="qs:wsdl"
value="org.apache.axis.transport.http.QSWSDLHandler"/>
+ <parameter name="qs:method"
value="org.apache.axis.transport.http.QSMethodHandler"/>
+ </transport>
+ <transport name="local">
+ <responseFlow>
+ <handler type="LocalResponder"/>
+ </responseFlow>
+ </transport>
+</deployment>
+
Copied:
incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/axis/FakeWebService.jws
(from r124549,
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/FakeWebService.java)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/axis/FakeWebService.jws?view=diff&rev=124585&p1=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/FakeWebService.java&r1=124549&p2=incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/axis/FakeWebService.jws&r2=124585
==============================================================================
Copied:
incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/axis/ModeratelyComplexObject.java
(from r124549,
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/ModeratelyComplexObject.java)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/axis/ModeratelyComplexObject.java?view=diff&rev=124585&p1=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/ModeratelyComplexObject.java&r1=124549&p2=incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/axis/ModeratelyComplexObject.java&r2=124585
==============================================================================
Copied:
incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/jsr181/wsdl/StarWars.jws
(from r124549,
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/StarWars.java)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/jsr181/wsdl/StarWars.jws?view=diff&rev=124585&p1=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/StarWars.java&r1=124549&p2=incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/jsr181/wsdl/StarWars.jws&r2=124585
==============================================================================
Added: incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/web.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/web.xml?view=auto&rev=124585
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/web.xml Fri Jan 7
15:12:06 2005
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
+Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
+
+<web-app>
+
+ <display-name>beehive-wsm drt webapp</display-name>
+
+ <!-- configure beehive controls context -->
+ <filter>
+ <filter-name>ControlFilter</filter-name>
+
<filter-class>org.apache.beehive.controls.runtime.servlet.ControlFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>ControlFilter</filter-name>
+ <url-pattern>*.jws</url-pattern>
+ </filter-mapping>
+
+ <!-- configure SOAP stack -->
+ <listener>
+
<listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>AxisServlet</servlet-name>
+ <display-name>Apache-Axis Servlet</display-name>
+ <servlet-class>
+ org.apache.axis.transport.http.AxisServlet
+ </servlet-class>
+ </servlet>
+
+ <!-- uncomment this if you want the admin servlet -->
+ <!--
+ <servlet>
+ <servlet-name>AdminServlet</servlet-name>
+ <display-name>Axis Admin Servlet</display-name>
+ <servlet-class>
+ org.apache.axis.transport.http.AdminServlet
+ </servlet-class>
+ <load-on-startup>100</load-on-startup>
+ </servlet>
+ -->
+
+ <servlet-mapping>
+ <servlet-name>AxisServlet</servlet-name>
+ <url-pattern>*.jws</url-pattern>
+ </servlet-mapping>
+
+ <!-- uncomment this if you want the admin servlet -->
+ <!--
+ <servlet-mapping>
+ <servlet-name>AdminServlet</servlet-name>
+ <url-pattern>/servlet/AdminServlet</url-pattern>
+ </servlet-mapping>
+ -->
+
+ <session-config>
+ <!-- Default to 5 minute session timeouts -->
+ <session-timeout>5</session-timeout>
+ </session-config>
+
+ <!-- currently the W3C havent settled on a media type for WSDL;
+ http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
+ for now we go with the basic 'it's XML' response -->
+ <mime-mapping>
+ <extension>wsdl</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+
+ <mime-mapping>
+ <extension>xsd</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+ <welcome-file-list id="WelcomeFileList">
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>index.jws</welcome-file>
+ </welcome-file-list>
+
+</web-app>
Modified:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java?view=diff&rev=124585&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java&r1=124584&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java&r2=124585
==============================================================================
---
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java
(original)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java
Fri Jan 7 15:12:06 2005
@@ -33,10 +33,13 @@
import org.apache.axis.handlers.BasicHandler;
import org.apache.axis.handlers.soap.SOAPService;
import org.apache.axis.providers.java.RPCProvider;
-import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
-import
org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
+
import org.apache.commons.logging.Log;
+import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
+import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadataImpl;
+//import
org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
+
/**
* ****************************************************************************
* A few annotation specific things added and lots of code copied from the
@@ -110,8 +113,7 @@
if (null != clazz) {
rpc = soapServices.get(clazz.getName());
if (null == rpc) {
- Jsr181TypeMetadata wsm =
- (Jsr181TypeMetadata)
WsmReflectionAnnotationProcessor.getInstance().getObjectModel(clazz);
+ Jsr181TypeMetadata wsm = Jsr181TypeMetadataImpl.load(clazz);
rpc = createSOAPService(wsm, clazz);
}
}
Modified:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java?view=diff&rev=124585&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java&r1=124584&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java&r2=124585
==============================================================================
---
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java
(original)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java
Fri Jan 7 15:12:06 2005
@@ -116,6 +116,7 @@
if (null != endpointInterface && 0 <
endpointInterface.length()) {
// get object model for service endpoint interface
+ // todo: ".ser" needs to move into Jsr181TypeMetadataImpl
om =
Jsr181TypeMetadataImpl.load(getClass().getClassLoader().getResourceAsStream(endpointInterface
+ ".ser"));
if (null == om) {
messager.printError(classDecl.getPosition(), "cannot
find service endpoint interface: " + endpointInterface);
@@ -135,7 +136,10 @@
}
// store the object model
-
Jsr181TypeMetadataImpl.store(_env.getFiler().createBinaryFile(Filer.Location.CLASS_TREE,
"", new File(classDecl.getQualifiedName() + ".ser")), om);
+ if (null != om) {
+ // todo: ".ser" needs to move into Jsr181TypeMetadataImpl
+
Jsr181TypeMetadataImpl.store(_env.getFiler().createBinaryFile(Filer.Location.CLASS_TREE,
"", new File(classDecl.getQualifiedName() + ".ser")), om);
+ }
}
// service endpoint interface
@@ -148,7 +152,10 @@
Jsr181TypeMetadata om =
getWebServiceTYPEMetadata(interfaceDecl, true);
// store the object model
-
Jsr181TypeMetadataImpl.store(_env.getFiler().createBinaryFile(Filer.Location.CLASS_TREE,
"", new File(interfaceDecl.getQualifiedName() + ".ser")), om);
+ if (null != om) {
+ // todo: ".ser" needs to move into Jsr181TypeMetadataImpl
+
Jsr181TypeMetadataImpl.store(_env.getFiler().createBinaryFile(Filer.Location.CLASS_TREE,
"", new File(interfaceDecl.getQualifiedName() + ".ser")), om);
+ }
}
else {
@@ -157,7 +164,6 @@
}
catch (Exception e) {
messager.printError(_decl.getPosition(), e.getMessage());
-e.printStackTrace();
}
}
@@ -203,7 +209,7 @@
try {
objectModel = new Jsr181TypeMetadataImpl(
wsAnnotation,
- decl.getSimpleName(),
+ decl.getQualifiedName(), // decl.getSimpleName(),
getAnnotations(decl),
webMethods
);
Modified:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java?view=diff&rev=124585&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java&r1=124584&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java&r2=124585
==============================================================================
---
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java
(original)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java
Fri Jan 7 15:12:06 2005
@@ -37,7 +37,9 @@
import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadataImpl;
-
+/**
+ * @deprecated
+ */
public class WsmReflectionAnnotationProcessor {
private static WsmReflectionAnnotationProcessor _instance;
