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 di...@apache.org on 2007/02/25 20:57:05 UTC
svn commit: r511585 [2/10] - in /webservices/axis2/trunk/java/modules/kernel:
src/org/apache/axis2/addressing/ src/org/apache/axis2/addressing/wsdl/
src/org/apache/axis2/builder/ src/org/apache/axis2/cluster/
src/org/apache/axis2/context/ src/org/apach...
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java Sun Feb 25 11:56:59 2007
@@ -173,21 +173,21 @@
}
public void flush () throws AxisFault {
-
- ConfigurationContext configContext = getRootContext();
- if (configContext==null) {
- throw new AxisFault (Messages.getMessage("cannotFlushRootNull"));
- }
-
- AxisConfiguration axisConfiguration = configContext.getAxisConfiguration();
- ClusterManager clusterManager = axisConfiguration.getClusterManager();
-
- //Calling the ClusterManager probably to replicate the updated state of the context.
- if (clusterManager!=null && clusterManager.isContextClusterable (this)) {
- clusterManager.updateState(this);
- }
-
- //Other logic needed for flushing the contexts
+
+ ConfigurationContext configContext = getRootContext();
+ if (configContext==null) {
+ throw new AxisFault (Messages.getMessage("cannotFlushRootNull"));
+ }
+
+ AxisConfiguration axisConfiguration = configContext.getAxisConfiguration();
+ ClusterManager clusterManager = axisConfiguration.getClusterManager();
+
+ //Calling the ClusterManager probably to replicate the updated state of the context.
+ if (clusterManager!=null && clusterManager.isContextClusterable (this)) {
+ clusterManager.updateState(this);
+ }
+
+ //Other logic needed for flushing the contexts
}
public abstract ConfigurationContext getRootContext ();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java Sun Feb 25 11:56:59 2007
@@ -68,7 +68,7 @@
initConfigContextTimeout(axisConfiguration);
if (axisConfiguration.getClusterManager()!=null)
- initCluster();
+ initCluster();
}
private void initConfigContextTimeout(AxisConfiguration axisConfiguration) {
@@ -82,9 +82,9 @@
}
private void initCluster() {
- ClusterManager clusterManager = axisConfiguration.getClusterManager();
- clusterManager.init(this);
- }
+ ClusterManager clusterManager = axisConfiguration.getClusterManager();
+ clusterManager.init(this);
+ }
protected void finalize() throws Throwable {
super.finalize();
@@ -132,7 +132,7 @@
ClusterManager clusterManager = this.getAxisConfiguration().getClusterManager();
if (clusterManager!=null) {
- clusterManager.addContext(serviceGroupContext);
+ clusterManager.addContext(serviceGroupContext);
}
}
messageContext.setServiceGroupContext(serviceGroupContext);
@@ -157,7 +157,7 @@
ClusterManager clusterManager = this.getAxisConfiguration().getClusterManager();
if (clusterManager!=null) {
- clusterManager.addContext(serviceGroupContext);
+ clusterManager.addContext(serviceGroupContext);
}
messageContext.setServiceGroupContextId(serviceGroupContextId);
@@ -571,9 +571,9 @@
}
}
- public ConfigurationContext getRootContext() {
- return this;
- }
+ public ConfigurationContext getRootContext() {
+ return this;
+ }
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java Sun Feb 25 11:56:59 2007
@@ -18,7 +18,12 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
-import org.apache.axis2.deployment.*;
+import org.apache.axis2.deployment.AxisConfigBuilder;
+import org.apache.axis2.deployment.DeploymentConstants;
+import org.apache.axis2.deployment.DeploymentEngine;
+import org.apache.axis2.deployment.DeploymentException;
+import org.apache.axis2.deployment.FileSystemConfigurator;
+import org.apache.axis2.deployment.URLBasedAxisConfigurator;
import org.apache.axis2.deployment.util.Utils;
import org.apache.axis2.description.AxisModule;
import org.apache.axis2.description.AxisServiceGroup;
@@ -79,7 +84,7 @@
String maxScope = SessionUtils.calculateMaxScopeForServiceGroup(axisServiceGroup);
if (Constants.SCOPE_APPLICATION.equals(maxScope)) {
ServiceGroupContext serviceGroupContext = ContextFactory.createServiceGroupContext(
- configCtx,axisServiceGroup);
+ configCtx, axisServiceGroup);
configCtx.addServiceGroupContextintoApplicatoionScopeTable(serviceGroupContext);
DependencyManager.initService(serviceGroupContext);
}
@@ -97,6 +102,7 @@
}
}
}
+
private static void setContextPaths(AxisConfiguration axisConfig,
ConfigurationContext configContext) {
// Checking for context path
@@ -181,6 +187,7 @@
/**
* Initializes modules and creates Transports.
+ *
* @param configContext ConfigurationContext
*/
@@ -262,7 +269,7 @@
InputStream in = cl.getResourceAsStream(DeploymentConstants.AXIS2_CONFIGURATION_RESOURCE);
AxisConfiguration axisConfig = new AxisConfiguration();
- AxisConfigBuilder builder = new AxisConfigBuilder(in, axisConfig,null);
+ AxisConfigBuilder builder = new AxisConfigBuilder(in, axisConfig, null);
builder.populateConfig();
axisConfig.validateSystemPredefinedPhases();
ConfigurationContext configContext = new ConfigurationContext(axisConfig);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ContextFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ContextFactory.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ContextFactory.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ContextFactory.java Sun Feb 25 11:56:59 2007
@@ -1,48 +1,48 @@
-package org.apache.axis2.context;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.AxisServiceGroup;
-import org.apache.axis2.description.AxisOperation;
-
-/*
-* Copyright 2004,2005 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.
-*
-*
-*/
-public class ContextFactory {
-
- public static MessageContext createMessageContext(
- ConfigurationContext configurationContext) {
- MessageContext msgContext = new MessageContext();
- msgContext.setConfigurationContext(configurationContext);
- return msgContext;
- }
-
- public static ServiceGroupContext createServiceGroupContext(
- ConfigurationContext configurationContext,
- AxisServiceGroup serviceGroup) {
- return new ServiceGroupContext(configurationContext, serviceGroup);
- }
-
- public static ServiceContext createServiceContext(ServiceGroupContext serviceGroupContext,
- AxisService service) throws AxisFault {
- return serviceGroupContext.getServiceContext(service);
- }
- public static OperationContext createOperationContext(AxisOperation axisOperation,
- ServiceContext serviceContext){
- return new OperationContext(axisOperation,serviceContext);
- }
-}
+package org.apache.axis2.context;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisServiceGroup;
+import org.apache.axis2.description.AxisOperation;
+
+/*
+* Copyright 2004,2005 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.
+*
+*
+*/
+public class ContextFactory {
+
+ public static MessageContext createMessageContext(
+ ConfigurationContext configurationContext) {
+ MessageContext msgContext = new MessageContext();
+ msgContext.setConfigurationContext(configurationContext);
+ return msgContext;
+ }
+
+ public static ServiceGroupContext createServiceGroupContext(
+ ConfigurationContext configurationContext,
+ AxisServiceGroup serviceGroup) {
+ return new ServiceGroupContext(configurationContext, serviceGroup);
+ }
+
+ public static ServiceContext createServiceContext(ServiceGroupContext serviceGroupContext,
+ AxisService service) throws AxisFault {
+ return serviceGroupContext.getServiceContext(service);
+ }
+ public static OperationContext createOperationContext(AxisOperation axisOperation,
+ ServiceContext serviceContext){
+ return new OperationContext(axisOperation,serviceContext);
+ }
+}
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ContextFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java Sun Feb 25 11:56:59 2007
@@ -1571,79 +1571,79 @@
}
/**
- * You can directly access the attachment map of the message context from
- * here. Returned attachment map can be empty.
- *
- * @return attachment
- */
- public Attachments getAttachmentMap() {
- if (attachments == null) {
- attachments = new Attachments();
- }
- return attachments;
- }
-
- /**
- * Adds an attachment to the attachment Map of this message context. This
- * attachment gets serialised as a MIME attachment when sending the message
- * if SOAP with Attachments is enabled.
- *
- * @param contentID :
- * will be the content ID of the MIME part
- * @param dataHandler
- */
- public void addAttachment(String contentID, DataHandler dataHandler) {
- if (attachments == null) {
- attachments = new Attachments();
- }
- attachments.addDataHandler(contentID, dataHandler);
- }
-
- /**
- * Adds an attachment to the attachment Map of this message context. This
- * attachment gets serialised as a MIME attachment when sending the message
- * if SOAP with Attachments is enabled. Content ID of the MIME part will be
- * auto generated by Axis2.
- *
- * @param dataHandler
- * @return the auto generated content ID of the MIME attachment
- */
+ * You can directly access the attachment map of the message context from
+ * here. Returned attachment map can be empty.
+ *
+ * @return attachment
+ */
+ public Attachments getAttachmentMap() {
+ if (attachments == null) {
+ attachments = new Attachments();
+ }
+ return attachments;
+ }
+
+ /**
+ * Adds an attachment to the attachment Map of this message context. This
+ * attachment gets serialised as a MIME attachment when sending the message
+ * if SOAP with Attachments is enabled.
+ *
+ * @param contentID :
+ * will be the content ID of the MIME part
+ * @param dataHandler
+ */
+ public void addAttachment(String contentID, DataHandler dataHandler) {
+ if (attachments == null) {
+ attachments = new Attachments();
+ }
+ attachments.addDataHandler(contentID, dataHandler);
+ }
+
+ /**
+ * Adds an attachment to the attachment Map of this message context. This
+ * attachment gets serialised as a MIME attachment when sending the message
+ * if SOAP with Attachments is enabled. Content ID of the MIME part will be
+ * auto generated by Axis2.
+ *
+ * @param dataHandler
+ * @return the auto generated content ID of the MIME attachment
+ */
public String addAttachment(DataHandler dataHandler) {
- String contentID = UUIDGenerator.getUUID();
- addAttachment(contentID, dataHandler);
- return contentID;
- }
-
- /**
- * Access the DataHandler of the attachment contained in the map corresponding to the given
- * content ID. Returns "NULL" if a attachment cannot be found by the given content ID.
- * @param contentID :
- * Content ID of the MIME attachment
- * @return Data handler of the attachment
- */
- public DataHandler getAttachment(String contentID) {
- if (attachments == null) {
- attachments = new Attachments();
- }
- return attachments.getDataHandler(contentID);
- }
-
- /**
- * Removes the attachment with the given content ID from the Attachments Map
- * Do nothing if a attachment cannot be found by the given content ID.
- * @param contentID of the attachment
- */
- public void removeAttachment(String contentID) {
- if (attachments != null) {
- attachments.removeDataHandler(contentID);
- }
+ String contentID = UUIDGenerator.getUUID();
+ addAttachment(contentID, dataHandler);
+ return contentID;
+ }
+
+ /**
+ * Access the DataHandler of the attachment contained in the map corresponding to the given
+ * content ID. Returns "NULL" if a attachment cannot be found by the given content ID.
+ * @param contentID :
+ * Content ID of the MIME attachment
+ * @return Data handler of the attachment
+ */
+ public DataHandler getAttachment(String contentID) {
+ if (attachments == null) {
+ attachments = new Attachments();
+ }
+ return attachments.getDataHandler(contentID);
+ }
+
+ /**
+ * Removes the attachment with the given content ID from the Attachments Map
+ * Do nothing if a attachment cannot be found by the given content ID.
+ * @param contentID of the attachment
+ */
+ public void removeAttachment(String contentID) {
+ if (attachments != null) {
+ attachments.removeDataHandler(contentID);
+ }
}
/*
- * ===============================================================
- * SelfManagedData Section
- * ===============================================================
- */
+ * ===============================================================
+ * SelfManagedData Section
+ * ===============================================================
+ */
/*
* character to delimit strings
@@ -1892,7 +1892,7 @@
//if (handler instanceof Phase)
//{
- // selfManagedDataHolderList = serializeSelfManagedDataHelper(((Phase)handler).getHandlers().iterator(), selfManagedDataHolderList);
+ // selfManagedDataHolderList = serializeSelfManagedDataHelper(((Phase)handler).getHandlers().iterator(), selfManagedDataHolderList);
//}
//else if (SelfManagedDataManager.class.isAssignableFrom(handler.getClass()))
if (SelfManagedDataManager.class.isAssignableFrom(handler.getClass())) {
@@ -4223,9 +4223,9 @@
}
}
- public ConfigurationContext getRootContext() {
- return configurationContext;
- }
+ public ConfigurationContext getRootContext() {
+ return configurationContext;
+ }
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java Sun Feb 25 11:56:59 2007
@@ -369,13 +369,13 @@
if (axisOperation == null)
{
- out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
+ out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
}
else
{
- out.writeBoolean(ObjectStateUtils.ACTIVE_OBJECT);
- metaAxisOperation = new MetaDataEntry(axisOperation.getClass().getName(), axisOperation.getName().toString());
- ObjectStateUtils.writeObject(out, metaAxisOperation, logCorrelationIDString+".metaAxisOperation");
+ out.writeBoolean(ObjectStateUtils.ACTIVE_OBJECT);
+ metaAxisOperation = new MetaDataEntry(axisOperation.getClass().getName(), axisOperation.getName().toString());
+ ObjectStateUtils.writeObject(out, metaAxisOperation, logCorrelationIDString+".metaAxisOperation");
}
// save the meta data for the corresponding axis service to better
@@ -388,13 +388,13 @@
if (axisService == null)
{
- out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
+ out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
}
else
{
- out.writeBoolean(ObjectStateUtils.ACTIVE_OBJECT);
- metaAxisService = new MetaDataEntry(axisService.getClass().getName(), axisService.getName());
- ObjectStateUtils.writeObject(out, metaAxisService, logCorrelationIDString+".metaAxisService");
+ out.writeBoolean(ObjectStateUtils.ACTIVE_OBJECT);
+ metaAxisService = new MetaDataEntry(axisService.getClass().getName(), axisService.getName());
+ ObjectStateUtils.writeObject(out, metaAxisService, logCorrelationIDString+".metaAxisService");
}
@@ -599,11 +599,11 @@
if (metaAxisOperationIsActive == ObjectStateUtils.ACTIVE_OBJECT)
{
- metaAxisOperation = (MetaDataEntry) ObjectStateUtils.readObject(in, "OperationContext.metaAxisOperation");
+ metaAxisOperation = (MetaDataEntry) ObjectStateUtils.readObject(in, "OperationContext.metaAxisOperation");
}
else
{
- metaAxisOperation = null;
+ metaAxisOperation = null;
}
@@ -615,11 +615,11 @@
if (metaAxisServiceIsActive == ObjectStateUtils.ACTIVE_OBJECT)
{
- metaAxisService = (MetaDataEntry) ObjectStateUtils.readObject(in, "OperationContext.metaAxisService");
+ metaAxisService = (MetaDataEntry) ObjectStateUtils.readObject(in, "OperationContext.metaAxisService");
}
else
{
- metaAxisService = null;
+ metaAxisService = null;
}
@@ -681,7 +681,7 @@
if (metaAxisService != null)
{
- axisService = ObjectStateUtils.findService(axisConfig, metaAxisService.getClassName(), metaAxisService.getQNameAsString());
+ axisService = ObjectStateUtils.findService(axisConfig, metaAxisService.getClassName(), metaAxisService.getQNameAsString());
}
// We previously saved metaAxisOperation; restore it
@@ -1157,8 +1157,8 @@
return logCorrelationIDString;
}
- public ConfigurationContext getRootContext() {
- return this.getConfigurationContext();
- }
+ public ConfigurationContext getRootContext() {
+ return this.getConfigurationContext();
+ }
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SelfManagedDataManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SelfManagedDataManager.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SelfManagedDataManager.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SelfManagedDataManager.java Sun Feb 25 11:56:59 2007
@@ -60,7 +60,7 @@
* by the implementor.
* @exception IOException
*/
- public ByteArrayOutputStream serializeSelfManagedData(MessageContext mc) throws IOException;
+ public ByteArrayOutputStream serializeSelfManagedData(MessageContext mc) throws IOException;
/**
* This method is invoked when the MessageContext object is being restored.
@@ -73,19 +73,19 @@
* @param mc the MessageContext object being restored
* @exception IOException
*/
- public void deserializeSelfManagedData(ByteArrayInputStream data, MessageContext mc) throws IOException;
+ public void deserializeSelfManagedData(ByteArrayInputStream data, MessageContext mc) throws IOException;
- /**
+ /**
* This method is invoked when the MessageContext object is being restored and
* after the deserializeSelfManagedData() method.
*
* Implementors use this method to re-establish transient message-specific data,
* particularly if the implementor did not save any user data in the
* serializeSelfManagedData() method.
- *
- * @param mc the MessageContext object being restored
- */
- public void restoreTransientData(MessageContext mc);
+ *
+ * @param mc the MessageContext object being restored
+ */
+ public void restoreTransientData(MessageContext mc);
}
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SelfManagedDataManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java Sun Feb 25 11:56:59 2007
@@ -388,13 +388,13 @@
if (axisService == null)
{
- out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
+ out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
}
else
{
- out.writeBoolean(ObjectStateUtils.ACTIVE_OBJECT);
- metaAxisService = new MetaDataEntry(axisService.getClass().getName(), axisService.getName());
- ObjectStateUtils.writeObject(out, metaAxisService, "ServiceContext.metaAxisService");
+ out.writeBoolean(ObjectStateUtils.ACTIVE_OBJECT);
+ metaAxisService = new MetaDataEntry(axisService.getClass().getName(), axisService.getName());
+ ObjectStateUtils.writeObject(out, metaAxisService, "ServiceContext.metaAxisService");
}
@@ -504,11 +504,11 @@
if (metaAxisServiceIsActive == ObjectStateUtils.ACTIVE_OBJECT)
{
- metaAxisService = (MetaDataEntry) ObjectStateUtils.readObject(in, "ServiceContext.metaAxisService");
+ metaAxisService = (MetaDataEntry) ObjectStateUtils.readObject(in, "ServiceContext.metaAxisService");
}
else
{
- metaAxisService = null;
+ metaAxisService = null;
}
@@ -566,7 +566,7 @@
if (metaAxisService != null)
{
- axisService = ObjectStateUtils.findService(axisConfig, metaAxisService.getClassName(), metaAxisService.getQNameAsString());
+ axisService = ObjectStateUtils.findService(axisConfig, metaAxisService.getClassName(), metaAxisService.getQNameAsString());
}
@@ -781,9 +781,9 @@
}
}
- public ConfigurationContext getRootContext() {
- return configContext;
- }
+ public ConfigurationContext getRootContext() {
+ return configContext;
+ }
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java Sun Feb 25 11:56:59 2007
@@ -147,7 +147,7 @@
ClusterManager clusterManager = axisService.getAxisConfiguration().getClusterManager();
if (clusterManager!=null) {
- clusterManager.addContext(serviceContext);
+ clusterManager.addContext(serviceContext);
}
}
@@ -339,13 +339,13 @@
if (axisServiceGroup == null)
{
- out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
+ out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
}
else
{
- out.writeBoolean(ObjectStateUtils.ACTIVE_OBJECT);
- metaAxisServiceGroup = new MetaDataEntry(axisServiceGroup.getClass().getName(), axisServiceGroup.getServiceGroupName());
- ObjectStateUtils.writeObject(out, metaAxisServiceGroup, "ServiceGroupContext.metaAxisServiceGroup");
+ out.writeBoolean(ObjectStateUtils.ACTIVE_OBJECT);
+ metaAxisServiceGroup = new MetaDataEntry(axisServiceGroup.getClass().getName(), axisServiceGroup.getServiceGroupName());
+ ObjectStateUtils.writeObject(out, metaAxisServiceGroup, "ServiceGroupContext.metaAxisServiceGroup");
}
@@ -441,11 +441,11 @@
if (metaAxisServiceGrpIsActive == ObjectStateUtils.ACTIVE_OBJECT)
{
- metaAxisServiceGroup = (MetaDataEntry) ObjectStateUtils.readObject(in, "ServiceGroupContext.metaAxisServiceGroup");
+ metaAxisServiceGroup = (MetaDataEntry) ObjectStateUtils.readObject(in, "ServiceGroupContext.metaAxisServiceGroup");
}
else
{
- metaAxisServiceGroup = null;
+ metaAxisServiceGroup = null;
}
@@ -495,7 +495,7 @@
// We previously saved metaAxisServiceGroup; restore it
if (metaAxisServiceGroup != null) {
- axisServiceGroup = ObjectStateUtils.findServiceGroup(axisConfig, metaAxisServiceGroup.getClassName(), metaAxisServiceGroup.getQNameAsString());
+ axisServiceGroup = ObjectStateUtils.findServiceGroup(axisConfig, metaAxisServiceGroup.getClassName(), metaAxisServiceGroup.getQNameAsString());
}
else
{
@@ -583,8 +583,8 @@
}
}
- public ConfigurationContext getRootContext() {
- //parent of the ServiceGroupContext is the ConfigurationContext
- return (ConfigurationContext) this.getParent();
- }
+ public ConfigurationContext getRootContext() {
+ //parent of the ServiceGroupContext is the ConfigurationContext
+ return (ConfigurationContext) this.getParent();
+ }
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SessionContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SessionContext.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SessionContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SessionContext.java Sun Feb 25 11:56:59 2007
@@ -324,10 +324,10 @@
}
- public ConfigurationContext getRootContext() {
- // Session Context does not live within the hierarchy
- return null;
- }
+ public ConfigurationContext getRootContext() {
+ // Session Context does not live within the hierarchy
+ return null;
+ }
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocator.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocator.java Sun Feb 25 11:56:59 2007
@@ -1,47 +1,47 @@
-/*
-* Copyright 2007 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.axis2.dataretrieval;
-
-import org.apache.axis2.context.MessageContext;
-
-/**
- * <p>AxisDataLocator interface defines getData API for retrieving data particularly
- * metadata like WSDL, Policy, Schema. Web Service engines that have different methods in
- * storing metadata or different types of data to retrieve may code their version of
- * Data Locator(s)by implementing the AxisDataLocator interface. Axis 2 support
- * Data Locator plugin by configuring in Axis2.xml or services.xml. </p>
- *
- */
-
-public interface AxisDataLocator {
-
-
- /**
- * Retrieves and returns data based on the specified request.
- *
- * @param request
- * The {@link DataRetrievalRequest} allow to specify parameters
- * about the request, and additional information to process the
- * request.
- * @param msgContext
- * The {@link MessageContext} from the original request.
- * @return {@link Data}[] for the request.
- * @throws DataRetrievalException
- */
-
- public Data[] getData(DataRetrievalRequest request, MessageContext msgContext) throws DataRetrievalException;
-
-}
+/*
+* Copyright 2007 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.axis2.dataretrieval;
+
+import org.apache.axis2.context.MessageContext;
+
+/**
+ * <p>AxisDataLocator interface defines getData API for retrieving data particularly
+ * metadata like WSDL, Policy, Schema. Web Service engines that have different methods in
+ * storing metadata or different types of data to retrieve may code their version of
+ * Data Locator(s)by implementing the AxisDataLocator interface. Axis 2 support
+ * Data Locator plugin by configuring in Axis2.xml or services.xml. </p>
+ *
+ */
+
+public interface AxisDataLocator {
+
+
+ /**
+ * Retrieves and returns data based on the specified request.
+ *
+ * @param request
+ * The {@link DataRetrievalRequest} allow to specify parameters
+ * about the request, and additional information to process the
+ * request.
+ * @param msgContext
+ * The {@link MessageContext} from the original request.
+ * @return {@link Data}[] for the request.
+ * @throws DataRetrievalException
+ */
+
+ public Data[] getData(DataRetrievalRequest request, MessageContext msgContext) throws DataRetrievalException;
+
+}
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocator.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocatorImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocatorImpl.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocatorImpl.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocatorImpl.java Sun Feb 25 11:56:59 2007
@@ -1,151 +1,151 @@
-/*
-* Copyright 2007 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.axis2.dataretrieval;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import javax.xml.namespace.QName;
-import org.apache.axiom.om.OMElement;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.AxisService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * The Default Axis2 Data Locator implementation
- *
- */
-
-public class AxisDataLocatorImpl implements AxisDataLocator {
- private static final Log log = LogFactory.getLog(AxisDataLocatorImpl.class);
-
- // HashMap to cache Data elements defined in ServiceData.
- private HashMap dataMap=new HashMap();
-
- private AxisService axisService;
-
-
- /**
- * Constructor
- * @throws DataRetrievalException
- *
- */
- public AxisDataLocatorImpl(AxisService in_axisService) throws DataRetrievalException{
- super();
- axisService = in_axisService;
- }
-
- /**
- *
- * Retrieves and returns data based on the specified request.
- */
- public Data[] getData(DataRetrievalRequest request,
- MessageContext msgContext) throws DataRetrievalException{
- Data[] data = null;
- String dialect = request.getDialect();
- String identifier = request.getIdentifier();
- String key = dialect;
- ArrayList dataList = new ArrayList();
- if (identifier != null){
- key = key + identifier;
- if (dataMap.get(key) != null)
- dataList.add(dataMap.get(key));
- }
- else {
- dataList = getDataList(dialect);
- }
-
-
- AxisDataLocator dataLocator = DataLocatorFactory
- .createDataLocator(dialect, (ServiceData[])dataList.toArray(new ServiceData[0]));
-
- if (dataLocator != null) {
- try {
- data = dataLocator.getData(request, msgContext);
- }
- catch (Throwable e){
- log.info("getData request failed for dialect, " + dialect, e);
- throw new DataRetrievalException(e);
- }
- } else {
- String message = "Failed to instantiate Data Locator for dialect, " + dialect;
- log.info(message);
- throw new DataRetrievalException(message);
- }
- return data;
- }
-
- /*
- * For AxisService use only!
- */
- public void loadServiceData(){
- DataRetrievalUtil util = DataRetrievalUtil.getInstance();
-
- OMElement serviceData=null;
- String file = "META-INF/" + DRConstants.SERVICE_DATA.FILE_NAME;
- try {
- serviceData = util.buildOM(axisService.getClassLoader(), "META-INF/" + DRConstants.SERVICE_DATA.FILE_NAME);
- } catch (DataRetrievalException e) {
- // It is not required to define ServiceData for a Service, just log a warning message
-
- String message = "Check loading failure for file, " + file;
- log.debug(message + ".Message = " + e.getMessage());
- log.debug(message, e);
- }
- if (serviceData != null) {
- cachingServiceData(serviceData);
- }
- }
-
- /*
- * caching ServiceData for Axis2 Data Locators
- */
- private void cachingServiceData(OMElement e) {
- Iterator i = e.getChildrenWithName(new QName(
- DRConstants.SERVICE_DATA.DATA));
- String saveKey = "";
- while (i.hasNext()) {
- ServiceData data = new ServiceData((OMElement) i.next());
- saveKey = data.getDialect();
-
- String identifier = data.getIdentifier();
- if (identifier != null)
- saveKey = saveKey + identifier;
- dataMap.put(saveKey, data);
-
-
- }
-
- }
-
- /*
- * Return ServiceData for specified dialect
- */
- private ArrayList getDataList(String dialect){
- ArrayList dataList = new ArrayList();
- Iterator keys = dataMap.keySet().iterator();
-
- while (keys.hasNext()){
- String keyStr = (String)keys.next();
- // get all Data element that matching the dialect
- if (keyStr.indexOf(dialect) == 0){
- dataList.add(dataMap.get(keyStr));
- }
- }
- return dataList;
- }
+/*
+* Copyright 2007 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.axis2.dataretrieval;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import javax.xml.namespace.QName;
+import org.apache.axiom.om.OMElement;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.description.AxisService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * The Default Axis2 Data Locator implementation
+ *
+ */
+
+public class AxisDataLocatorImpl implements AxisDataLocator {
+ private static final Log log = LogFactory.getLog(AxisDataLocatorImpl.class);
+
+ // HashMap to cache Data elements defined in ServiceData.
+ private HashMap dataMap=new HashMap();
+
+ private AxisService axisService;
+
+
+ /**
+ * Constructor
+ * @throws DataRetrievalException
+ *
+ */
+ public AxisDataLocatorImpl(AxisService in_axisService) throws DataRetrievalException{
+ super();
+ axisService = in_axisService;
+ }
+
+ /**
+ *
+ * Retrieves and returns data based on the specified request.
+ */
+ public Data[] getData(DataRetrievalRequest request,
+ MessageContext msgContext) throws DataRetrievalException{
+ Data[] data = null;
+ String dialect = request.getDialect();
+ String identifier = request.getIdentifier();
+ String key = dialect;
+ ArrayList dataList = new ArrayList();
+ if (identifier != null){
+ key = key + identifier;
+ if (dataMap.get(key) != null)
+ dataList.add(dataMap.get(key));
+ }
+ else {
+ dataList = getDataList(dialect);
+ }
+
+
+ AxisDataLocator dataLocator = DataLocatorFactory
+ .createDataLocator(dialect, (ServiceData[])dataList.toArray(new ServiceData[0]));
+
+ if (dataLocator != null) {
+ try {
+ data = dataLocator.getData(request, msgContext);
+ }
+ catch (Throwable e){
+ log.info("getData request failed for dialect, " + dialect, e);
+ throw new DataRetrievalException(e);
+ }
+ } else {
+ String message = "Failed to instantiate Data Locator for dialect, " + dialect;
+ log.info(message);
+ throw new DataRetrievalException(message);
+ }
+ return data;
+ }
+
+ /*
+ * For AxisService use only!
+ */
+ public void loadServiceData(){
+ DataRetrievalUtil util = DataRetrievalUtil.getInstance();
+
+ OMElement serviceData=null;
+ String file = "META-INF/" + DRConstants.SERVICE_DATA.FILE_NAME;
+ try {
+ serviceData = util.buildOM(axisService.getClassLoader(), "META-INF/" + DRConstants.SERVICE_DATA.FILE_NAME);
+ } catch (DataRetrievalException e) {
+ // It is not required to define ServiceData for a Service, just log a warning message
+
+ String message = "Check loading failure for file, " + file;
+ log.debug(message + ".Message = " + e.getMessage());
+ log.debug(message, e);
+ }
+ if (serviceData != null) {
+ cachingServiceData(serviceData);
+ }
+ }
+
+ /*
+ * caching ServiceData for Axis2 Data Locators
+ */
+ private void cachingServiceData(OMElement e) {
+ Iterator i = e.getChildrenWithName(new QName(
+ DRConstants.SERVICE_DATA.DATA));
+ String saveKey = "";
+ while (i.hasNext()) {
+ ServiceData data = new ServiceData((OMElement) i.next());
+ saveKey = data.getDialect();
+
+ String identifier = data.getIdentifier();
+ if (identifier != null)
+ saveKey = saveKey + identifier;
+ dataMap.put(saveKey, data);
+
+
+ }
+
+ }
+
+ /*
+ * Return ServiceData for specified dialect
+ */
+ private ArrayList getDataList(String dialect){
+ ArrayList dataList = new ArrayList();
+ Iterator keys = dataMap.keySet().iterator();
+
+ while (keys.hasNext()){
+ String keyStr = (String)keys.next();
+ // get all Data element that matching the dialect
+ if (keyStr.indexOf(dialect) == 0){
+ dataList.add(dataMap.get(keyStr));
+ }
+ }
+ return dataList;
+ }
}
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocatorImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/BaseAxisDataLocator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/BaseAxisDataLocator.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/BaseAxisDataLocator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/BaseAxisDataLocator.java Sun Feb 25 11:56:59 2007
@@ -1,150 +1,150 @@
-/*
-* Copyright 2007 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.axis2.dataretrieval;
-
-import java.util.ArrayList;
-import org.apache.axiom.om.OMElement;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.dataretrieval.OutputForm;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * BaseAxisDataLocator implements common code and serves as a base class
- * for the supported default Axis2 dialect data locators.
- *
- */
-
-public abstract class BaseAxisDataLocator {
- private static final Log log = LogFactory.getLog(BaseAxisDataLocator.class);
-
- protected ServiceData[] dataList = null;
- private OutputForm outputform= OutputForm.INLINE_FORM;
-
- /**
- * The default Axis2 Data locator getData API
- * Checks data information configured in ServiceData.xml for the supported
- * output forms: inline, url, EndpointReference.
- *
- * Note: Subclass that has its implementation of outInlineForm, outputLocationForm,
- * and outputReferenceForm logic must implement the getData API.
- */
-
- public Data[] getData(DataRetrievalRequest request,
- MessageContext msgContext) throws DataRetrievalException {
- log.trace("Default Base DataLocator getData starts");
-
- OutputForm outputform = (OutputForm) request.getOutputForm();
-
- if (outputform == null) { // not defined, defualt to inline
- outputform = OutputForm.INLINE_FORM;
- }
-
- Data[] output = null;
-
- String outputFormString = outputform.getType();
-
- if (outputform == OutputForm.INLINE_FORM) {
- output = outputInlineForm(msgContext, dataList);
- }
- else if (outputform == OutputForm.LOCATION_FORM) {
- output = outputLocationForm(dataList);
-
- }
- else if (outputform == OutputForm.REFERENCE_FORM) {
- output = outputReferenceForm(msgContext, dataList);
-
- }
- else {
- output = outputInlineForm(msgContext, dataList);
-
- }
-
- if (output == null)
- log.info("Null data return! Data Locator does not know how to handle request for dialect= " + (String) request.getDialect()
- + " in the form of " + outputFormString);
-
-
- log.trace("Default Base DataLocator getData ends");
-
- return output;
- }
-
- /*
- * WSDL or a policy document
- */
- protected Data[] outputInlineForm(MessageContext msgContext,
- ServiceData[] serviceData) throws DataRetrievalException {
- OMElement metaElement = null;
- ArrayList result = new ArrayList();
- if (serviceData != null) {
- int size = serviceData.length;
- for (int i = 0; i < size; i++) {
- metaElement = serviceData[i].getFileContent(msgContext
- .getAxisService().getClassLoader());
- if (metaElement != null)
- result.add(new Data(metaElement, serviceData[i].getIdentifier()));
-
- }
-
-
- }
- return (Data[]) result.toArray(new Data[0]);
-
- }
-
-
- protected Data[] outputLocationForm(ServiceData[] serviceData)
- throws DataRetrievalException {
-
- ArrayList result = new ArrayList();
- if (serviceData != null) {
- for (int i = 0; i < serviceData.length; i++) {
-
- String urlValue = serviceData[i].getURL();
- if (urlValue != null)
- result.add(new Data(urlValue, serviceData[i].getIdentifier()));
- }
- }
- return (Data[]) result.toArray(new Data[0]);
- }
-
- protected Data[] outputReferenceForm(MessageContext msgContext,
- ServiceData[] serviceData) throws DataRetrievalException {
- OMElement epr = null;
- ArrayList result = new ArrayList();
- if (serviceData != null) {
- for (int i = 0; i < serviceData.length; i++) {
-
- epr = serviceData[i].getEndpointReference();
- if (epr != null)
- result.add(new Data((epr), serviceData[i].getIdentifier()));
- }
- }
- return (Data[]) result.toArray(new Data[0]);
- }
-
-
- protected void setServiceData(ServiceData[] inServiceData) {
- this.dataList = inServiceData;
- }
-
-
- protected OutputForm getOutputForm(){
- return outputform;
- }
-
-}
+/*
+* Copyright 2007 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.axis2.dataretrieval;
+
+import java.util.ArrayList;
+import org.apache.axiom.om.OMElement;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.dataretrieval.OutputForm;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * BaseAxisDataLocator implements common code and serves as a base class
+ * for the supported default Axis2 dialect data locators.
+ *
+ */
+
+public abstract class BaseAxisDataLocator {
+ private static final Log log = LogFactory.getLog(BaseAxisDataLocator.class);
+
+ protected ServiceData[] dataList = null;
+ private OutputForm outputform= OutputForm.INLINE_FORM;
+
+ /**
+ * The default Axis2 Data locator getData API
+ * Checks data information configured in ServiceData.xml for the supported
+ * output forms: inline, url, EndpointReference.
+ *
+ * Note: Subclass that has its implementation of outInlineForm, outputLocationForm,
+ * and outputReferenceForm logic must implement the getData API.
+ */
+
+ public Data[] getData(DataRetrievalRequest request,
+ MessageContext msgContext) throws DataRetrievalException {
+ log.trace("Default Base DataLocator getData starts");
+
+ OutputForm outputform = (OutputForm) request.getOutputForm();
+
+ if (outputform == null) { // not defined, defualt to inline
+ outputform = OutputForm.INLINE_FORM;
+ }
+
+ Data[] output = null;
+
+ String outputFormString = outputform.getType();
+
+ if (outputform == OutputForm.INLINE_FORM) {
+ output = outputInlineForm(msgContext, dataList);
+ }
+ else if (outputform == OutputForm.LOCATION_FORM) {
+ output = outputLocationForm(dataList);
+
+ }
+ else if (outputform == OutputForm.REFERENCE_FORM) {
+ output = outputReferenceForm(msgContext, dataList);
+
+ }
+ else {
+ output = outputInlineForm(msgContext, dataList);
+
+ }
+
+ if (output == null)
+ log.info("Null data return! Data Locator does not know how to handle request for dialect= " + (String) request.getDialect()
+ + " in the form of " + outputFormString);
+
+
+ log.trace("Default Base DataLocator getData ends");
+
+ return output;
+ }
+
+ /*
+ * WSDL or a policy document
+ */
+ protected Data[] outputInlineForm(MessageContext msgContext,
+ ServiceData[] serviceData) throws DataRetrievalException {
+ OMElement metaElement = null;
+ ArrayList result = new ArrayList();
+ if (serviceData != null) {
+ int size = serviceData.length;
+ for (int i = 0; i < size; i++) {
+ metaElement = serviceData[i].getFileContent(msgContext
+ .getAxisService().getClassLoader());
+ if (metaElement != null)
+ result.add(new Data(metaElement, serviceData[i].getIdentifier()));
+
+ }
+
+
+ }
+ return (Data[]) result.toArray(new Data[0]);
+
+ }
+
+
+ protected Data[] outputLocationForm(ServiceData[] serviceData)
+ throws DataRetrievalException {
+
+ ArrayList result = new ArrayList();
+ if (serviceData != null) {
+ for (int i = 0; i < serviceData.length; i++) {
+
+ String urlValue = serviceData[i].getURL();
+ if (urlValue != null)
+ result.add(new Data(urlValue, serviceData[i].getIdentifier()));
+ }
+ }
+ return (Data[]) result.toArray(new Data[0]);
+ }
+
+ protected Data[] outputReferenceForm(MessageContext msgContext,
+ ServiceData[] serviceData) throws DataRetrievalException {
+ OMElement epr = null;
+ ArrayList result = new ArrayList();
+ if (serviceData != null) {
+ for (int i = 0; i < serviceData.length; i++) {
+
+ epr = serviceData[i].getEndpointReference();
+ if (epr != null)
+ result.add(new Data((epr), serviceData[i].getIdentifier()));
+ }
+ }
+ return (Data[]) result.toArray(new Data[0]);
+ }
+
+
+ protected void setServiceData(ServiceData[] inServiceData) {
+ this.dataList = inServiceData;
+ }
+
+
+ protected OutputForm getOutputForm(){
+ return outputform;
+ }
+
+}
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/BaseAxisDataLocator.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DRConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DRConstants.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DRConstants.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DRConstants.java Sun Feb 25 11:56:59 2007
@@ -1,95 +1,95 @@
-/*
-* Copyright 2007 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.axis2.dataretrieval;
-
-/**
- * Defines constants referenced in data retrieval classes.
- */
-public interface DRConstants {
- public interface SPEC_VERSIONS {
- String v1_0 = "Spec_2004_09";
- }
-
-
- public interface SOAPVersion {
- int v1_1 = 1;
-
- int v1_2 = 2;
-
- }
-
- /**
- *
- * Defines contants references in WS-Mex specification
- *
- */
-
- public interface SPEC {
- String NS_URI = "http://schemas.xmlsoap.org/ws/2004/09/mex";
-
- public interface Actions {
- String GET_METADATA_REQUEST = "http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata/Request";
- String GET_METADATA_RESPONSE = "http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata/Response";
-
- }
-
- String NS_PREFIX = "mex";
- String GET_METADATA = "GetMetadata";
- String DIALET = "Dialect";
- String IDENTIFIER = "Identifier";
- String METADATA = "Metadata";
- String METADATA_SECTION = "MetadataSection";
- String METADATA_REFERENCE = "MetadataReference";
- String LOCATION = "Location";
- String TYPE = "type";
- String DIALECT_TYPE_WSDL = "http://schemas.xmlsoap.org/wsdl/";
- String DIALECT_TYPE_POLICY = "http://schemas.xmlsoap.org/ws/2004/09/policy";
- String DIALECT_TYPE_SCHEMA = "http://www.w3.org/2001/XMLSchema";
-
- }
-
-
- // Following constants used for configuring Data Locator in axis.xml and services.xml
- String DATA_LOCATOR_ELEMENT = "dataLocator";
- String DIALECT_LOCATOR_ELEMENT = "dialectLocator";
- String DIALECT_ATTRIBUTE = "dialect";
- String CLASS_ATTRIBUTE = "class";
-
- // Service level and Global level type Data Locator
- String SERVICE_LEVEL = "ServiceLevel";
- String GLOBAL_LEVEL = "GlobalLevel";
-
- /**
- *
- * Defines contants references in Service Data
- *
- */
-
- public interface SERVICE_DATA {
- String FILE_NAME = "ServiceData.xml";
- String FILE_TYPE = "svcData";
-
- String DATA = "Data";
- String ENDPOINT_REFERENCE = "EndpointReference";
- String URL = "URL";
- String FILE = "file";
- String DIALECT = "dialect";
- String IDENTIFIER = "identifier";
-
- }
-
-}
+/*
+* Copyright 2007 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.axis2.dataretrieval;
+
+/**
+ * Defines constants referenced in data retrieval classes.
+ */
+public interface DRConstants {
+ public interface SPEC_VERSIONS {
+ String v1_0 = "Spec_2004_09";
+ }
+
+
+ public interface SOAPVersion {
+ int v1_1 = 1;
+
+ int v1_2 = 2;
+
+ }
+
+ /**
+ *
+ * Defines contants references in WS-Mex specification
+ *
+ */
+
+ public interface SPEC {
+ String NS_URI = "http://schemas.xmlsoap.org/ws/2004/09/mex";
+
+ public interface Actions {
+ String GET_METADATA_REQUEST = "http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata/Request";
+ String GET_METADATA_RESPONSE = "http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata/Response";
+
+ }
+
+ String NS_PREFIX = "mex";
+ String GET_METADATA = "GetMetadata";
+ String DIALET = "Dialect";
+ String IDENTIFIER = "Identifier";
+ String METADATA = "Metadata";
+ String METADATA_SECTION = "MetadataSection";
+ String METADATA_REFERENCE = "MetadataReference";
+ String LOCATION = "Location";
+ String TYPE = "type";
+ String DIALECT_TYPE_WSDL = "http://schemas.xmlsoap.org/wsdl/";
+ String DIALECT_TYPE_POLICY = "http://schemas.xmlsoap.org/ws/2004/09/policy";
+ String DIALECT_TYPE_SCHEMA = "http://www.w3.org/2001/XMLSchema";
+
+ }
+
+
+ // Following constants used for configuring Data Locator in axis.xml and services.xml
+ String DATA_LOCATOR_ELEMENT = "dataLocator";
+ String DIALECT_LOCATOR_ELEMENT = "dialectLocator";
+ String DIALECT_ATTRIBUTE = "dialect";
+ String CLASS_ATTRIBUTE = "class";
+
+ // Service level and Global level type Data Locator
+ String SERVICE_LEVEL = "ServiceLevel";
+ String GLOBAL_LEVEL = "GlobalLevel";
+
+ /**
+ *
+ * Defines contants references in Service Data
+ *
+ */
+
+ public interface SERVICE_DATA {
+ String FILE_NAME = "ServiceData.xml";
+ String FILE_TYPE = "svcData";
+
+ String DATA = "Data";
+ String ENDPOINT_REFERENCE = "EndpointReference";
+ String URL = "URL";
+ String FILE = "file";
+ String DIALECT = "dialect";
+ String IDENTIFIER = "identifier";
+
+ }
+
+}
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DRConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/Data.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/Data.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/Data.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/Data.java Sun Feb 25 11:56:59 2007
@@ -1,55 +1,55 @@
-/*
-* Copyright 2007 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.axis2.dataretrieval;
-
-/**
- * Data contains instance of the data Object for the specified identifier if applicable.
- *
- */
-
-public class Data {
- Object data;
- String identifier;
-
-
- /**
- * Constructor
- * @param in_data instance of Object about the data
- * @param in_identifier identifier of the data instance.
- */
- public Data(Object in_data, String in_identifier){
- super();
- data = in_data;
- identifier =in_identifier;
- }
-
- /**
- * Returns data
- * @return data Object
- */
-
- public Object getData(){
- return data;
- }
-
- /**
- * Returns string representing identifier of this data object.
- * @return
- */
- public String getIdentifier(){
- return identifier;
- }
-}
+/*
+* Copyright 2007 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.axis2.dataretrieval;
+
+/**
+ * Data contains instance of the data Object for the specified identifier if applicable.
+ *
+ */
+
+public class Data {
+ Object data;
+ String identifier;
+
+
+ /**
+ * Constructor
+ * @param in_data instance of Object about the data
+ * @param in_identifier identifier of the data instance.
+ */
+ public Data(Object in_data, String in_identifier){
+ super();
+ data = in_data;
+ identifier =in_identifier;
+ }
+
+ /**
+ * Returns data
+ * @return data Object
+ */
+
+ public Object getData(){
+ return data;
+ }
+
+ /**
+ * Returns string representing identifier of this data object.
+ * @return
+ */
+ public String getIdentifier(){
+ return identifier;
+ }
+}
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/Data.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataLocatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataLocatorFactory.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataLocatorFactory.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataLocatorFactory.java Sun Feb 25 11:56:59 2007
@@ -1,72 +1,72 @@
-/*
-* Copyright 2007 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.axis2.dataretrieval;
-
-/**
- * Factory to constructor Axis2 Data Locators based on the specified
- * Dialect.
- */
-
-public class DataLocatorFactory {
- private static org.apache.axis2.dataretrieval.WSDLDataLocator wsdlDataLocator = null;
- private static org.apache.axis2.dataretrieval.PolicyDataLocator policyDataLocator = null;
- private static org.apache.axis2.dataretrieval.SchemaDataLocator schemaDataLocator = null;
-
- /*
- * Return instance of default Data Locator for the dialect.
- */
- protected static AxisDataLocator createDataLocator(String dialect) {
- return (createDataLocator(dialect, null));
- }
-
- protected static AxisDataLocator createDataLocator(String dialect, ServiceData[] serviceDataArray) {
- AxisDataLocator dataLocator = null;
- if (dialect.equals(DRConstants.SPEC.DIALECT_TYPE_WSDL)){
- dataLocator = getWsdlDataLocator(serviceDataArray);
-
- }
- else if (dialect.trim().equals(DRConstants.SPEC.DIALECT_TYPE_POLICY)){
- if (policyDataLocator == null)
- dataLocator = new PolicyDataLocator(serviceDataArray);
- else
- dataLocator = policyDataLocator;
- }
- else if (dialect.equals(DRConstants.SPEC.DIALECT_TYPE_SCHEMA)){
- if (schemaDataLocator == null)
- dataLocator = new SchemaDataLocator(serviceDataArray);
- else
- dataLocator = schemaDataLocator;
- }
- else {
- dataLocator = null;
- }
- return dataLocator;
- }
-
- protected static AxisDataLocator getWsdlDataLocator(ServiceData[] serviceDataArray) {
-
- if (wsdlDataLocator == null)
- wsdlDataLocator = new org.apache.axis2.dataretrieval.WSDLDataLocator(serviceDataArray);
- else {
- wsdlDataLocator.setServiceData(serviceDataArray);
- }
- return wsdlDataLocator;
- }
-
-
-
-}
+/*
+* Copyright 2007 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.axis2.dataretrieval;
+
+/**
+ * Factory to constructor Axis2 Data Locators based on the specified
+ * Dialect.
+ */
+
+public class DataLocatorFactory {
+ private static org.apache.axis2.dataretrieval.WSDLDataLocator wsdlDataLocator = null;
+ private static org.apache.axis2.dataretrieval.PolicyDataLocator policyDataLocator = null;
+ private static org.apache.axis2.dataretrieval.SchemaDataLocator schemaDataLocator = null;
+
+ /*
+ * Return instance of default Data Locator for the dialect.
+ */
+ protected static AxisDataLocator createDataLocator(String dialect) {
+ return (createDataLocator(dialect, null));
+ }
+
+ protected static AxisDataLocator createDataLocator(String dialect, ServiceData[] serviceDataArray) {
+ AxisDataLocator dataLocator = null;
+ if (dialect.equals(DRConstants.SPEC.DIALECT_TYPE_WSDL)){
+ dataLocator = getWsdlDataLocator(serviceDataArray);
+
+ }
+ else if (dialect.trim().equals(DRConstants.SPEC.DIALECT_TYPE_POLICY)){
+ if (policyDataLocator == null)
+ dataLocator = new PolicyDataLocator(serviceDataArray);
+ else
+ dataLocator = policyDataLocator;
+ }
+ else if (dialect.equals(DRConstants.SPEC.DIALECT_TYPE_SCHEMA)){
+ if (schemaDataLocator == null)
+ dataLocator = new SchemaDataLocator(serviceDataArray);
+ else
+ dataLocator = schemaDataLocator;
+ }
+ else {
+ dataLocator = null;
+ }
+ return dataLocator;
+ }
+
+ protected static AxisDataLocator getWsdlDataLocator(ServiceData[] serviceDataArray) {
+
+ if (wsdlDataLocator == null)
+ wsdlDataLocator = new org.apache.axis2.dataretrieval.WSDLDataLocator(serviceDataArray);
+ else {
+ wsdlDataLocator.setServiceData(serviceDataArray);
+ }
+ return wsdlDataLocator;
+ }
+
+
+
+}
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataLocatorFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalException.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalException.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalException.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalException.java Sun Feb 25 11:56:59 2007
@@ -1,39 +1,39 @@
-/*
-* Copyright 2007 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.axis2.dataretrieval;
-
-import org.apache.axis2.AxisFault;
-
-/**
- * Exception class for reporting Data Retrieval problems
- *
- */
-
-public class DataRetrievalException extends AxisFault {
- private static final long serialVersionUID = -374933082062124908L;
- public DataRetrievalException(String message) {
- super(message);
- }
-
- public DataRetrievalException(Throwable e) {
- super(e);
- }
-
- public DataRetrievalException(String message, Throwable e) {
- super(message, e);
- }
-}
+/*
+* Copyright 2007 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.axis2.dataretrieval;
+
+import org.apache.axis2.AxisFault;
+
+/**
+ * Exception class for reporting Data Retrieval problems
+ *
+ */
+
+public class DataRetrievalException extends AxisFault {
+ private static final long serialVersionUID = -374933082062124908L;
+ public DataRetrievalException(String message) {
+ super(message);
+ }
+
+ public DataRetrievalException(Throwable e) {
+ super(e);
+ }
+
+ public DataRetrievalException(String message, Throwable e) {
+ super(message, e);
+ }
+}
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalException.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalRequest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalRequest.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalRequest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalRequest.java Sun Feb 25 11:56:59 2007
@@ -1,110 +1,110 @@
-/*
-* Copyright 2007 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.axis2.dataretrieval;
-
-import java.util.HashMap;
-
-/**
- * Allow to specify options/parameters for getData request. The list is extensible
- * based on the information needed for the Data Locator to process the request.
- *
- */
-
-public class DataRetrievalRequest extends HashMap{
-
- private static final long serialVersionUID = -374933082062124908L;
-
- /**
- * Key used to define Dialect of data to be retrieved.
- */
- public final static String DIALET="Dialect";
- /**
- * Key used to defined Identify of data to be retrieved.
- */
- public final static String IDENTIFIER = "Identifier";
- /**
- * Key used to define the output format of retrieved data to be returned.
- */
- public final static String OUTPUT_FORM = "OutputForm";
-
-
-
- /**
- * Returns the Dialect value specified in the request.
- * @return a String that has dialect info.
- */
-
- public String getDialect() throws DataRetrievalException{
- String dialect = (String)(get(DIALET));
- if (dialect == null || dialect.length() == 0)
- throw new DataRetrievalException("Empty dialect was detected. Dialect must have value.");
-
- return (dialect);
- }
-
- /**
- * Returns the Identifier value specified in the request.
- * @return a String that has Identifier info.
- */
-
- public String getIdentifier(){
- return (String)(get(IDENTIFIER));
- }
-
- /**
- * Returns the output format specified in the request.
- * @return output format of data retrieved.
- */
-
- public OutputForm getOutputForm(){
- return (OutputForm)(get(OUTPUT_FORM));
- }
-
- /**
- * Allow to set the dialect of data to retrieve
- * @param dialect - Valid dialect value supported by the Data Locator.
- * @throws DataRetrievalException
- */
-
- public void putDialect(String dialect)throws DataRetrievalException {
- if (dialect == null || dialect.length() == 0)
- throw new DataRetrievalException("Empty dialect was detected. Dialect must have value.");
- put(DIALET, dialect);
- }
-
- /**
- * Allow to set the identifier of data to retrieve
- * @param identifier - identifier value
- * @throws DataRetrievalException
- */
-
- public void putIdentifier(String identifier) {
- put(IDENTIFIER, identifier);
- }
-
- /**
- * Allow to set the output format of the data retrieved.
- * @param form - Valid output format types supported by the Data Locator.
- * @throws DataRetrievalException
- */
-
- public void putOutputForm(OutputForm form) {
- put(OUTPUT_FORM, form);
-}
-
-
-}
+/*
+* Copyright 2007 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.axis2.dataretrieval;
+
+import java.util.HashMap;
+
+/**
+ * Allow to specify options/parameters for getData request. The list is extensible
+ * based on the information needed for the Data Locator to process the request.
+ *
+ */
+
+public class DataRetrievalRequest extends HashMap{
+
+ private static final long serialVersionUID = -374933082062124908L;
+
+ /**
+ * Key used to define Dialect of data to be retrieved.
+ */
+ public final static String DIALET="Dialect";
+ /**
+ * Key used to defined Identify of data to be retrieved.
+ */
+ public final static String IDENTIFIER = "Identifier";
+ /**
+ * Key used to define the output format of retrieved data to be returned.
+ */
+ public final static String OUTPUT_FORM = "OutputForm";
+
+
+
+ /**
+ * Returns the Dialect value specified in the request.
+ * @return a String that has dialect info.
+ */
+
+ public String getDialect() throws DataRetrievalException{
+ String dialect = (String)(get(DIALET));
+ if (dialect == null || dialect.length() == 0)
+ throw new DataRetrievalException("Empty dialect was detected. Dialect must have value.");
+
+ return (dialect);
+ }
+
+ /**
+ * Returns the Identifier value specified in the request.
+ * @return a String that has Identifier info.
+ */
+
+ public String getIdentifier(){
+ return (String)(get(IDENTIFIER));
+ }
+
+ /**
+ * Returns the output format specified in the request.
+ * @return output format of data retrieved.
+ */
+
+ public OutputForm getOutputForm(){
+ return (OutputForm)(get(OUTPUT_FORM));
+ }
+
+ /**
+ * Allow to set the dialect of data to retrieve
+ * @param dialect - Valid dialect value supported by the Data Locator.
+ * @throws DataRetrievalException
+ */
+
+ public void putDialect(String dialect)throws DataRetrievalException {
+ if (dialect == null || dialect.length() == 0)
+ throw new DataRetrievalException("Empty dialect was detected. Dialect must have value.");
+ put(DIALET, dialect);
+ }
+
+ /**
+ * Allow to set the identifier of data to retrieve
+ * @param identifier - identifier value
+ * @throws DataRetrievalException
+ */
+
+ public void putIdentifier(String identifier) {
+ put(IDENTIFIER, identifier);
+ }
+
+ /**
+ * Allow to set the output format of the data retrieved.
+ * @param form - Valid output format types supported by the Data Locator.
+ * @throws DataRetrievalException
+ */
+
+ public void putOutputForm(OutputForm form) {
+ put(OUTPUT_FORM, form);
+}
+
+
+}
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalRequest.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org