You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by ae...@apache.org on 2006/08/31 06:04:51 UTC
svn commit: r438770 - in
/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer:
AggregateSynthesizer.java ClassInfo.java ServerSynthesizer.java
Author: aeberbac
Date: Wed Aug 30 21:04:51 2006
New Revision: 438770
URL: http://svn.apache.org/viewvc?rev=438770&view=rev
Log:
fixed the overwriting of the capability implementing class
Removed:
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/AggregateSynthesizer.java
Modified:
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ClassInfo.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerSynthesizer.java
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ClassInfo.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ClassInfo.java?rev=438770&r1=438769&r2=438770&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ClassInfo.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ClassInfo.java Wed Aug 30 21:04:51 2006
@@ -55,13 +55,20 @@
private String _classFullName;
public ClassInfo(Capability capability) {
- _packageName = getPackageName(capability.getURI());
- _classShortName = JAVA_CLASS_NAME;
- _classFullName = _packageName + "." + _classShortName;
+
_capability = capability;
- if(_capability.getImplementingClass() == null) {
+ String implementingClass = _capability.getImplementingClass();
+
+ if(implementingClass == null) {
+ _packageName = getPackageName(capability.getURI());
+ _classShortName = JAVA_CLASS_NAME;
+ _classFullName = _packageName + "." + _classShortName;
_capability.setImplementingClass(_classFullName + IMPLEMENTATION_SUFFIX);
+ } else {
+ _classFullName = implementingClass;
+ _classShortName = ReflectUtils.getShortName(_classFullName);
+ _packageName = ReflectUtils.getPackageName(_classFullName);
}
findImports();
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerSynthesizer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerSynthesizer.java?rev=438770&r1=438769&r2=438770&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerSynthesizer.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerSynthesizer.java Wed Aug 30 21:04:51 2006
@@ -46,40 +46,46 @@
private static final String REQUEST_SUFFIX = "Request";
- protected HashMap _files;
+ protected Map[] _filesMaps = null;
static ConfigurationDataDescriptor[] REQUIRED_PARAMETERS =
new ConfigurationDataDescriptor[] {
- ConfigurationData.CAPABILITIES_MAP_CONFIGURATION,
+ ConfigurationData.CAPABILITIES_MAP_LIST_CONFIGURATION,
};
public ConfigurationData synthesize(ConfigurationData configuration) throws Exception {
ConfigurationData.checkConfiguration(this, configuration);
- Map capabilities = (Map)configuration.getParameter(ConfigurationData.CAPABILITIES_MAP);
- _files = new HashMap();
+ Map[] capabilityMaps = (Map[])configuration.getParameter(ConfigurationData.CAPABILITIES_MAP_LIST);
+ _filesMaps = new HashMap[capabilityMaps.length];
- for (Iterator i = capabilities.values().iterator(); i.hasNext();) {
- Capability capability = (Capability)i.next();
- if(!capability.isBuiltIn()) {
- generateCapability(capability);
+ for(int i = 0; i < capabilityMaps.length; i++) {
+
+ Map capabilities = capabilityMaps[i];
+ _filesMaps[i] = new HashMap();
+
+ for (Iterator j = capabilities.values().iterator(); j.hasNext();) {
+ Capability capability = (Capability)j.next();
+ if(!capability.isBuiltIn()) {
+ generateCapability(capability, _filesMaps[i]);
+ }
}
}
ConfigurationData resultData = (ConfigurationData) configuration.clone();
- resultData.addParameter(ConfigurationData.FILES_MAP, _files);
+ resultData.addParameter(ConfigurationData.FILES_MAP_LIST, _filesMaps);
return resultData;
}
- protected void generateCapability(Capability capability) {
+ protected void generateCapability(Capability capability, Map files) {
ClassInfo classInfo = new ClassInfo(capability);
- makeInterface(classInfo);
- makeAbstractClass(classInfo);
+ makeInterface(classInfo, files);
+ makeAbstractClass(classInfo, files);
}
- protected void makeInterface(ClassInfo classInfo) {
+ protected void makeInterface(ClassInfo classInfo, Map files) {
StringBuffer code = new StringBuffer();
generatePackageHeader(classInfo, code);
@@ -97,10 +103,10 @@
String className = makeFileName(classInfo);
- _files.put(className, code.toString());
+ files.put(className, code.toString());
}
- private void makeAbstractClass(ClassInfo classInfo) {
+ private void makeAbstractClass(ClassInfo classInfo, Map files) {
StringBuffer code = new StringBuffer();
generatePackageHeader(classInfo, code);
@@ -118,7 +124,7 @@
String className = makeFileName(classInfo, ClassInfo.IMPLEMENTATION_SUFFIX);
- _files.put(className, code.toString());
+ files.put(className, code.toString());
}
private void generateInterfaceDeclaration(ClassInfo classInfo, StringBuffer code) {
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org