You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2011/04/13 10:18:59 UTC
svn commit: r1091697 - in /geronimo/server/trunk/plugins/axis2:
geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/
geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/
geronimo-axis2/src/main/java/org/apache/geronimo/axi...
Author: xuhaihong
Date: Wed Apr 13 08:18:59 2011
New Revision: 1091697
URL: http://svn.apache.org/viewvc?rev=1091697&view=rev
Log:
Use uppercase style for Axis2ModuleRegistry
Modified:
geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java
geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2ServiceRefBuilder.java
geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBEndpointController.java
geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBEndpointLifecycleManager.java
geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBProviderDispatcher.java
geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ConfigGBean.java
geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainerFactoryGBean.java
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java?rev=1091697&r1=1091696&r2=1091697&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java Wed Apr 13 08:18:59 2011
@@ -207,7 +207,7 @@ public class Axis2Builder extends JAXWSS
@Override
protected void initialize(GBeanData targetGBean, Class serviceClass, PortInfo portInfo, Module module, Bundle bundle) throws DeploymentException {
- targetGBean.setReferencePattern("axis2ModuleRegistry", new AbstractNameQuery(Axis2ModuleRegistry.class.getName()));
+ targetGBean.setReferencePattern("Axis2ModuleRegistry", new AbstractNameQuery(Axis2ModuleRegistry.class.getName()));
String serviceName = (portInfo.getServiceName() == null ? serviceClass.getName() : portInfo.getServiceName());
String wsdlFile = portInfo.getWsdlFile();
if(wsdlFile != null && wsdlFile.trim().length() > 0) {
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2ServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2ServiceRefBuilder.java?rev=1091697&r1=1091696&r2=1091697&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2ServiceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2ServiceRefBuilder.java Wed Apr 13 08:18:59 2011
@@ -105,7 +105,7 @@ public class Axis2ServiceRefBuilder exte
} catch (GBeanNotFoundException e1) {
GBeanData configGBeanData = new GBeanData(containerFactoryName, Axis2ConfigGBean.class);
configGBeanData.setAttribute("moduleName", module.getModuleName());
- configGBeanData.setReferencePattern("axis2ModuleRegistry", new AbstractNameQuery(Artifact.create("org.apache.geronimo.configs/axis2//car"), Collections.emptyMap(), Axis2ModuleRegistry.class.getName()));
+ configGBeanData.setReferencePattern("Axis2ModuleRegistry", new AbstractNameQuery(Artifact.create("org.apache.geronimo.configs/axis2//car"), Collections.emptyMap(), Axis2ModuleRegistry.class.getName()));
try {
context.addGBean(configGBeanData);
} catch (GBeanAlreadyExistsException e) {
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBEndpointController.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBEndpointController.java?rev=1091697&r1=1091696&r2=1091697&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBEndpointController.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBEndpointController.java Wed Apr 13 08:18:59 2011
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -26,18 +26,18 @@ import org.apache.axis2.jaxws.server.End
import org.apache.axis2.jaxws.server.dispatcher.EndpointDispatcher;
public class EJBEndpointController extends EndpointController {
-
+
private InvocationContext invContext;
public EJBEndpointController(InvocationContext invContext) {
this.invContext = invContext;
}
-
+
@Override
- protected EndpointDispatcher getEndpointDispatcher(MessageContext mc,
- Class serviceImplClass,
- Object serviceInstance)
- throws Exception {
+ protected EndpointDispatcher getEndpointDispatcher(MessageContext mc,
+ Class serviceImplClass,
+ Object serviceInstance)
+ throws Exception {
if (Provider.class.isAssignableFrom(serviceImplClass)) {
return new EJBProviderDispatcher(serviceImplClass, this.invContext);
} else {
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBEndpointLifecycleManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBEndpointLifecycleManager.java?rev=1091697&r1=1091696&r2=1091697&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBEndpointLifecycleManager.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBEndpointLifecycleManager.java Wed Apr 13 08:18:59 2011
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -23,18 +23,18 @@ import org.apache.axis2.jaxws.server.end
import org.apache.axis2.jaxws.server.endpoint.lifecycle.EndpointLifecycleManager;
public class EJBEndpointLifecycleManager implements EndpointLifecycleManager {
-
- /*
+
+ /*
* This method is called on each web service call.
*/
- public Object createServiceInstance(MessageContext context, Class serviceClass) throws EndpointLifecycleException {
+ public Object createServiceInstance(MessageContext context, Class serviceClass) throws EndpointLifecycleException {
return null;
}
-
- public void invokePostConstruct() throws EndpointLifecycleException {
+
+ public void invokePostConstruct() throws EndpointLifecycleException {
}
public void invokePreDestroy() throws EndpointLifecycleException {
}
-
+
}
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBProviderDispatcher.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBProviderDispatcher.java?rev=1091697&r1=1091696&r2=1091697&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBProviderDispatcher.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBProviderDispatcher.java Wed Apr 13 08:18:59 2011
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -29,13 +29,13 @@ public class EJBProviderDispatcher exten
private InvocationContext invContext;
- public EJBProviderDispatcher(Class serviceImplClass, InvocationContext invContext) {
- super(serviceImplClass, getDummyInstance(serviceImplClass));
+ public EJBProviderDispatcher(Class<?> serviceImplClass, InvocationContext invContext) {
+ super(serviceImplClass, getDummyInstance(serviceImplClass));
this.invContext = invContext;
}
-
+
// TODO: change ProviderDispatcher so that instance is not required
- private static Object getDummyInstance(Class serviceImplClass) {
+ private static Object getDummyInstance(Class<?> serviceImplClass) {
try {
return serviceImplClass.newInstance();
} catch (Exception e) {
@@ -48,5 +48,5 @@ public class EJBProviderDispatcher exten
this.invContext.setParameters(args);
return this.invContext.proceed();
}
-
+
}
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ConfigGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ConfigGBean.java?rev=1091697&r1=1091696&r2=1091697&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ConfigGBean.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ConfigGBean.java Wed Apr 13 08:18:59 2011
@@ -41,7 +41,7 @@ public class Axis2ConfigGBean implements
private Axis2ModuleRegistry axis2ModuleRegistry;
public Axis2ConfigGBean(@ParamAttribute(name = "moduleName") AbstractName moduleName,
- @ParamReference(name = "axis2ModuleRegistry") Axis2ModuleRegistry axis2ModuleRegistry,
+ @ParamReference(name = "Axis2ModuleRegistry") Axis2ModuleRegistry axis2ModuleRegistry,
@ParamSpecial(type = SpecialAttributeType.classLoader) ClassLoader classLoader) {
this.moduleName = moduleName;
this.classLoder = classLoader;
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainerFactoryGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainerFactoryGBean.java?rev=1091697&r1=1091696&r2=1091697&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainerFactoryGBean.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainerFactoryGBean.java Wed Apr 13 08:18:59 2011
@@ -65,7 +65,7 @@ public class POJOWebServiceContainerFact
@ParamReference(name="TransactionManager", namingType=NameFactory.JTA_RESOURCE) TransactionManager transactionManager,
@ParamAttribute(name="holder") AnnotationHolder holder,
@ParamAttribute(name="contextRoot") String contextRoot,
- @ParamReference(name="axis2ModuleRegistry") Axis2ModuleRegistry axis2ModuleRegistry,
+ @ParamReference(name="Axis2ModuleRegistry") Axis2ModuleRegistry axis2ModuleRegistry,
@ParamSpecial(type = SpecialAttributeType.kernel) Kernel kernel,
@ParamSpecial(type = SpecialAttributeType.bundle) Bundle bundle,
@ParamSpecial(type = SpecialAttributeType.classLoader) ClassLoader classLoader)