You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/07/10 18:05:13 UTC
svn commit: r793004 -
/geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBWebServiceGBean.java
Author: djencks
Date: Fri Jul 10 16:05:13 2009
New Revision: 793004
URL: http://svn.apache.org/viewvc?rev=793004&view=rev
Log:
GERONIMO-4645 Work on ejb ws security. Missed a file in previous commit
Modified:
geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBWebServiceGBean.java
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBWebServiceGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBWebServiceGBean.java?rev=793004&r1=793003&r2=793004&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBWebServiceGBean.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBWebServiceGBean.java Fri Jul 10 16:05:13 2009
@@ -26,6 +26,11 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.gbean.annotation.ParamReference;
+import org.apache.geronimo.gbean.annotation.ParamAttribute;
+import org.apache.geronimo.gbean.annotation.ParamSpecial;
+import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
+import org.apache.geronimo.gbean.annotation.GBean;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.jaxws.PortInfo;
import org.apache.geronimo.kernel.Kernel;
@@ -37,24 +42,28 @@
/**
* @version $Rev$ $Date$
*/
+
+@GBean(j2eeType = NameFactory.WEB_SERVICE_LINK)
public class EJBWebServiceGBean implements GBeanLifecycle {
private SoapHandler soapHandler;
private String location;
private EJBWebServiceContainer container;
- public EJBWebServiceGBean(EjbDeployment ejbDeploymentContext,
- PortInfo portInfo,
- Kernel kernel,
- URL configurationBaseUrl,
- Collection<SoapHandler> webContainers,
- ConfigurationFactory configurationFactory,
- String realmName,
- String transportGuarantee,
- String authMethod,
- String[] protectedMethods,
- String[] virtualHosts,
- Properties properties) throws Exception {
+ public EJBWebServiceGBean(@ParamReference(name="EjbDeployment")EjbDeployment ejbDeploymentContext,
+ @ParamAttribute(name="portInfo")PortInfo portInfo,
+ @ParamSpecial(type = SpecialAttributeType.kernel)Kernel kernel,
+ @ParamAttribute(name="configurationBaseUrl")URL configurationBaseUrl,
+ @ParamReference(name="WebServiceContainer")Collection<SoapHandler> webContainers,
+ @ParamAttribute(name="policyContextID")String policyContextID,
+ @ParamReference(name="ConfigurationFactory")ConfigurationFactory configurationFactory,
+ @ParamAttribute(name="realmName")String realmName,
+ @ParamAttribute(name="transportGuarantee")String transportGuarantee,
+ @ParamAttribute(name="authMethod")String authMethod,
+ @ParamAttribute(name="protectedMethods")String[] protectedMethods,
+ @ParamAttribute(name="virtualHosts")String[] virtualHosts,
+ @ParamAttribute(name="properties")Properties properties) throws Exception {
+
if (ejbDeploymentContext == null || webContainers == null || webContainers.isEmpty() || portInfo == null) {
return;
}
@@ -77,6 +86,7 @@
soapHandler.addWebService(this.location,
virtualHosts,
this.container,
+ policyContextID,
configurationFactory,
realmName,
transportGuarantee,
@@ -100,46 +110,5 @@
public void doFail() {
}
-
- public static final GBeanInfo GBEAN_INFO;
-
- static {
- GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(EJBWebServiceGBean.class, EJBWebServiceGBean.class, NameFactory.WEB_SERVICE_LINK);
-
- infoFactory.addReference("EjbDeployment", EjbDeployment.class);
- infoFactory.addAttribute("portInfo", PortInfo.class, true);
- infoFactory.addAttribute("kernel", Kernel.class, false);
- infoFactory.addAttribute("configurationBaseUrl", URL.class, true);
- infoFactory.addReference("ConfigurationFactory", ConfigurationFactory.class);
- infoFactory.addAttribute("realmName", String.class, true);
- infoFactory.addAttribute("transportGuarantee", String.class, true);
- infoFactory.addAttribute("authMethod", String.class, true);
- infoFactory.addAttribute("protectedMethods", String[].class, true);
- infoFactory.addAttribute("virtualHosts", String[].class, true);
- infoFactory.addReference("WebServiceContainer", SoapHandler.class);
- infoFactory.addAttribute("properties", Properties.class, true);
-
- infoFactory.setConstructor(new String[]{
- "EjbDeployment",
- "portInfo",
- "kernel",
- "configurationBaseUrl",
- "WebServiceContainer",
- "ConfigurationFactory",
- "realmName",
- "transportGuarantee",
- "authMethod",
- "protectedMethods",
- "virtualHosts",
- "properties"
- });
-
-
- GBEAN_INFO = infoFactory.getBeanInfo();
- }
-
- public static GBeanInfo getGBeanInfo() {
- return GBEAN_INFO;
- }
-
+
}