You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ga...@apache.org on 2004/09/27 07:12:38 UTC
cvs commit: ws-axis/java/src/org/apache/axis/i18n resource.properties
gawor 2004/09/26 22:12:38
Modified: java/src/org/apache/axis/configuration FileProvider.java
java/src/org/apache/axis/i18n resource.properties
Added: java/src/org/apache/axis/configuration DirProvider.java
Log:
configure engine from config files placed in sub dirs of a config dir (e.g. each service can have a separate dir with its own config file)
Revision Changes Path
1.53 +1 -1 ws-axis/java/src/org/apache/axis/configuration/FileProvider.java
Index: FileProvider.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/configuration/FileProvider.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- FileProvider.java 22 Jul 2004 02:01:12 -0000 1.52
+++ FileProvider.java 27 Sep 2004 05:12:38 -0000 1.53
@@ -92,7 +92,7 @@
* If the basepath is not a readable directory, throw an internal
* exception to make it easier to debug setup problems.
*/
- if (!dir.isDirectory() || !dir.canRead()) {
+ if (!dir.exists() || !dir.isDirectory() || !dir.canRead()) {
throw new ConfigurationException(Messages.getMessage
("invalidConfigFilePath",
basepath));
1.1 ws-axis/java/src/org/apache/axis/configuration/DirProvider.java
Index: DirProvider.java
===================================================================
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed 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 KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.axis.configuration;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.FileFilter;
import java.io.IOException;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import javax.xml.namespace.QName;
import org.apache.axis.AxisEngine;
import org.apache.axis.ConfigurationException;
import org.apache.axis.Handler;
import org.apache.axis.WSDDEngineConfiguration;
import org.apache.axis.deployment.wsdd.WSDDDeployment;
import org.apache.axis.deployment.wsdd.WSDDDocument;
import org.apache.axis.deployment.wsdd.WSDDGlobalConfiguration;
import org.apache.axis.encoding.TypeMappingRegistry;
import org.apache.axis.handlers.soap.SOAPService;
import org.apache.axis.utils.Messages;
import org.apache.axis.utils.XMLUtils;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
import org.w3c.dom.Document;
public class DirProvider implements WSDDEngineConfiguration {
protected static Log log =
LogFactory.getLog(DirProvider.class.getName());
private WSDDDeployment deployment = null;
private String configFile;
private File dir;
private static final String SERVER_CONFIG_FILE =
"server-config.wsdd";
public DirProvider(String basepath)
throws ConfigurationException {
this(basepath, SERVER_CONFIG_FILE);
}
public DirProvider(String basepath, String configFile)
throws ConfigurationException {
File dir = new File(basepath);
/*
* If the basepath is not a readable directory, throw an internal
* exception to make it easier to debug setup problems.
*/
if (!dir.exists() || !dir.isDirectory() || !dir.canRead()) {
throw new ConfigurationException(Messages.getMessage
("invalidConfigFilePath",
basepath));
}
this.dir = dir;
this.configFile = configFile;
}
public WSDDDeployment getDeployment() {
return this.deployment;
}
private static class DirFilter implements FileFilter {
public boolean accept(File path) {
return path.isDirectory();
}
}
public void configureEngine(AxisEngine engine)
throws ConfigurationException {
this.deployment = new WSDDDeployment();
WSDDGlobalConfiguration config = new WSDDGlobalConfiguration();
config.setOptionsHashtable(new Hashtable());
this.deployment.setGlobalConfiguration(config);
File [] dirs = this.dir.listFiles(new DirFilter());
for (int i = 0; i < dirs.length; i++) {
processWSDD(dirs[i]);
}
this.deployment.configureEngine(engine);
engine.refreshGlobalOptions();
}
private void processWSDD(File dir)
throws ConfigurationException {
File file = new File(dir, this.configFile);
if (!file.exists()) {
return;
}
log.debug("Loading service configuration from file: " + file);
InputStream in = null;
try {
in = new FileInputStream(file);
WSDDDocument doc = new WSDDDocument(XMLUtils.newDocument(in));
doc.deploy(this.deployment);
} catch (Exception e) {
throw new ConfigurationException(e);
} finally {
if (in != null) {
try {
in.close();
} catch (IOException e) {}
}
}
}
/**
* Save the engine configuration. In case there's a problem, we
* write it to a string before saving it out to the actual file so
* we don't screw up the file.
*/
public void writeEngineConfig(AxisEngine engine)
throws ConfigurationException {
// this is not implemented
}
/**
* retrieve an instance of the named handler
* @param qname XXX
* @return XXX
* @throws ConfigurationException XXX
*/
public Handler getHandler(QName qname) throws ConfigurationException {
return this.deployment.getHandler(qname);
}
/**
* retrieve an instance of the named service
* @param qname XXX
* @return XXX
* @throws ConfigurationException XXX
*/
public SOAPService getService(QName qname) throws ConfigurationException {
SOAPService service = this.deployment.getService(qname);
if (service == null) {
throw new ConfigurationException(Messages.getMessage("noService10",
qname.toString()));
}
return service;
}
/**
* Get a service which has been mapped to a particular namespace
*
* @param namespace a namespace URI
* @return an instance of the appropriate Service, or null
*/
public SOAPService getServiceByNamespaceURI(String namespace)
throws ConfigurationException {
return this.deployment.getServiceByNamespaceURI(namespace);
}
/**
* retrieve an instance of the named transport
* @param qname XXX
* @return XXX
* @throws ConfigurationException XXX
*/
public Handler getTransport(QName qname) throws ConfigurationException {
return this.deployment.getTransport(qname);
}
public TypeMappingRegistry getTypeMappingRegistry()
throws ConfigurationException {
return this.deployment.getTypeMappingRegistry();
}
/**
* Returns a global request handler.
*/
public Handler getGlobalRequest() throws ConfigurationException {
return this.deployment.getGlobalRequest();
}
/**
* Returns a global response handler.
*/
public Handler getGlobalResponse() throws ConfigurationException {
return this.deployment.getGlobalResponse();
}
/**
* Returns the global configuration options.
*/
public Hashtable getGlobalOptions() throws ConfigurationException {
WSDDGlobalConfiguration globalConfig
= this.deployment.getGlobalConfiguration();
if (globalConfig != null)
return globalConfig.getParametersTable();
return null;
}
/**
* Get an enumeration of the services deployed to this engine
*/
public Iterator getDeployedServices() throws ConfigurationException {
return this.deployment.getDeployedServices();
}
/**
* Get a list of roles that this engine plays globally. Services
* within the engine configuration may also add additional roles.
*
* @return a <code>List</code> of the roles for this engine
*/
public List getRoles() {
return this.deployment.getRoles();
}
}
1.93 +1 -1 ws-axis/java/src/org/apache/axis/i18n/resource.properties
Index: resource.properties
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/i18n/resource.properties,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- resource.properties 7 Sep 2004 09:32:48 -0000 1.92
+++ resource.properties 27 Sep 2004 05:12:38 -0000 1.93
@@ -269,7 +269,7 @@
internalError00=Internal error
internalError01=Internal server error
-invalidConfigFilePath=Configuration file directory ''{0}'' is not readable.
+invalidConfigFilePath=Configuration file directory ''{0}'' does not exist or is not a directory or is not readable.
invalidWSDD00=Invalid WSDD element ''{0}'' (wanted ''{1}'')