You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by mm...@apache.org on 2005/02/14 20:47:44 UTC
svn commit: r153834 - in
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm: axis/
jsr181/model/ jsr181/model/jsr181/ jsr181/model/wsdl/ jsr181/processor/apt/
jsr181/wsdl/
Author: mmerz
Date: Mon Feb 14 11:47:39 2005
New Revision: 153834
URL: http://svn.apache.org/viewcvs?view=rev&rev=153834
Log:
Renaming packages. Two step process. This will break the build. It will be fixed with the next checkin.
Contributor: daryoush mehrtash
Added:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsMethodMetadata.java
- copied unchanged from r153831, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadata.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsParameterMetadata.java
- copied unchanged from r153831, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadata.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsTypeMetadata.java
- copied unchanged from r153831, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadata.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/InitParamInfo.java
- copied unchanged from r153831, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/InitParamInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/InvalidFileType.java
- copied unchanged from r153831, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/InvalidFileType.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181MethodMetadataImpl.java
- copied unchanged from r153831, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadataImpl.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181ParameterMetadataImpl.java
- copied unchanged from r153831, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadataImpl.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181TypeMetadataImpl.java
- copied unchanged from r153831, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadataImpl.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/SOAPBindingInfo.java
- copied unchanged from r153831, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPBindingInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/SOAPMessageHandlerInfo.java
- copied unchanged from r153831, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/SecurityRolesInfo.java
- copied unchanged from r153831, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SecurityRolesInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/wsdl/
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/wsdl/XmlBeanWSDLProcessor.java
- copied unchanged from r153831, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java
Removed:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/InitParamInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/InvalidFileType.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadata.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadataImpl.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadata.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadataImpl.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadata.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadataImpl.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPBindingInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SecurityRolesInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java
Modified:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AuthenticationHandler.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WebServiceMetadataViewer.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/wsdl/WSDLProcessor.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/Wsdl2AJava.java
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&r1=153833&r2=153834
==============================================================================
--- 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 Mon Feb 14 11:47:39 2005
@@ -36,8 +36,8 @@
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.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181TypeMetadataImpl;
//import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
/**
@@ -113,7 +113,7 @@
if (null != clazz) {
rpc = soapServices.get(clazz.getName());
if (null == rpc) {
- Jsr181TypeMetadata wsm = Jsr181TypeMetadataImpl.load(clazz);
+ BeehiveWsTypeMetadata wsm = Jsr181TypeMetadataImpl.load(clazz);
rpc = createSOAPService(wsm, clazz);
}
}
@@ -126,7 +126,7 @@
* @return
* @throws Exception
*/
- protected SOAPService createSOAPService(Jsr181TypeMetadata wsm, Class cls) throws Exception
+ protected SOAPService createSOAPService(BeehiveWsTypeMetadata wsm, Class cls) throws Exception
{
SOAPService rpc = null;
if (null != wsm) {
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AuthenticationHandler.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AuthenticationHandler.java?view=diff&r1=153833&r2=153834
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AuthenticationHandler.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AuthenticationHandler.java Mon Feb 14 11:47:39 2005
@@ -18,11 +18,12 @@
*
*/
-import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
-import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadata;
-import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
-import org.apache.beehive.wsm.jsr181.model.SecurityRolesInfo;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsSecurityRolesInfo;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181TypeMetadataImpl;
+import org.apache.beehive.wsm.jsr181.model.jsr181.SecurityRolesInfo;
//import org.apache.beehive.wsm.jsr181.processor.apt.WsmAnnotationProcessor;
import org.apache.beehive.wsm.axis.security.SecurityModel;
@@ -71,8 +72,8 @@
LogFactory.getLog(AuthenticationHandler.class.getName());
/* cache Jsr181MethodMetadata objects associated with a Method object */
- private static Map<Method, Jsr181MethodMetadata> methodCache =
- new Hashtable<Method, Jsr181MethodMetadata>();
+ private static Map<Method, BeehiveWsMethodMetadata> methodCache =
+ new Hashtable<Method, BeehiveWsMethodMetadata>();
private SecurityModel securityModelImpl = null;
@@ -94,7 +95,7 @@
}
// get a object model of the requested class.
- Jsr181TypeMetadata wsm = null;
+ BeehiveWsTypeMetadata wsm = null;
try {
wsm = Jsr181TypeMetadataImpl.load(clazz);
}
@@ -134,7 +135,7 @@
initialize(msgContext);
- Jsr181MethodMetadata calledMethodMetadata = getCalledMethodMetadata(operationDesc, wsm);
+ BeehiveWsMethodMetadata calledMethodMetadata = getCalledMethodMetadata(operationDesc, wsm);
if (null == calledMethodMetadata)
{
@@ -147,7 +148,7 @@
Collection<String> rolesAllowed = new ArrayList<String>();
// mix those roles up and check them is better for performance.
- SecurityRolesInfo securityRolesInfo = calledMethodMetadata.getSecurityRoles();
+ BeehiveWsSecurityRolesInfo securityRolesInfo = calledMethodMetadata.getSecurityRoles();
if (null != securityRolesInfo)
{
rolesAllowed.addAll(securityRolesInfo.getRolesAllowed());
@@ -333,22 +334,22 @@
/**
* return a Jsr181MethodMetadata object which is associated with a web service method invoked by a client.
*/
- private Jsr181MethodMetadata getCalledMethodMetadata ( OperationDesc operationDesc, Jsr181TypeMetadata wsm )
+ private BeehiveWsMethodMetadata getCalledMethodMetadata ( OperationDesc operationDesc, BeehiveWsTypeMetadata wsm )
{
Method method = operationDesc.getMethod();
- Jsr181MethodMetadata cachedMethod = methodCache.get(method);
+ BeehiveWsMethodMetadata cachedMethod = methodCache.get(method);
if ( cachedMethod != null ) return cachedMethod; // method found. Thus, return it.
String calledMethod = operationDesc.getName();
Class[] parameterTypes = method.getParameterTypes();
- Collection<Jsr181MethodMetadata> methods = wsm.getMethods();
- for( Jsr181MethodMetadata methodMetadata : methods )
+ Collection<? extends BeehiveWsMethodMetadata> methods = wsm.getMethods();
+ for( BeehiveWsMethodMetadata methodMetadata : methods )
{
if( methodMetadata.getWmOperationName().equals( calledMethod ) )
{
- List<Jsr181ParameterMetadata> params = methodMetadata.getParams();
+ List<BeehiveWsParameterMetadata> params = methodMetadata.getParams();
if( parameterTypes.length != params.size() )
{
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java?view=diff&r1=153833&r2=153834
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java Mon Feb 14 11:47:39 2005
@@ -52,10 +52,11 @@
import org.apache.axis.wsdl.fromJava.Types;
import org.apache.beehive.wsm.axis.util.encoding.XmlBeanDeserializerFactory;
import org.apache.beehive.wsm.axis.util.encoding.XmlBeanSerializerFactory;
-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.model.SOAPBindingInfo;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsSOAPBindingInfo;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.jsr181.model.jsr181.SOAPBindingInfo;
import org.apache.beehive.wsm.jsr181.util.InvalidTypeMappingException;
import org.apache.xmlbeans.XmlBeans;
@@ -69,7 +70,7 @@
public class AxisHook {
public static ServiceDesc createServiceDesc(
- Jsr181TypeMetadata wsm,
+ BeehiveWsTypeMetadata wsm,
ClassLoader cl
)
throws
@@ -93,7 +94,7 @@
sd.setDefaultNamespace(targetNamespace);
configureSoapBinding(sd, wsm.getSoapBinding());
List<String> allowedMethods = new ArrayList<String>();
- for (Jsr181MethodMetadata meth : wsm.getMethods())
+ for (BeehiveWsMethodMetadata meth : wsm.getMethods())
{
String operationName = meth.getWmOperationName();
if (null != operationName && 0 < operationName.length())
@@ -117,7 +118,7 @@
od.setReturnClass(returnType);
}
List<Class> paramClasses = new ArrayList<Class>();
- for (Jsr181ParameterMetadata param : meth.getParams())
+ for (BeehiveWsParameterMetadata param : meth.getParams())
{
ParameterDesc pd = new ParameterDesc();
final Class paramType = param.getJavaType();
@@ -440,7 +441,7 @@
}
protected static void configureSoapBinding(ServiceDesc sd,
- SOAPBindingInfo sbi) {
+ BeehiveWsSOAPBindingInfo sbi) {
javax.jws.soap.SOAPBinding.Style style
= javax.jws.soap.SOAPBinding.Style.DOCUMENT;
javax.jws.soap.SOAPBinding.Use use
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java?view=diff&r1=153833&r2=153834
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java Mon Feb 14 11:47:39 2005
@@ -20,8 +20,9 @@
package org.apache.beehive.wsm.axis;
import org.apache.axis.handlers.JAXRPCHandler;
-import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
-import org.apache.beehive.wsm.jsr181.model.SOAPMessageHandlerInfo;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsSOAPMessageHandlerInfo;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.jsr181.model.jsr181.SOAPMessageHandlerInfo;
/**
* ****************************************************************************
@@ -34,14 +35,14 @@
*/
public class HandlerHandler extends JAXRPCHandler {
- private Jsr181TypeMetadata wsm;
+ private BeehiveWsTypeMetadata wsm;
/**
* Constructor with Jsr181TypeMetadata parameter
*
* @param wsm
*/
- public HandlerHandler(Jsr181TypeMetadata wsm) {
+ public HandlerHandler(BeehiveWsTypeMetadata wsm) {
this.wsm = wsm;
}
@@ -50,7 +51,7 @@
* configure the HandlerChain.
*/
public void init() {
- for (SOAPMessageHandlerInfo info : wsm.getSoapHandlers()) {
+ for (BeehiveWsSOAPMessageHandlerInfo info : wsm.getSoapHandlers()) {
addNewHandler(info.getClassName(), info.getParameterMap());
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WebServiceMetadataViewer.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WebServiceMetadataViewer.java?view=diff&r1=153833&r2=153834
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WebServiceMetadataViewer.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WebServiceMetadataViewer.java Mon Feb 14 11:47:39 2005
@@ -20,12 +20,14 @@
import java.util.Collection;
-import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
-import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
-import org.apache.beehive.wsm.jsr181.model.SecurityRolesInfo;
-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.model.BeehiveWsSOAPBindingInfo;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsSecurityRolesInfo;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.jsr181.model.jsr181.SOAPBindingInfo;
+import org.apache.beehive.wsm.jsr181.model.jsr181.SecurityRolesInfo;
public class WebServiceMetadataViewer {
@@ -39,11 +41,11 @@
" "
};
- public static void print(Jsr181TypeMetadata webServiceTYPEMetadata) {
+ public static void print(BeehiveWsTypeMetadata webServiceTYPEMetadata) {
print(0, webServiceTYPEMetadata);
}
- public static void print(int tab, Jsr181TypeMetadata webServiceTYPEMetadata) {
+ public static void print(int tab, BeehiveWsTypeMetadata webServiceTYPEMetadata) {
print(tab, "<TYPE > > >WebServiceTYPEMetadata");
print(tab, "wsName", webServiceTYPEMetadata.getWsName());
print(tab, "wsServiceName", webServiceTYPEMetadata.getWsServiceName());
@@ -69,21 +71,21 @@
if (collection == null)
return;
for (Object element : collection) {
- if (element instanceof Jsr181TypeMetadata) {
- print(tab, (Jsr181TypeMetadata) element);
- } else if (element instanceof Jsr181MethodMetadata) {
- print(tab, (Jsr181MethodMetadata) element);
- } else if (element instanceof Jsr181ParameterMetadata) {
- print(tab, (Jsr181ParameterMetadata) element);
+ if (element instanceof BeehiveWsTypeMetadata) {
+ print(tab, (BeehiveWsTypeMetadata) element);
+ } else if (element instanceof BeehiveWsMethodMetadata) {
+ print(tab, (BeehiveWsMethodMetadata) element);
+ } else if (element instanceof BeehiveWsParameterMetadata) {
+ print(tab, (BeehiveWsParameterMetadata) element);
}
}
}
- public static void print(Jsr181MethodMetadata webServiceMETHODMetadata) {
+ public static void print(BeehiveWsMethodMetadata webServiceMETHODMetadata) {
print(0, webServiceMETHODMetadata);
}
- public static void print(int tab, Jsr181MethodMetadata webServiceMETHODMetadata) {
+ public static void print(int tab, BeehiveWsMethodMetadata webServiceMETHODMetadata) {
if (webServiceMETHODMetadata == null)
return;
print(tab, "<METHOD > > > > > >WebServiceMETHODMetadata");
@@ -107,11 +109,11 @@
print(tab, webServiceMETHODMetadata.getParams());
}
- public static void print(Jsr181ParameterMetadata webServicePARAMETERMetadata) {
+ public static void print(BeehiveWsParameterMetadata webServicePARAMETERMetadata) {
print(0, webServicePARAMETERMetadata);
}
- public static void print(int tab, Jsr181ParameterMetadata webServicePARAMETERMetadata) {
+ public static void print(int tab, BeehiveWsParameterMetadata webServicePARAMETERMetadata) {
if (webServicePARAMETERMetadata == null)
return;
print(tab, "<PARAM > > > > > > > > >WebServicePARAMETERMetadata");
@@ -124,11 +126,11 @@
print("");
}
- public static void print(SOAPBindingInfo soapBindingInfo) {
+ public static void print(BeehiveWsSOAPBindingInfo soapBindingInfo) {
print(0, soapBindingInfo);
}
- public static void print(int tab, SOAPBindingInfo soapBindingInfo) {
+ public static void print(int tab, BeehiveWsSOAPBindingInfo soapBindingInfo) {
if (soapBindingInfo == null)
return;
print(tab, ">SOAPBindingInfo");
@@ -137,11 +139,11 @@
print(tab, "style", soapBindingInfo.getParameterStyle());
}
- public static void print(SecurityRolesInfo securityRolesInfo) {
+ public static void print(BeehiveWsSecurityRolesInfo securityRolesInfo) {
print(0, securityRolesInfo);
}
- public static void print(int tab, SecurityRolesInfo securityRolesInfo) {
+ public static void print(int tab, BeehiveWsSecurityRolesInfo securityRolesInfo) {
if (securityRolesInfo == null)
return;
print(tab, ">SecurityRolesInfo");
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&r1=153833&r2=153834
==============================================================================
--- 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 Mon Feb 14 11:47:39 2005
@@ -34,8 +34,8 @@
import javax.jws.WebService;
-import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
-import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadataImpl;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181TypeMetadataImpl;
/**
@@ -90,7 +90,7 @@
ClassDeclaration classDecl = (ClassDeclaration) _decl;
messager.printNotice("processing service implementation bean: " + classDecl.getQualifiedName());
- Jsr181TypeMetadata om = null;
+ BeehiveWsTypeMetadata om = null;
String endpointInterface = wsAnnotation.endpointInterface().trim();
// start from endpoint interface
@@ -124,7 +124,7 @@
messager.printNotice("processing service endpoint interface: " + interfaceDecl.getQualifiedName());
// create object model
- Jsr181TypeMetadata om = new Jsr181TypeMetadataImpl(new MirrorTypeInfo(interfaceDecl, _env));
+ BeehiveWsTypeMetadata om = new Jsr181TypeMetadataImpl(new MirrorTypeInfo(interfaceDecl, _env));
if (null == om) {
return;
}
@@ -154,9 +154,9 @@
// todo: persist all object models that have been created [by check()]
}
- private Jsr181TypeMetadata getEndpointInterfaceObjectModel(String endpointInterface) {
+ private BeehiveWsTypeMetadata getEndpointInterfaceObjectModel(String endpointInterface) {
- Jsr181TypeMetadata om = null;
+ BeehiveWsTypeMetadata om = null;
// search for persistent object model
try {
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java?view=diff&r1=153833&r2=153834
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java Mon Feb 14 11:47:39 2005
@@ -18,7 +18,7 @@
*/
package org.apache.beehive.wsm.jsr181.wsdl;
-import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
import java.io.InputStream;
import java.io.IOException;
@@ -37,7 +37,7 @@
* @param wsdlStream an InputStream containing a WSDL document.
* @return a WSM Object model representing the service in the provided WSDL.
*/
- public Jsr181TypeMetadata createObjectModel(InputStream wsdlStream)
+ public BeehiveWsTypeMetadata createObjectModel(InputStream wsdlStream)
throws Exception;
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/Wsdl2AJava.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/Wsdl2AJava.java?view=diff&r1=153833&r2=153834
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/Wsdl2AJava.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/Wsdl2AJava.java Mon Feb 14 11:47:39 2005
@@ -26,7 +26,8 @@
import java.io.Writer;
import java.util.Properties;
-import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.jsr181.model.wsdl.XmlBeanWSDLProcessor;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
@@ -98,7 +99,7 @@
InputStream wsdl = new FileInputStream(wsdlFileName);
WSDLProcessor processor = new XmlBeanWSDLProcessor();
- Jsr181TypeMetadata om = processor.createObjectModel(wsdl);
+ BeehiveWsTypeMetadata om = processor.createObjectModel(wsdl);
String className = om.getWsName();
String packageName = "web"; // Later see if the target name service is
// better option
@@ -127,7 +128,7 @@
throws Exception {
WSDLProcessor processor = new XmlBeanWSDLProcessor();
- Jsr181TypeMetadata om = processor.createObjectModel(wsdl);
+ BeehiveWsTypeMetadata om = processor.createObjectModel(wsdl);
generateAnnotatedJavaFromOM(om, w);
}
@@ -140,7 +141,7 @@
* @throws Exception
* @throws IOException
*/
- public void generateAnnotatedJavaFromOM(Jsr181TypeMetadata om, Writer w)
+ public void generateAnnotatedJavaFromOM(BeehiveWsTypeMetadata om, Writer w)
throws ResourceNotFoundException, ParseErrorException,
MethodInvocationException, Exception, IOException {
VelocityContext context = new VelocityContext();