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 ru...@apache.org on 2006/10/02 14:31:34 UTC
svn commit: r451997 - in /webservices/axis2/trunk/java/modules:
kernel/src/org/apache/axis2/deployment/
kernel/src/org/apache/axis2/deployment/repository/util/
kernel/src/org/apache/axis2/deployment/util/
secpolicy/src/org/apache/ws/secpolicy/builders/...
Author: ruchithf
Date: Mon Oct 2 05:31:33 2006
New Revision: 451997
URL: http://svn.apache.org/viewvc?view=rev&rev=451997
Log:
Updated TransportToken to be a TokenWrapper
Fixed typos
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/URLBasedAxisConfigurator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/PhasesInfo.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
webservices/axis2/trunk/java/modules/secpolicy/src/org/apache/ws/secpolicy/builders/TransportTokenBuilder.java
webservices/axis2/trunk/java/modules/secpolicy/src/org/apache/ws/secpolicy/model/TransportToken.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java?view=diff&rev=451997&r1=451996&r2=451997
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java Mon Oct 2 05:31:33 2006
@@ -82,12 +82,12 @@
processModuleRefs(moduleitr, axisConfig);
- // Proccessing Transport Senders
+ // Processing Transport Senders
Iterator trs_senders = config_element.getChildrenWithName(new QName(TAG_TRANSPORT_SENDER));
processTransportSenders(trs_senders);
- // Proccessing Transport Receivers
+ // Processing Transport Receivers
Iterator trs_Reivers = config_element.getChildrenWithName(new QName(TAG_TRANSPORT_RECEIVER));
processTransportReceivers(trs_Reivers);
@@ -101,7 +101,7 @@
processObservers(obs_ittr);
- // processing Phase orders
+ // Processing Phase orders
Iterator phaseorders = config_element.getChildrenWithName(new QName(TAG_PHASE_ORDER));
processPhaseOrders(phaseorders);
@@ -223,7 +223,7 @@
try {
observer.init(axisConfig);
} catch (Throwable e) {
- //Obserer init may throw runtime exception , but we can stil
+ //Observer init may throw runtime exception , but we can stil
// start Axis2
log.info(e.getMessage());
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java?view=diff&rev=451997&r1=451996&r2=451997
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java Mon Oct 2 05:31:33 2006
@@ -26,9 +26,9 @@
/**
* DeploymentClassLoader is extended from URLClassLoader. The constructor
* does not override the super constructor, but does additional steps like find out
- * jar fils inside /lib directory.
+ * jar files inside /lib directory.
*
- * @param urls <code>URL</code>
+ * @param urls <code>URL</code>s
* @param parent parent classloader <code>ClassLoader</code>
*/
public DeploymentClassLoader(URL[] urls, ClassLoader parent, boolean antiJARLocking) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?view=diff&rev=451997&r1=451996&r2=451997
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java Mon Oct 2 05:31:33 2006
@@ -112,7 +112,7 @@
}
public void loadFromClassPath() throws DeploymentException {
- //loading modules from the class path
+ //loading modules from the classpath
new RepositoryListener(this);
org.apache.axis2.util.Utils.calculateDefaultModuleVersion(
axisConfig.getModules(), axisConfig);
@@ -418,7 +418,7 @@
/**
* When user adds the "load-on-startup" parameter into services.xml ,
- * Axis2 will call following method using java reflection.
+ * Axis2 will call following method using Java reflection.
* If user has DB initialization , Thread creation then he can do that at this point.
* Public void startUp(ConfigurationContext) {}
*
@@ -661,7 +661,7 @@
* First creat a AxisConfiguration using given inputSream , and then it will
* try to find the repository location parameter from AxisConfiguration, so
* if user has add a parameter with the name "repository" , then the value
- * specified by that parameter will be the repositiry and system will try to
+ * specified by that parameter will be the repository and system will try to
* load modules and services from that repository location if it a valid
* location. hot deployment and hot update will work as usual in this case.
* <p/>
@@ -687,7 +687,7 @@
}
/**
- * Starts the Deployment engine to perform Hot deployment and so on..
+ * Starts the Deployment engine to perform Hot deployment and so on.
*/
private void startSearch(RepositoryListener listener) {
Scheduler scheduler = new Scheduler();
@@ -772,7 +772,7 @@
}
/**
- * To set the all the classLoader hierarchy this method can be used , the top most parenet is
+ * To set the all the classLoader hierarchy this method can be used , the top most parent is
* CCL then SCL(system Class Loader)
* CCL
* :
@@ -784,7 +784,7 @@
* <p/>
* <p/>
* MCCL : module common class loader
- * SCCL : Service commin class loader
+ * SCCL : Service common class loader
* MCL : module class loader
* SCL : Service class loader
*
@@ -912,12 +912,12 @@
/**
* Builds ModuleDescription for a given module archive file. This does not
- * called the init method since there is no refernce to configuration context
- * so who ever create module usieng this has to called module.init if it is
+ * called the init method since there is no reference to configuration context
+ * so who ever create module using this has to called module.init if it is
* required
*
* @param modulearchive : Actual module archive file
- * @param config : AxisConfiguration : for get classs loders etc..
+ * @param config : AxisConfiguration : for get classloaders etc..
* @return
* @throws org.apache.axis2.deployment.DeploymentException
*
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java?view=diff&rev=451997&r1=451996&r2=451997
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java Mon Oct 2 05:31:33 2006
@@ -264,7 +264,7 @@
ParameterInclude parent) throws DeploymentException {
HandlerDescription handler = new HandlerDescription();
- // Setting Handler name
+ // Setting handler name
OMAttribute name_attribute = handler_element.getAttribute(new QName(
ATTRIBUTE_NAME));
@@ -275,7 +275,7 @@
handler.setName(name_attribute.getAttributeValue());
}
- // Setting Handler Class name
+ // Setting handler class name
OMAttribute class_attribute = handler_element.getAttribute(new QName(
TAG_CLASS_NAME));
@@ -287,7 +287,7 @@
handler.setClassName(class_attribute.getAttributeValue());
}
- // processing phase Rules (order)
+ // processing phase rules (order)
OMElement order_element = handler_element
.getFirstChildWithName(new QName(TAG_ORDER));
@@ -379,7 +379,7 @@
ParameterInclude parameterInclude, ParameterInclude parent)
throws DeploymentException {
while (parameters.hasNext()) {
- // this is to check whether some one has locked the parmter at the
+ // this is to check whether some one has locked the parmeter at the
// top level
OMElement parameterElement = (OMElement) parameters.next();
Parameter parameter = new Parameter();
@@ -394,7 +394,7 @@
parameterElement.toString()));
}
parameter.setName(paramName.getAttributeValue());
- // setting parameter Value (the chiled elemnt of the parameter)
+ // setting parameter Value (the child element of the parameter)
OMElement paramValue = parameterElement.getFirstElement();
if (paramValue != null) {
parameter.setValue(parameterElement);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java?view=diff&rev=451997&r1=451996&r2=451997
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java Mon Oct 2 05:31:33 2006
@@ -186,7 +186,7 @@
while (operationsIterator.hasNext()) {
OMElement operation = (OMElement) operationsIterator.next();
- // /getting operation name
+ //getting operation name
OMAttribute op_name_att = operation.getAttribute(new QName(ATTRIBUTE_NAME));
if (op_name_att == null) {
@@ -206,7 +206,7 @@
if (mepURL == null) {
- // assuming in-out mep
+ // assuming in-out MEP
op_descrip = new InOnlyAxisOperation();
} else {
try {
@@ -231,7 +231,7 @@
//To process wsamapping;
processActionMappings(operation, op_descrip);
- // setting the mep of the operation
+ // setting the MEP of the operation
// loading the message receivers
OMElement receiverElement = operation.getFirstChildWithName(new QName(TAG_MESSAGE_RECEIVER));
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java?view=diff&rev=451997&r1=451996&r2=451997
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java Mon Oct 2 05:31:33 2006
@@ -55,7 +55,7 @@
loadClassPathModules();
}
- //The constructor , which loads moduls from class path
+ //The constructor , which loads modules from class path
public RepositoryListener(DeploymentEngine deploymentEngine) {
this.deploymentEngine = deploymentEngine;
wsInfoList = new WSInfoList(deploymentEngine);
@@ -114,7 +114,7 @@
File file = files[i];
if (!file.isDirectory()) {
if (ArchiveFileData.isModuleArchiveFile(file.getName())) {
- //adding moduls in the class path
+ //adding modules in the class path
wsInfoList.addWSInfoItem(file, TYPE_MODULE);
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?view=diff&rev=451997&r1=451996&r2=451997
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java Mon Oct 2 05:31:33 2006
@@ -102,7 +102,7 @@
service.setWSAddressingFlag(addressingRequiredString);
}
- //Setting service tratget namespace if any
+ //Setting service target namespace if any
OMAttribute targetNameSpace = service_element.
getAttribute(new QName(TARGET_NAME_SPACE));
if (targetNameSpace != null) {
@@ -187,13 +187,13 @@
policyRefElements, service.getPolicyInclude());
}
- //processin Service Scop
+ //processing service scope
String sessionScope = service_element.getAttributeValue(new QName(ATTRIBUTE_SCOPE));
if (sessionScope != null) {
service.setScope(sessionScope);
}
- // processing servicewide modules which required to engage gloabally
+ // processing service-wide modules which required to engage globally
Iterator moduleRefs = service_element.getChildrenWithName(new QName(TAG_MODULE));
processModuleRefs(moduleRefs);
@@ -231,19 +231,19 @@
}
}
if (!service.isUseUserWSDL()) {
- // Generating schema for the service if the imple class is JAVA
+ // Generating schema for the service if the impl class is Java
if (!service.isWsdlfound()) {
- //trying to generate WSDL for the service using JAM and Java refelection
+ //trying to generate WSDL for the service using JAM and Java reflection
try {
if (generateWsdl(service)) {
Utils.fillAxisService(service, axisConfig, excludeops);
}
} catch (Exception e) {
/**
- * I have log here if some error occours , since service impl
- * class can alos be non-java class , so in that case
- * it is not posible to generate scheam, so no pint of throwing that
- * error , I know we have to handle this , untill that I have
+ * I have log here if some error occurs , since service impl
+ * class can alos be non-Java class , so in that case
+ * it is not possible to generate schema, so no pint of throwing that
+ * error , I know we have to handle this , until that I have
* to log this
*/
log.error(Messages.getMessage("errorinschemagen", e.getMessage()), e);
@@ -409,7 +409,7 @@
ArrayList operations = new ArrayList();
while (operationsIterator.hasNext()) {
OMElement operation = (OMElement) operationsIterator.next();
- // /getting operation name
+ //getting operation name
OMAttribute op_name_att = operation.getAttribute(new QName(ATTRIBUTE_NAME));
if (op_name_att == null) {
throw new DeploymentException(
@@ -418,7 +418,7 @@
DeploymentErrorMsgs.INVALID_OP, "operation name missing")));
}
- // setting the mep of the operation
+ // setting the MEP of the operation
OMAttribute op_mep_att = operation.getAttribute(new QName(TAG_MEP));
String mepurl = null;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java?view=diff&rev=451997&r1=451996&r2=451997
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java Mon Oct 2 05:31:33 2006
@@ -59,7 +59,7 @@
processServiceModuleConfig(moduleConfigs, axisServiceGroup.getParent(),
axisServiceGroup);
- // processing servicewide modules which required to engage gloabally
+ // processing service-wide modules which required to engage globally
Iterator moduleRefs = serviceElement.getChildrenWithName(new QName(TAG_MODULE));
processModuleRefs(moduleRefs, axisServiceGroup);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/URLBasedAxisConfigurator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/URLBasedAxisConfigurator.java?view=diff&rev=451997&r1=451996&r2=451997
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/URLBasedAxisConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/URLBasedAxisConfigurator.java Mon Oct 2 05:31:33 2006
@@ -56,7 +56,7 @@
String repoValue = (String) axis2repoPara.getValue();
if (repoValue != null && !"".equals(repoValue.trim())) {
if (repoValue.startsWith("file://")) {
- // we treat this case specialy , by assuming file is
+ // we treat this case specially , by assuming file is
// locate in the local machine
loadRepository(repoValue);
} else {
@@ -64,7 +64,7 @@
}
}
} else {
- log.info("No repository found , module will be loded using class path");
+ log.info("No repository found , module will be loaded from classpath");
loadFromClassPath();
}
} else {
@@ -86,7 +86,7 @@
String repoValue = (String) axis2repoPara.getValue();
if (repoValue != null && !"".equals(repoValue.trim())) {
if (repoValue.startsWith("file://")) {
- // we treat this case specialy , by assuming file is
+ // we treat this case specially , by assuming file is
// locate in the local machine
super.loadServices();
} else {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java?view=diff&rev=451997&r1=451996&r2=451997
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java Mon Oct 2 05:31:33 2006
@@ -45,7 +45,7 @@
/**
* The name of the init parameter (axis2.xml.path) that can be used to override the default location for the axis2.xml file. When both this init parameter, and the axis2.xml.url init parameters are not specified in the axis servlet init-parameter, the default location of ${app}/WEB-INF/conf/axis2.xml is used.
* The value of this path is interpreted as a file system absolute path.
- * This parameter takes precidence over the axis2.xml.url init parameter.
+ * This parameter takes precedence over the axis2.xml.url init parameter.
*/
public static final String PARAM_AXIS2_XML_PATH = "axis2.xml.path";
@@ -70,8 +70,8 @@
/**
* Default constructor for configurator.
- * This determines the axis2.xml file to be used from the init parametes for the AxisServlet in the web.xml.
- * The order of initialization is according the the following precidence:
+ * This determines the axis2.xml file to be used from the init parameters for the AxisServlet in the web.xml.
+ * The order of initialization is according the the following precedence:
* <ul>
* <li>If the parameter axis2.xml.path is present, the value is webapp relative path to be used as the location to the axis2.xml file.
* <li>Otherwise, if the parameter axis2.xml.url is present, the URL is used as the location to the axis2.xml file.
@@ -157,7 +157,7 @@
/**
* Gets the axis configuration object by loading the repository.
- * The order of initialization is according the the following precidence:
+ * The order of initialization is according the the following precedence:
* <ul>
* <li>If the parameter axis2.repository.path is present, this folder is used as the location to the repository.
* <li>Otherwise, if the parameter axis2.repository.url is present, the URL is used as the location to the repository.
@@ -165,7 +165,7 @@
* </ul>
*
* @return the instance of the AxisConfiguration object that reflects the repository according to the rules above.
- * @throws AxisFault when an error occured in the initialization of the AxisConfiguration.
+ * @throws AxisFault when an error occurred in the initialization of the AxisConfiguration.
*/
public AxisConfiguration getAxisConfiguration() throws AxisFault {
try {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java?view=diff&rev=451997&r1=451996&r2=451997
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java Mon Oct 2 05:31:33 2006
@@ -24,8 +24,6 @@
import org.apache.axis2.i18n.Messages;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
@@ -95,7 +93,7 @@
}
/**
- * Checks whether a given file is a jar or aar file.
+ * Checks whether a given file is a jar or an aar file.
*
* @param filename
* @return Returns boolean.
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java?view=diff&rev=451997&r1=451996&r2=451997
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java Mon Oct 2 05:31:33 2006
@@ -33,7 +33,7 @@
private List jarList = new ArrayList();
/**
- * All the curently updated jars
+ * All the currently updated jars
*/
public List currentJars = new ArrayList();
@@ -57,7 +57,7 @@
* <p/>
* If the files already exists, then checks whether it has been updated
* then changes the last update date of the wsInfo and adds two entries to
- * DeploymentEngine - one for New Deployment and other for undeployment.
+ * DeploymentEngine - one for new deployment and other for undeployment.
*
* @param file actual jar files for either Module or service
* @param type indicate either Service or Module
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/PhasesInfo.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/PhasesInfo.java?view=diff&rev=451997&r1=451996&r2=451997
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/PhasesInfo.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/PhasesInfo.java Mon Oct 2 05:31:33 2006
@@ -47,7 +47,7 @@
}
/**
- * To copy phase informatoin from one to another
+ * To copy phase information from one to another
*
* @param phase
*/
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?view=diff&rev=451997&r1=451996&r2=451997
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java Mon Oct 2 05:31:33 2006
@@ -285,7 +285,7 @@
}
String opName = jmethod.getSimpleName();
AxisOperation operation = axisService.getOperation(new QName(opName));
- // if the opeartion there in services.xml then try to set it schema element name
+ // if the operation there in services.xml then try to set it schema element name
if (operation != null) {
AxisMessage inMessage = operation.getMessage(
WSDLConstants.MESSAGE_LABEL_IN_VALUE);
@@ -364,7 +364,7 @@
/**
* This method is to get the list of services there in a module
* if module want to add services then the way of doing that is
- * 1. Add a foldere called services inside the module (both in mar case and expanded case)
+ * 1. Add a directory called services inside the module (both in mar case and expanded case)
* 2. Then add a services.list file into that directory adding all the modules
* you want to add
* 3. Then put all the services into services directory in the module
Modified: webservices/axis2/trunk/java/modules/secpolicy/src/org/apache/ws/secpolicy/builders/TransportTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/secpolicy/src/org/apache/ws/secpolicy/builders/TransportTokenBuilder.java?view=diff&rev=451997&r1=451996&r2=451997
==============================================================================
--- webservices/axis2/trunk/java/modules/secpolicy/src/org/apache/ws/secpolicy/builders/TransportTokenBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/secpolicy/src/org/apache/ws/secpolicy/builders/TransportTokenBuilder.java Mon Oct 2 05:31:33 2006
@@ -66,7 +66,7 @@
if(attr != null) {
httpsToken.setRequireClientCertificate("true".equals(attr.getAttributeValue()));
}
- parent.setTransportToken(httpsToken);
+ parent.setToken(httpsToken);
}
}
}
Modified: webservices/axis2/trunk/java/modules/secpolicy/src/org/apache/ws/secpolicy/model/TransportToken.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/secpolicy/src/org/apache/ws/secpolicy/model/TransportToken.java?view=diff&rev=451997&r1=451996&r2=451997
==============================================================================
--- webservices/axis2/trunk/java/modules/secpolicy/src/org/apache/ws/secpolicy/model/TransportToken.java (original)
+++ webservices/axis2/trunk/java/modules/secpolicy/src/org/apache/ws/secpolicy/model/TransportToken.java Mon Oct 2 05:31:33 2006
@@ -16,52 +16,25 @@
package org.apache.ws.secpolicy.model;
-import java.util.ArrayList;
-import java.util.Iterator;
+import org.apache.neethi.PolicyComponent;
+import org.apache.ws.secpolicy.Constants;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.neethi.PolicyComponent;
-import org.apache.ws.secpolicy.Constants;
-
-public class TransportToken extends AbstractSecurityAssertion {
+public class TransportToken extends AbstractSecurityAssertion implements TokenWrapper {
private Token transportToken;
- private ArrayList transportTokens = new ArrayList();
-
/**
* @return Returns the transportToken.
*/
public Token getTransportToken() {
return transportToken;
}
-
- /**
- * @param transportToken The transportToken to set.
- */
- public void setTransportToken(Token transportToken) {
- this.transportToken = transportToken;
- }
- public Iterator getConfigurations() {
- return transportTokens.iterator();
- }
-
- public TransportToken getDefaultConfiguration() {
- if (transportTokens != null) {
- return (TransportToken) transportTokens.get(0);
- }
- return null;
- }
-
- public void addConfiguration(TransportToken transportToken) {
- transportTokens.add(transportToken);
- }
-
public QName getName() {
return new QName(Constants.SP_NS, "TransportToken");
}
@@ -97,6 +70,13 @@
writer.writeEndElement();
// </sp:TransportToken>
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.ws.secpolicy.model.TokenWrapper#setToken(org.apache.ws.secpolicy.model.Token)
+ */
+ public void setToken(Token tok) {
+ this.transportToken = tok;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org