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/06/09 18:53:11 UTC
svn commit: r189778 - in /incubator/beehive/trunk:
system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/
wsm/lib/ wsm/src/runtime/org/apache/beehive/wsm/axis/
wsm/src/runtime/org/apache/beehive/wsm/axis/ant/
wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/
wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/
wsm/src/runtime/org/apache/beehive/wsm/axis/registration/
wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/
wsm/src/runtime/org/apache/beehive/wsm/model/
wsm/src/runtime/org/apache/beehive/wsm/model/java/
wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/
wsm/src/runtime/org/apache/beehive/wsm/model/wsdl/
wsm/src/runtime/org/apache/beehive/wsm/processor/
wsm/src/runtime/org/apache/beehive/wsm/processor/apt/
wsm/src/runtime/org/apache/beehive/wsm/registration/
wsm/src/runtime/org/apache/beehive/wsm/wsdl/
Author: ekoneil
Date: Thu Jun 9 09:53:09 2005
New Revision: 189778
URL: http://svn.apache.org/viewcvs?rev=189778&view=rev
Log:
WSM work.
- privatize a bunch of class members
- remove the empty wsm/lib directory
- remove the Handlerhandler and InvalidFileType classes
- remove WSDLFilter and create private static inner classes of the same in ExtensionMaker and AxisTypeGeneratorTask. This helps (incrementally) loosely couple WSM and the service control.
- move package import statements below the license file
BB: self
DRT: Beehive / service control / build.dist pass
Removed:
incubator/beehive/trunk/wsm/lib/
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDLFilter.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/HandlerHandler.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InvalidFileType.java
Modified:
incubator/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ExtensionMaker.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGeneratorTask.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/SystemTypeLookupService.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandler.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/registration/AxisTypeMappingMetaData.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanTypeLookup.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsMethodMetadata.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsParameterMetadata.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPBindingInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSecurityRolesInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/ValidationException.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaMethodInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaParameterInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaTypeInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InitParamInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181MethodMetadataImpl.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ObjectModelStore.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ParameterMetadataImpl.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181TypeMetadataImpl.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPBindingInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPMessageHandlerInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/ProcessorException.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorMethodInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorParameterInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorTypeInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TwoPhaseAnnotationProcessor.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TypeMirrorUtil.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WebServiceMetadataViewer.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/registration/TypeRegistrar.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/AbstractWsdl2AJava.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Schema.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Utilities.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/WSDLParser.java
Modified: incubator/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ExtensionMaker.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ExtensionMaker.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ExtensionMaker.java (original)
+++ incubator/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ExtensionMaker.java Thu Jun 9 09:53:09 2005
@@ -17,17 +17,17 @@
*/
package org.apache.beehive.controls.system.webservice.generator;
+import java.util.List;
import java.io.File;
+import java.io.FileFilter;
import java.io.PrintWriter;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.FileInputStream;
-import java.util.List;
import javax.jws.WebParam;
import org.apache.axis.wsdl.toJava.Namespaces;
import org.apache.axis.wsdl.toJava.Utils;
-import org.apache.beehive.wsm.axis.ant.WSDLFilter;
import org.apache.beehive.wsm.axis.databinding.SystemTypeLookupService;
import org.apache.beehive.wsm.model.BeehiveWsMethodMetadata;
import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
@@ -48,6 +48,8 @@
*/
public class ExtensionMaker {
+ private static FileFilter FILE_FILTER_WSDL = new WSDLFilter();
+
private static final String[] standardImports = {
"org.apache.beehive.controls.api.bean.ControlExtension",
"org.apache.beehive.controls.system.webservice.ServiceControl",
@@ -301,7 +303,7 @@
setPackageName(pkgName);
File wsdlDir = new File(wsdlDirName);
if (wsdlDir.isDirectory()) {
- for (File wsdlFile : wsdlDir.listFiles(new WSDLFilter())) {
+ for (File wsdlFile : wsdlDir.listFiles(FILE_FILTER_WSDL)) {
genJCXForWSDLFile( wsdlPathAnnotation, wsdlFile);
}
} else if (wsdlDir.isFile()) {
@@ -317,7 +319,7 @@
* @param wsdlFile
* @throws IOException
* @throws Exception
- * @throws FileNotFoundException
+ * @throws java.io.FileNotFoundException
* @throws XmlException
* @throws IllegalAccessException
* @throws NoSuchFieldException
@@ -353,5 +355,13 @@
*/
public void setPackageName(String packageName) {
this.packageName = packageName;
+ }
+
+ private static class WSDLFilter
+ implements java.io.FileFilter {
+
+ public boolean accept(java.io.File f) {
+ return (f.isFile() && (f.getName().endsWith("wsdl") || f.getName().endsWith("WSDL")));
+ }
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java Thu Jun 9 09:53:09 2005
@@ -68,7 +68,6 @@
try {
super.invoke(msgContext);
} catch (AxisFault e) {
-
// Before we get to here, Axis has converted all exceptions to the
// AxisFaults.
// A standard AxisFault wont serialize the exception correctly.
@@ -76,16 +75,10 @@
// and
// "do the right thing"
Throwable origExp = e.detail;
- if (origExp == null)
+ if (origExp == null || origExp instanceof AxisFault || origExp instanceof RuntimeException)
throw e; // The original exception was AxisFault
-
- assert !(origExp instanceof AxisFault) : "Unexpected: found AxisFault as detail of AxisFault";
-
- if (origExp instanceof RuntimeException)
- throw e; // Let Axis Deal with Runtime exceptions
-
// if we have a user defined exception then wrap it in an adaptor.
- throw new AxisFaultAdaptor(msgContext, origExp);
+ else throw new AxisFaultAdaptor(msgContext, origExp);
}
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGeneratorTask.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGeneratorTask.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGeneratorTask.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGeneratorTask.java Thu Jun 9 09:53:09 2005
@@ -22,6 +22,7 @@
package org.apache.beehive.wsm.axis.ant;
import java.io.File;
+import java.io.FileFilter;
import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.BuildException;
@@ -38,8 +39,10 @@
public class AxisTypeGeneratorTask
extends Task {
- File mWSDL, mOutDir;
- boolean generateJWS = false;
+ private static final FileFilter WSDL_FILE_FILTER = new WSDLFilter();
+
+ private File mWSDL, mOutDir;
+ private boolean generateJWS = false;
/**
* @return Returns the generateJWS.
@@ -68,7 +71,7 @@
try {
if(mOutDir != null && mWSDL != null && mWSDL.isDirectory()) {
AxisTypeGenerator atg = new AxisTypeGenerator();
- for(File f : mWSDL.listFiles(new WSDLFilter())) {
+ for(File f : mWSDL.listFiles(WSDL_FILE_FILTER)) {
atg.generateTypes(f.getPath(), mOutDir.getPath());
}
}
@@ -84,6 +87,14 @@
else {
throw new BuildException(e.toString(), e);
}
+ }
+ }
+
+ private static class WSDLFilter
+ implements java.io.FileFilter {
+
+ public boolean accept(java.io.File f) {
+ return (f.isFile() && (f.getName().endsWith("wsdl") || f.getName().endsWith("WSDL")));
}
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java Thu Jun 9 09:53:09 2005
@@ -30,7 +30,8 @@
public class WSDL2AJavaTask
extends Java {
- File mWSDL, mOutDir;
+ private File mWSDL;
+ private File mOutDir;
public WSDL2AJavaTask() {
super();
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java Thu Jun 9 09:53:09 2005
@@ -17,7 +17,6 @@
*
*
*/
-
package org.apache.beehive.wsm.axis.databinding;
import javax.xml.namespace.QName;
@@ -34,7 +33,7 @@
public class AxisTypeLookup
implements BindingLookupService {
- static Logger logger = Logger.getLogger(AxisTypeLookup.class);
+ private static Logger logger = Logger.getLogger(AxisTypeLookup.class);
private static final char[] pkgSeparators = {'.', ':'};
public AxisTypeLookup() {
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/SystemTypeLookupService.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/SystemTypeLookupService.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/SystemTypeLookupService.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/SystemTypeLookupService.java Thu Jun 9 09:53:09 2005
@@ -20,7 +20,6 @@
package org.apache.beehive.wsm.axis.databinding;
import java.util.ArrayList;
-import java.util.List;
import javax.xml.namespace.QName;
import org.apache.beehive.wsm.databinding.BindingLookupService;
@@ -29,11 +28,11 @@
public class SystemTypeLookupService
implements BindingLookupService {
- List<BindingLookupService> lookupServiceList = new ArrayList<BindingLookupService>();
+ private ArrayList<BindingLookupService> LOOKUP_SERVICE_LIST = new ArrayList<BindingLookupService>();
public SystemTypeLookupService() {
- lookupServiceList.add(new XmlBeanTypeLookup());
- lookupServiceList.add(new AxisTypeLookup());
+ LOOKUP_SERVICE_LIST.add(new XmlBeanTypeLookup());
+ LOOKUP_SERVICE_LIST.add(new AxisTypeLookup());
}
/*
@@ -42,7 +41,7 @@
public QName class2qname(Class cls) {
QName qname = null;
- for(BindingLookupService lookUpService : lookupServiceList) {
+ for(BindingLookupService lookUpService : LOOKUP_SERVICE_LIST) {
if(null != (qname = lookUpService.class2qname(cls)))
break;
}
@@ -55,7 +54,7 @@
public QName class2qname(Class cls, String namespace) {
QName qname = null;
- for(BindingLookupService lookUpService : lookupServiceList) {
+ for(BindingLookupService lookUpService : LOOKUP_SERVICE_LIST) {
if(null != (qname = lookUpService.class2qname(cls, namespace)))
break;
}
@@ -67,7 +66,7 @@
*/
public Class qname2class(QName qname) {
Class cls = null;
- for(BindingLookupService lookUpService : lookupServiceList) {
+ for(BindingLookupService lookUpService : LOOKUP_SERVICE_LIST) {
if(null != (cls = lookUpService.qname2class(qname)))
break;
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandler.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandler.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandler.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandler.java Thu Jun 9 09:53:09 2005
@@ -1,4 +1,3 @@
-package org.apache.beehive.wsm.axis.handlers;
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -16,6 +15,8 @@
* limitations under the License.
*
*/
+package org.apache.beehive.wsm.axis.handlers;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/registration/AxisTypeMappingMetaData.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/registration/AxisTypeMappingMetaData.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/registration/AxisTypeMappingMetaData.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/registration/AxisTypeMappingMetaData.java Thu Jun 9 09:53:09 2005
@@ -21,7 +21,7 @@
*/
public class AxisTypeMappingMetaData {
- static Map<Class, QName> builtInTypes = new HashMap<Class, QName>();
+ private static HashMap<Class, QName> builtInTypes = new HashMap<Class, QName>();
static {
initBuildInTypes();
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanTypeLookup.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanTypeLookup.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanTypeLookup.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanTypeLookup.java Thu Jun 9 09:53:09 2005
@@ -34,8 +34,8 @@
public class XmlBeanTypeLookup
implements BindingLookupService {
- static Logger logger = Logger.getLogger(XmlBeanTypeLookup.class);
- static XmlBeanTypeLookup theLookup = new XmlBeanTypeLookup();
+ private static Logger LOGGER = Logger.getLogger(XmlBeanTypeLookup.class);
+ private static XmlBeanTypeLookup THE_LOOKUP = new XmlBeanTypeLookup();
public QName class2qname(Class cls) {
if(XmlObject.class.isAssignableFrom(cls)) {
@@ -54,7 +54,7 @@
* @see TypeLookUpServices#Qname2Class(javax.xml.namespace.QName)
*/
public Class qname2class(QName qname) {
- logger.debug("Get XMLBeans class for Qname: " + qname);
+ LOGGER.debug("Get XMLBeans class for Qname: " + qname);
SchemaTypeLoader stl = XmlBeans.getContextTypeLoader();
SchemaType st = stl.findType(qname);
if(st == null) {
@@ -105,6 +105,14 @@
}
}
+ /**
+ * @param q
+ * @return Class
+ */
+ public static Class q2Class(QName q) {
+ return THE_LOOKUP.qname2class(q);
+ }
+
private Class scanDeclaredMethodsForViableReturnType(Method[] declared) {
/* TODO: Does this make sense? IT looks as if the type of the class is determined based on the
* method return types.
@@ -133,13 +141,5 @@
}
}
return null;
- }
-
- /**
- * @param q
- * @return Class
- */
- public static Class q2Class(QName q) {
- return theLookup.qname2class(q);
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsMethodMetadata.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsMethodMetadata.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsMethodMetadata.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsMethodMetadata.java Thu Jun 9 09:53:09 2005
@@ -24,6 +24,7 @@
* @author Daryoush
*/
public interface BeehiveWsMethodMetadata {
+
boolean isOneWay();
void setOneWay(boolean oneway);
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsParameterMetadata.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsParameterMetadata.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsParameterMetadata.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsParameterMetadata.java Thu Jun 9 09:53:09 2005
@@ -24,6 +24,7 @@
* @author Daryoush
*/
public interface BeehiveWsParameterMetadata {
+
boolean isWpHeader();
void setWpHeader(boolean wpHeader);
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPBindingInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPBindingInfo.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPBindingInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPBindingInfo.java Thu Jun 9 09:53:09 2005
@@ -23,6 +23,7 @@
* @author dmehrtash
*/
public interface BeehiveWsSOAPBindingInfo {
+
/**
* @return Returns the parameterStyle.
*/
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSecurityRolesInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSecurityRolesInfo.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSecurityRolesInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSecurityRolesInfo.java Thu Jun 9 09:53:09 2005
@@ -23,6 +23,7 @@
* @author dmehrtash
*/
public interface BeehiveWsSecurityRolesInfo {
+
/**
* @return Returns the wrRolesAllowed.
*/
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/ValidationException.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/ValidationException.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/ValidationException.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/ValidationException.java Thu Jun 9 09:53:09 2005
@@ -24,7 +24,15 @@
super();
}
- public ValidationException(String msg) {
- super(msg);
+ public ValidationException(String message) {
+ super(message);
+ }
+
+ public ValidationException(Throwable cause) {
+ super(cause);
+ }
+
+ public ValidationException(String message, Throwable cause) {
+ super(message, cause);
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaMethodInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaMethodInfo.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaMethodInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaMethodInfo.java Thu Jun 9 09:53:09 2005
@@ -1,5 +1,3 @@
-package org.apache.beehive.wsm.model.java;
-
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$Factory
*/
+package org.apache.beehive.wsm.model.java;
import java.lang.annotation.Annotation;
import java.util.Collection;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaParameterInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaParameterInfo.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaParameterInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaParameterInfo.java Thu Jun 9 09:53:09 2005
@@ -1,5 +1,3 @@
-package org.apache.beehive.wsm.model.java;
-
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$Factory
*/
+package org.apache.beehive.wsm.model.java;
import java.lang.annotation.Annotation;
import java.util.Collection;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaTypeInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaTypeInfo.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaTypeInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaTypeInfo.java Thu Jun 9 09:53:09 2005
@@ -1,5 +1,3 @@
-package org.apache.beehive.wsm.model.java;
-
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$Factory
*/
+package org.apache.beehive.wsm.model.java;
import java.io.File;
import java.lang.annotation.Annotation;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InitParamInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InitParamInfo.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InitParamInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InitParamInfo.java Thu Jun 9 09:53:09 2005
@@ -1,4 +1,3 @@
-package org.apache.beehive.wsm.model.jsr181;
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.wsm.model.jsr181;
import javax.jws.soap.InitParam;
@@ -24,8 +24,8 @@
private static final long serialVersionUID = 1L;
- String name;
- String value;
+ private String name;
+ private String value;
/**
*
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181MethodMetadataImpl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181MethodMetadataImpl.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181MethodMetadataImpl.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181MethodMetadataImpl.java Thu Jun 9 09:53:09 2005
@@ -1,5 +1,3 @@
-package org.apache.beehive.wsm.model.jsr181;
-
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.wsm.model.jsr181;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ObjectModelStore.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ObjectModelStore.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ObjectModelStore.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ObjectModelStore.java Thu Jun 9 09:53:09 2005
@@ -1,4 +1,3 @@
-package org.apache.beehive.wsm.model.jsr181;
/*
* Copyright 2005 The Apache Software Foundation
*
@@ -16,6 +15,8 @@
*
* $Header:$Factory
*/
+package org.apache.beehive.wsm.model.jsr181;
+
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ParameterMetadataImpl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ParameterMetadataImpl.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ParameterMetadataImpl.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ParameterMetadataImpl.java Thu Jun 9 09:53:09 2005
@@ -1,5 +1,3 @@
-package org.apache.beehive.wsm.model.jsr181;
-
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.wsm.model.jsr181;
import java.lang.annotation.Annotation;
import java.util.Collection;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181TypeMetadataImpl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181TypeMetadataImpl.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181TypeMetadataImpl.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181TypeMetadataImpl.java Thu Jun 9 09:53:09 2005
@@ -1,5 +1,3 @@
-package org.apache.beehive.wsm.model.jsr181;
-
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$Factory
*/
+package org.apache.beehive.wsm.model.jsr181;
import java.io.File;
import java.io.InputStream;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPBindingInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPBindingInfo.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPBindingInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPBindingInfo.java Thu Jun 9 09:53:09 2005
@@ -1,9 +1,3 @@
-package org.apache.beehive.wsm.model.jsr181;
-
-import javax.jws.soap.SOAPBinding;
-
-import org.apache.beehive.wsm.model.BeehiveWsSOAPBindingInfo;
-
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -21,15 +15,20 @@
*
* $Header:$
*/
+package org.apache.beehive.wsm.model.jsr181;
+
+import javax.jws.soap.SOAPBinding;
+
+import org.apache.beehive.wsm.model.BeehiveWsSOAPBindingInfo;
public class SOAPBindingInfo
implements java.io.Serializable, BeehiveWsSOAPBindingInfo {
private static final long serialVersionUID = 1L;
- SOAPBinding.Style style = SOAPBinding.Style.DOCUMENT;
- SOAPBinding.Use use = SOAPBinding.Use.LITERAL;
- SOAPBinding.ParameterStyle parameterStyle = SOAPBinding.ParameterStyle.WRAPPED;
+ private SOAPBinding.Style style = SOAPBinding.Style.DOCUMENT;
+ private SOAPBinding.Use use = SOAPBinding.Use.LITERAL;
+ private SOAPBinding.ParameterStyle parameterStyle = SOAPBinding.ParameterStyle.WRAPPED;
/**
*
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPMessageHandlerInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPMessageHandlerInfo.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPMessageHandlerInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPMessageHandlerInfo.java Thu Jun 9 09:53:09 2005
@@ -32,11 +32,11 @@
implements java.io.Serializable, BeehiveWsSOAPMessageHandlerInfo {
private static final long serialVersionUID = 1L;
- String name;
- String className;
- HashMap<String, String> parameterMap = new HashMap<String, String>();
- Collection<String> roles = new ArrayList<String>();
- Collection<String> headers = new ArrayList<String>();
+ private String name;
+ private String className;
+ private HashMap<String, String> parameterMap = new HashMap<String, String>();
+ private Collection<String> roles = new ArrayList<String>();
+ private Collection<String> headers = new ArrayList<String>();
/**
*
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java Thu Jun 9 09:53:09 2005
@@ -74,8 +74,6 @@
public class XmlBeanWSDLProcessor {
private BindingLookupService lookupService;
- DefinitionsDocument defDoc;
-
public static final String TRANSPORT = "http://schemas.xmlsoap.org/soap/http";
public static final String SOAPENCODING = "http://schemas.xmlsoap.org/soap/encoding/";
@@ -83,6 +81,8 @@
public static final String WSDLNS = "http://schemas.xmlsoap.org/wsdl/soap/";
public static final String WSDLSOAPNS = "http://schemas.xmlsoap.org/wsdl/soap/";
+
+ private DefinitionsDocument defDoc;
public QName getServiceName() {
TService[] services = defDoc.getDefinitions().getServiceArray();
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/ProcessorException.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/ProcessorException.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/ProcessorException.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/ProcessorException.java Thu Jun 9 09:53:09 2005
@@ -1,5 +1,3 @@
-package org.apache.beehive.wsm.processor;
-
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.wsm.processor;
/**
* A simple exception wrapper class used for processor failures.
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorMethodInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorMethodInfo.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorMethodInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorMethodInfo.java Thu Jun 9 09:53:09 2005
@@ -1,5 +1,3 @@
-package org.apache.beehive.wsm.processor.apt;
-
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -17,6 +15,8 @@
*
* $Header:$Factory
*/
+package org.apache.beehive.wsm.processor.apt;
+
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.Collection;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorParameterInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorParameterInfo.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorParameterInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorParameterInfo.java Thu Jun 9 09:53:09 2005
@@ -1,5 +1,3 @@
-package org.apache.beehive.wsm.processor.apt;
-
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$Factory
*/
+package org.apache.beehive.wsm.processor.apt;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorTypeInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorTypeInfo.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorTypeInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorTypeInfo.java Thu Jun 9 09:53:09 2005
@@ -1,5 +1,3 @@
-package org.apache.beehive.wsm.processor.apt;
-
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$Factory
*/
+package org.apache.beehive.wsm.processor.apt;
import java.io.File;
import java.lang.annotation.Annotation;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TwoPhaseAnnotationProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TwoPhaseAnnotationProcessor.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TwoPhaseAnnotationProcessor.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TwoPhaseAnnotationProcessor.java Thu Jun 9 09:53:09 2005
@@ -1,5 +1,3 @@
-package org.apache.beehive.wsm.processor.apt;
-
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.wsm.processor.apt;
import java.util.Collection;
import java.util.Set;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TypeMirrorUtil.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TypeMirrorUtil.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TypeMirrorUtil.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TypeMirrorUtil.java Thu Jun 9 09:53:09 2005
@@ -1,5 +1,3 @@
-package org.apache.beehive.wsm.processor.apt;
-
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.wsm.processor.apt;
import com.sun.mirror.type.ArrayType;
import com.sun.mirror.type.PrimitiveType;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WebServiceMetadataViewer.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WebServiceMetadataViewer.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WebServiceMetadataViewer.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WebServiceMetadataViewer.java Thu Jun 9 09:53:09 2005
@@ -1,5 +1,3 @@
-package org.apache.beehive.wsm.processor.apt;
-
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.wsm.processor.apt;
import java.util.Collection;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java Thu Jun 9 09:53:09 2005
@@ -1,5 +1,3 @@
-package org.apache.beehive.wsm.processor.apt;
-
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.wsm.processor.apt;
import java.util.HashSet;
import java.util.Set;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java Thu Jun 9 09:53:09 2005
@@ -1,5 +1,3 @@
-package org.apache.beehive.wsm.processor.apt;
-
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.wsm.processor.apt;
import java.util.Arrays;
import java.util.Collection;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/registration/TypeRegistrar.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/registration/TypeRegistrar.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/registration/TypeRegistrar.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/registration/TypeRegistrar.java Thu Jun 9 09:53:09 2005
@@ -37,10 +37,11 @@
import org.apache.log4j.Logger;
public abstract class TypeRegistrar {
- static Logger logger = Logger.getLogger(TypeRegistrar.class);
- protected TypeMapping mTypeMapping;
+ private static Logger logger = Logger.getLogger(TypeRegistrar.class);
+ /* todo: need to figure out how to protect these since they're used by subclasses */
+ protected TypeMapping mTypeMapping;
protected BindingLookupService lookupService;
/**
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/AbstractWsdl2AJava.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/AbstractWsdl2AJava.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/AbstractWsdl2AJava.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/AbstractWsdl2AJava.java Thu Jun 9 09:53:09 2005
@@ -39,8 +39,9 @@
* @author dmehrtas
*/
public abstract class AbstractWsdl2AJava {
- VelocityEngine ve = null;
- Template template = null;
+
+ private VelocityEngine ve = null;
+ private Template template = null;
protected abstract BeehiveWsTypeMetadata getWSObjectModel(InputStream wsdl)
throws Exception;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Schema.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Schema.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Schema.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Schema.java Thu Jun 9 09:53:09 2005
@@ -33,7 +33,7 @@
public class Schema {
- SchemaDocument.Schema[] schemas;
+ private SchemaDocument.Schema[] schemas;
/**
* @param tt
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Utilities.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Utilities.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Utilities.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Utilities.java Thu Jun 9 09:53:09 2005
@@ -31,8 +31,8 @@
public class Utilities {
- // Keep a cache of schemas that have been read.
- static Map<String, Schema> schemaCache = new HashMap<String, Schema>();
+ /* Keep a cache of schemas that have been read. */
+ private static Map<String, Schema> schemaCache = new HashMap<String, Schema>();
public static <T extends XmlObject> T[] selectChildren(XmlObject parent, Class<T> childClass)
throws IllegalAccessException, NoSuchFieldException {
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/WSDLParser.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/WSDLParser.java?rev=189778&r1=189777&r2=189778&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/WSDLParser.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/WSDLParser.java Thu Jun 9 09:53:09 2005
@@ -1,5 +1,3 @@
-package org.apache.beehive.wsm.wsdl;
-
/*
*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -19,6 +17,7 @@
*
*
*/
+package org.apache.beehive.wsm.wsdl;
import java.io.IOException;
import java.io.InputStream;
@@ -32,11 +31,11 @@
public class WSDLParser {
- InputStream stream;
- DefinitionsDocument defDoc;
- TTypes tt;
- Schema schema;
- TService[] services;
+ private InputStream stream;
+ private DefinitionsDocument defDoc;
+ private TTypes tt;
+ private Schema schema;
+ private TService[] services;
/**
* @param stream
@@ -62,6 +61,7 @@
return schema;
}
+ /* todo: whack. this isn't used */
public String getSoapAddressLocation()
throws IllegalAccessException {
String location = null;