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 2007/03/06 17:23:48 UTC
svn commit: r515174 - in
/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator:
synthesizer/ServerInterfaceSynthesizer.java
synthesizer/ServerSynthesizer.java util/SubscriptionManagerHelper.java
Author: aeberbac
Date: Tue Mar 6 08:23:46 2007
New Revision: 515174
URL: http://svn.apache.org/viewvc?view=rev&rev=515174
Log:
Fixed problem with array out of bounds exception. This happened because I didn't take into
account the changes that splitting up the server synthesizer and adding metadata support
caused.
Modified:
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerInterfaceSynthesizer.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerSynthesizer.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/SubscriptionManagerHelper.java
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerInterfaceSynthesizer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerInterfaceSynthesizer.java?view=diff&rev=515174&r1=515173&r2=515174
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerInterfaceSynthesizer.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ServerInterfaceSynthesizer.java Tue Mar 6 08:23:46 2007
@@ -28,7 +28,6 @@
import org.apache.muse.tools.generator.util.Capability;
import org.apache.muse.tools.generator.util.ConfigurationData;
import org.apache.muse.tools.generator.util.ConfigurationDataDescriptor;
-import org.apache.muse.tools.generator.util.SubscriptionManagerHelper;
import org.apache.muse.tools.inspector.JavaMethod;
import org.apache.muse.tools.inspector.JavaProperty;
import org.apache.muse.ws.resource.impl.AbstractWsResourceCapability;
@@ -80,9 +79,7 @@
ConfigurationData resultData = (ConfigurationData) configuration.clone();
resultData.addParameter(ConfigurationData.FILES_MAP_LIST, _filesMaps);
- resultData.addParameter(ConfigurationData.IGNORE_SET_LIST, _ignoreSets);
-
- resultData = SubscriptionManagerHelper.addSubscriptionManager(resultData);
+ resultData.addParameter(ConfigurationData.IGNORE_SET_LIST, _ignoreSets);
return resultData;
}
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?view=diff&rev=515174&r1=515173&r2=515174
==============================================================================
--- 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 Tue Mar 6 08:23:46 2007
@@ -18,6 +18,7 @@
import org.apache.muse.tools.generator.util.ConfigurationData;
import org.apache.muse.tools.generator.util.ConfigurationDataDescriptor;
+import org.apache.muse.tools.generator.util.SubscriptionManagerHelper;
/**
* A <code>Synthesizer</code> implementation that creates
@@ -47,6 +48,8 @@
data = serverInterfaceSynthesizer.synthesize(data);
data = serverClassSynthesizer.synthesize(data);
+
+ data = SubscriptionManagerHelper.addSubscriptionManager(data);
return data;
}
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/SubscriptionManagerHelper.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/SubscriptionManagerHelper.java?view=diff&rev=515174&r1=515173&r2=515174
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/SubscriptionManagerHelper.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/util/SubscriptionManagerHelper.java Tue Mar 6 08:23:46 2007
@@ -28,6 +28,7 @@
import org.apache.muse.ws.resource.lifetime.WsrlConstants;
import org.apache.muse.ws.resource.lifetime.impl.SimpleImmediateTermination;
import org.apache.muse.ws.resource.lifetime.impl.SimpleScheduledTermination;
+import org.apache.muse.ws.resource.metadata.MetadataDescriptor;
import org.apache.muse.ws.resource.properties.WsrpConstants;
import org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability;
import org.w3c.dom.Document;
@@ -55,12 +56,27 @@
modifyDescriptorDocument(data);
addSubscriptionManagerCapabilities(data);
addSubscriptionManagerWsdl(data);
+ addSubscriptionManagerMetadata(data);
}
return data;
}
- private static void addSubscriptionManagerCapabilities(ConfigurationData data){
+ private static void addSubscriptionManagerMetadata(ConfigurationData data) {
+ MetadataDescriptor[] oldMetadatas = (MetadataDescriptor[])data.getParameter(ConfigurationData.METADATA_DESCRIPTOR_LIST);
+ MetadataDescriptor[] newMetadatas = new MetadataDescriptor[oldMetadatas.length + 1];
+ System.arraycopy(oldMetadatas, 0, newMetadatas, 0, oldMetadatas.length);
+
+ //
+ // Explicitly set the last metadata to null since there
+ // is no metadata associated with the subscription manager we're generating
+ //
+ newMetadatas[oldMetadatas.length] = null;
+
+ data.addParameter(ConfigurationData.METADATA_DESCRIPTOR_LIST, newMetadatas);
+ }
+
+ private static void addSubscriptionManagerCapabilities(ConfigurationData data){
Map[] oldCaps = (Map[])data.getParameter(ConfigurationData.CAPABILITIES_MAP_LIST);
Map[] newCaps = new Map[oldCaps.length + 1];
System.arraycopy(oldCaps, 0, newCaps, 0, oldCaps.length);
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org