You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by az...@apache.org on 2007/07/07 13:15:44 UTC
svn commit: r554178 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2:
deployment/DeploymentEngine.java description/AxisService.java
Author: azeez
Date: Sat Jul 7 04:15:42 2007
New Revision: 554178
URL: http://svn.apache.org/viewvc?view=rev&rev=554178
Log:
1. Displaying a message when modules & services are deployed from a URL
2. Recalculate the cached EPR when a list of transports is added
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?view=diff&rev=554178&r1=554177&r2=554178
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java Sat Jul 7 04:15:42 2007
@@ -185,6 +185,8 @@
servicesURL,
fileUrl.substring(0, fileUrl.indexOf(".aar")));
addServiceGroup(serviceGroup, servicelist, servicesURL, null, axisConfig);
+ log.info(Messages.getMessage(DeploymentErrorMsgs.DEPLOYING_WS,
+ org.apache.axis2.util.Utils.getModuleName(serviceGroup.getServiceGroupName())));
}
}
} catch (MalformedURLException e) {
@@ -230,6 +232,9 @@
populateModule(module, moduleurl);
module.setFileName(moduleurl);
addNewModule(module, axisConfig);
+ log.info(Messages.getMessage(DeploymentErrorMsgs.DEPLOYING_MODULE,
+ org.apache.axis2.util.Utils.getModuleName(module.getName(),
+ module.getVersion())));
}
}
org.apache.axis2.util.Utils.
@@ -295,7 +300,7 @@
List services = reader.getAxisServiceFromWsdl(
serviceClassLoader.getResourceAsStream(line),
serviceClassLoader, line);
- if(services!=null){
+ if (services != null) {
for (int i = 0; i < services.size(); i++) {
AxisService axisService = (AxisService) services.get(i);
servicesMap.put(axisService.getName(), axisService);
@@ -448,9 +453,9 @@
fillServiceGroup(serviceGroup, serviceList, serviceLocation, axisConfiguration);
axisConfiguration.addServiceGroup(serviceGroup);
if (currentDeploymentFile != null) {
- addAsWebResources(currentDeploymentFile.getFile(),
- serviceGroup.getServiceGroupName(), serviceGroup);
- }
+ addAsWebResources(currentDeploymentFile.getFile(),
+ serviceGroup.getServiceGroupName(), serviceGroup);
+ }
}
protected static void fillServiceGroup(AxisServiceGroup serviceGroup,
@@ -581,8 +586,8 @@
* DeploymentException
*
* @param in : InputStream to axis2.xml
- * @throws DeploymentException : If something goes wrong
* @return a populated AxisConfiguration
+ * @throws DeploymentException : If something goes wrong
*/
public AxisConfiguration populateAxisConfiguration(InputStream in) throws DeploymentException {
axisConfig = new AxisConfiguration();
@@ -696,7 +701,7 @@
if (zip.getName().toUpperCase().startsWith("WWW")) {
String fileName = zip.getName();
fileName = fileName.substring("WWW/".length(),
- fileName.length());
+ fileName.length());
if (zip.isDirectory()) {
new File(out, fileName).mkdirs();
} else {
@@ -721,7 +726,7 @@
public String getWebLocationString() {
return webLocationString;
}
-
+
/**
* To set the all the classLoader hierarchy this method can be used , the top most parent is
* CCL then SCL(system Class Loader)
@@ -886,16 +891,16 @@
*
* @param modulearchive : Actual module archive file
* @param config : AxisConfiguration : for get classloaders etc..
- * @throws org.apache.axis2.deployment.DeploymentException if there's a problem
- *
* @return a complete AxisModule read from the file.
+ * @throws org.apache.axis2.deployment.DeploymentException
+ * if there's a problem
*/
public static AxisModule buildModule(File modulearchive,
AxisConfiguration config)
throws DeploymentException {
final String MODULE_DEPLOYER = "moduleDeployer";
AxisModule axismodule;
- ModuleDeployer deployer = (ModuleDeployer)config.getParameterValue(MODULE_DEPLOYER);
+ ModuleDeployer deployer = (ModuleDeployer) config.getParameterValue(MODULE_DEPLOYER);
try {
if (deployer == null) {
deployer = new ModuleDeployer(config);
@@ -948,7 +953,7 @@
* servicecontext to EngineContext and axisservice into EngineConfiguration.
*
* @param serviceInputStream InputStream containing configuration data
- * @param configCtx the ConfigurationContext in which we're deploying
+ * @param configCtx the ConfigurationContext in which we're deploying
* @return Returns AxisService.
* @throws DeploymentException if there's a problem
*/
@@ -972,14 +977,14 @@
* To build a AxisServiceGroup for a given services.xml
* You have to add the created group into AxisConfig
*
- * @param servicesxml InputStream created from services.xml or equivalent
- * @param classLoader ClassLoader to use
+ * @param servicesxml InputStream created from services.xml or equivalent
+ * @param classLoader ClassLoader to use
* @param serviceGroupName name of the service group
- * @param configCtx the ConfigurationContext in which we're deploying
- * @param archiveReader the ArchiveReader we're working with
- * @param wsdlServices Map of existing WSDL services
- * @throws AxisFault if there's a problem
+ * @param configCtx the ConfigurationContext in which we're deploying
+ * @param archiveReader the ArchiveReader we're working with
+ * @param wsdlServices Map of existing WSDL services
* @return a fleshed-out AxisServiceGroup
+ * @throws AxisFault if there's a problem
*/
public static AxisServiceGroup buildServiceGroup(InputStream servicesxml,
ClassLoader classLoader,
@@ -1005,32 +1010,33 @@
}
}
- public static AxisServiceGroup loadServiceGroup(File serviceFile ,
- ConfigurationContext configCtx) throws AxisFault {
- try {
- DeploymentFileData currentDeploymentFile = new DeploymentFileData(null, null);
- DeploymentClassLoader classLoader = new DeploymentClassLoader(new URL[]{serviceFile.toURL()},
- new ArrayList(),
- Thread.currentThread().getContextClassLoader());
- currentDeploymentFile.setClassLoader(classLoader);
- AxisServiceGroup serviceGroup = new AxisServiceGroup();
- serviceGroup.setServiceGroupClassLoader(classLoader);
- serviceGroup.setServiceGroupName(serviceFile.getName());
- AxisConfiguration axisConfig = configCtx.getAxisConfiguration();
-
- HashMap wsdlServices = new HashMap();
- ArchiveReader archiveReader = new ArchiveReader();
- archiveReader.processFilesInFolder(serviceFile, wsdlServices);
- InputStream serviceXml = classLoader.getResourceAsStream("META-INF/services.xml");
- ArrayList serviceList = archiveReader.buildServiceGroup(serviceXml,
- currentDeploymentFile,
- serviceGroup,
- wsdlServices, configCtx);
- fillServiceGroup(serviceGroup, serviceList, null, axisConfig);
- return serviceGroup;
- } catch (Exception e) {
- throw new DeploymentException(e);
- }
+ public static AxisServiceGroup loadServiceGroup(File serviceFile,
+ ConfigurationContext configCtx)
+ throws AxisFault {
+ try {
+ DeploymentFileData currentDeploymentFile = new DeploymentFileData(null, null);
+ DeploymentClassLoader classLoader = new DeploymentClassLoader(new URL[]{serviceFile.toURL()},
+ new ArrayList(),
+ Thread.currentThread().getContextClassLoader());
+ currentDeploymentFile.setClassLoader(classLoader);
+ AxisServiceGroup serviceGroup = new AxisServiceGroup();
+ serviceGroup.setServiceGroupClassLoader(classLoader);
+ serviceGroup.setServiceGroupName(serviceFile.getName());
+ AxisConfiguration axisConfig = configCtx.getAxisConfiguration();
+
+ HashMap wsdlServices = new HashMap();
+ ArchiveReader archiveReader = new ArchiveReader();
+ archiveReader.processFilesInFolder(serviceFile, wsdlServices);
+ InputStream serviceXml = classLoader.getResourceAsStream("META-INF/services.xml");
+ ArrayList serviceList = archiveReader.buildServiceGroup(serviceXml,
+ currentDeploymentFile,
+ serviceGroup,
+ wsdlServices, configCtx);
+ fillServiceGroup(serviceGroup, serviceList, null, axisConfig);
+ return serviceGroup;
+ } catch (Exception e) {
+ throw new DeploymentException(e);
+ }
}
@@ -1074,14 +1080,14 @@
}
public Deployer getDeployerForExtension(String extension) {
- return (Deployer)extensionToDeployerMappingMap.get(extension);
+ return (Deployer) extensionToDeployerMappingMap.get(extension);
}
/**
* Clean up the mess
*/
public void cleanup() {
- if(scheduler != null){
+ if (scheduler != null) {
scheduler.cleanup();
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=554178&r1=554177&r2=554178
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java Sat Jul 7 04:15:42 2007
@@ -887,7 +887,8 @@
}
}
}
- return (String[]) eprList.toArray(new String[eprList.size()]);
+ eprs = (String[]) eprList.toArray(new String[eprList.size()]);
+ return eprs;
}
private void printUserWSDL(OutputStream out) throws AxisFault {
@@ -1460,6 +1461,7 @@
public void setExposedTransports(List transports) {
enableAllTransports = false;
this.exposedTransports = transports;
+ calculateEPRs();
}
public void addExposedTransport(String transport) {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org