[wsas-java-dev] svn commit r1805 - in trunk/wsas/java: .
modules/admin/src/org/wso2/wsas/admin/service
modules/admin/src/org/wso2/wsas/admin/service/util
modules/clustering modules/core/src/org/wso2/wsas/transport
modules/core/src/org/wso2/wsas/util modules/distribution
modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client
modules/samples/Trader/src/org/wso2/wsas/sample/trader/client
modules/standalone-edition/src/org/wso2/wsas
svn at wso2.org
svn at wso2.org
Thu Apr 12 04:05:46 PDT 2007
Author: saminda
Date: Thu Apr 12 04:05:08 2007
New Revision: 1805
Modified:
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/GlobalAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/CreateArchive.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/GenericApplicationContextUtil.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServerStatus.java
trunk/wsas/java/modules/clustering/clustering-codegen.xml
trunk/wsas/java/modules/clustering/pom.xml
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/FileDownloadServlet.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/FileUploadServlet.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/WSASServlet.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/util/TracePersisterImpl.java
trunk/wsas/java/modules/distribution/pom.xml
trunk/wsas/java/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java
trunk/wsas/java/modules/samples/Trader/src/org/wso2/wsas/sample/trader/client/TraderClientSkeleton.java
trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/HttpTransportListener.java
trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/HttpsTransportListener.java
trunk/wsas/java/pom.xml
Log:
1. Fixes to cope with Axis2 changes
2. Fixes to support Maven 2.0.6 build
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/GlobalAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/GlobalAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/GlobalAdmin.java Thu Apr 12 04:05:08 2007
@@ -258,7 +258,7 @@
try {
pm.updateUser(user);
} catch (ServiceUserNotFoundException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
return true;
} else {
@@ -271,7 +271,7 @@
try {
pm.updateUser(user);
} catch (ServiceUserNotFoundException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
} else {
log.warn("Failed Administrator login attempt by non-existent Administrator \'" +
@@ -336,7 +336,7 @@
throw new AxisFault("Invalid Message");
}
} catch (IOException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
@@ -369,7 +369,7 @@
throw new AxisFault("Invalid Message");
}
} catch (IOException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java Thu Apr 12 04:05:08 2007
@@ -322,7 +322,7 @@
try {
pm.updateModule(moduleDO);
} catch (ModuleNotFoundException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
} else {
log.warn("Module " + moduleId + " not found in database");
@@ -367,7 +367,7 @@
}
} catch (Exception e) {
log.error(e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
// store the global engagement status
@@ -377,7 +377,7 @@
try {
pm.updateModule(moduleDO);
} catch (ModuleNotFoundException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
} else {
log.warn("Module " + moduleId + " not found in database");
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java Thu Apr 12 04:05:08 2007
@@ -561,7 +561,7 @@
opMetaData.setAvgResponseTime(statClient.getAvgOperationResponseTime(serviceName,
operationName));
} catch (Exception e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
return opMetaData;
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java Thu Apr 12 04:05:08 2007
@@ -271,7 +271,7 @@
throw new AxisFault("Policy ID attribute is NULL");
}
} catch (Exception e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java Thu Apr 12 04:05:08 2007
@@ -300,7 +300,7 @@
smd.setMinResponseTime(statClient.getMinServiceResponseTime(serviceName));
smd.setAvgResponseTime(statClient.getAvgServiceResponseTime(serviceName));
} catch (Exception e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
smd.setOperations((String[]) ops.toArray(new String[ops.size()]));
@@ -325,7 +325,7 @@
}
/**
- *
+ *
* @param serviceGroupId
* @param serviceGroupVersion
* @return
@@ -358,7 +358,7 @@
smd.setMinResponseTime(statClient.getMinServiceResponseTime(serviceName));
smd.setAvgResponseTime(statClient.getAvgServiceResponseTime(serviceName));
} catch (Exception e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
smd.setOperations((String[]) ops.toArray(new String[ops.size()]));
smd.setName(serviceName);
@@ -580,7 +580,7 @@
return wsdlWrapper;
} catch (XMLStreamException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
@@ -606,7 +606,7 @@
return wsdlWrapper;
} catch (XMLStreamException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
@@ -805,7 +805,7 @@
try {
pm.updateServicePolicy(servicePolicyDO);
} catch (ServicePolicyNotFoundException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
} else {
@@ -815,7 +815,7 @@
try {
pm.addServicePolicy(servicePolicyDO);
} catch (ServicePolicyAlreadyExistsException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
}
@@ -1319,9 +1319,9 @@
out.close();
} catch (FileNotFoundException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
} catch (IOException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
return uuid;
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java Thu Apr 12 04:05:08 2007
@@ -69,7 +69,7 @@
userRole.setRole(ServerConstants.ADMIN_ROLE);
pm.addUser(admin);
} catch (CryptoException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
} catch (ServiceUserAlreadyExistsException e) {
throw new AxisFault("Admin with username " + userName +
" already exists");
@@ -103,7 +103,7 @@
pm.updateUser(admin);
} catch (Exception e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
@@ -208,7 +208,7 @@
pm.addRole(username, roleDO);
}
} catch (Exception e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
@@ -387,7 +387,7 @@
}
} catch (Exception e) {
// e.printStackTrace();
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
pm.deleteRole(role);
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/CreateArchive.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/CreateArchive.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/CreateArchive.java Thu Apr 12 04:05:08 2007
@@ -121,7 +121,7 @@
} catch (IOException e) {
log.error(e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/GenericApplicationContextUtil.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/GenericApplicationContextUtil.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/GenericApplicationContextUtil.java Thu Apr 12 04:05:08 2007
@@ -53,7 +53,7 @@
xbdr.loadBeanDefinitions(new InputStreamResource(applicationContxtInStream));
appContext.refresh();
} catch (MalformedURLException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
} finally {
// Restore
Thread.currentThread().setContextClassLoader(prevCl);
@@ -81,7 +81,7 @@
new FileInputStream(new File(applicationContxtFilePath))));
appContext.refresh();
} catch (FileNotFoundException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
} finally {
// Restore
Thread.currentThread().setContextClassLoader(prevCl);
@@ -96,7 +96,7 @@
return getSpringApplicationContext(
new FileInputStream(new File(applicationContxtFilePath)),springBeansFilePath);
} catch (FileNotFoundException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServerStatus.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServerStatus.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServerStatus.java Thu Apr 12 04:05:08 2007
@@ -57,7 +57,7 @@
try {
statClient = new StatisticsClient();
} catch (Exception e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
@@ -77,7 +77,7 @@
maxResponseTime = statClient.getMaxSystemResponseTime();
minResponseTime = statClient.getMinSystemResponseTime();
} catch (Exception e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
Runtime runtime = Runtime.getRuntime();
Modified: trunk/wsas/java/modules/clustering/clustering-codegen.xml
==============================================================================
--- trunk/wsas/java/modules/clustering/clustering-codegen.xml (original)
+++ trunk/wsas/java/modules/clustering/clustering-codegen.xml Thu Apr 12 04:05:08 2007
@@ -4,7 +4,7 @@
<!-- NodeManager Stub -->
<set>
<uri>./nodemanager.wsdl</uri>
- <o>./target/generated</o>
+ <o>./generated/src</o>
<p>org.wso2.wsas.clustering</p>
<d>adb</d>
<sn>WSO2WSASNodeManager</sn>
Modified: trunk/wsas/java/modules/clustering/pom.xml
==============================================================================
--- trunk/wsas/java/modules/clustering/pom.xml (original)
+++ trunk/wsas/java/modules/clustering/pom.xml Thu Apr 12 04:05:08 2007
@@ -49,7 +49,7 @@
</goals>
<configuration>
<sources>
- <source>${basedir}/target/generated/src</source>
+ <source>${basedir}/generated/src</source>
</sources>
</configuration>
</execution>
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/FileDownloadServlet.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/FileDownloadServlet.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/FileDownloadServlet.java Thu Apr 12 04:05:08 2007
@@ -53,7 +53,7 @@
log.error(msg, e);
if (msgCtx != null) {
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
- handleFault(msgCtx, res.getOutputStream(), new AxisFault(e));
+ handleFault(msgCtx, res.getOutputStream(), AxisFault.makeFault(e));
} else {
throw new ServletException(e);
}
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/FileUploadServlet.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/FileUploadServlet.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/FileUploadServlet.java Thu Apr 12 04:05:08 2007
@@ -49,7 +49,7 @@
log.error(msg, e);
if (msgCtx != null) {
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
- handleFault(msgCtx, response.getOutputStream(), new AxisFault(e));
+ handleFault(msgCtx, response.getOutputStream(), AxisFault.makeFault(e));
} else {
throw new ServletException(e);
}
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/WSASServlet.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/WSASServlet.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/WSASServlet.java Thu Apr 12 04:05:08 2007
@@ -92,9 +92,9 @@
handleRestRequest(request, response);
}
} catch (AxisFault axisFault) {
- throw new AxisFault(axisFault);
+ throw AxisFault.makeFault(axisFault);
} catch (IOException ioException) {
- throw new AxisFault(ioException);
+ throw AxisFault.makeFault(ioException);
}
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/util/TracePersisterImpl.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/util/TracePersisterImpl.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/util/TracePersisterImpl.java Thu Apr 12 04:05:08 2007
@@ -166,9 +166,9 @@
TransformerFactory.newInstance().newTransformer(xslSource);
transformer.transform(xmlSource, result);
} catch (TransformerConfigurationException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
} catch (TransformerException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
return new String(out.toByteArray());
}
Modified: trunk/wsas/java/modules/distribution/pom.xml
==============================================================================
--- trunk/wsas/java/modules/distribution/pom.xml (original)
+++ trunk/wsas/java/modules/distribution/pom.xml Thu Apr 12 04:05:08 2007
@@ -98,7 +98,7 @@
<module>common</module>
<module>standalone</module>
<module>webapp</module>
- <module>release</module>
+ <!--<module>release</module>-->
</modules>
</project>
\ No newline at end of file
Modified: trunk/wsas/java/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java
==============================================================================
--- trunk/wsas/java/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java (original)
+++ trunk/wsas/java/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java Thu Apr 12 04:05:08 2007
@@ -21,15 +21,15 @@
import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.sandesha2.client.SandeshaListener;
import org.apache.sandesha2.client.SequenceReport;
-import org.wso2.wsas.security.WSS4JUtil;
import org.wso2.utils.NetworkUtils;
+import org.wso2.wsas.security.WSS4JUtil;
+import org.wso2.www.types.client.*;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import java.io.*;
import java.rmi.RemoteException;
import java.util.Properties;
-import org.wso2.www.types.client.*;
public class Client {
// command line parameters
@@ -318,7 +318,21 @@
options.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
options.setTransportInProtocol(Constants.TRANSPORT_MAIL);
options.setUseSeparateListener(true);
-
+ Properties p = new Properties();
+ p.setProperty("mail.smtp.from","blue at localhost");
+ p.setProperty("mail.smtp.host","localhost");
+
+ Properties pp = new Properties();
+ pp.setProperty("mail.pop3.host","localhost");
+ pp.setProperty("mail.pop3.user","blue");
+ pp.setProperty("mail.store.protocol","pop3");
+ pp.setProperty("transport.mail.pop3.password","blue");
+ pp.setProperty("transport.mail.replyToAddress","blue at localhost");
+ pp.setProperty("transport.listener.interval","3000");
+// options.setProperty(org.apache.axis2.transport.mail.Constants.MAIL_POP3,pp);
+// options.setProperty(org.apache.axis2.transport.mail.Constants.MAIL_SMTP,p);
+// options.setProperty(org.apache.axis2.transport.mail.Constants.MAIL_SYNC,Boolean.TRUE);
+//
}
/**
Modified: trunk/wsas/java/modules/samples/Trader/src/org/wso2/wsas/sample/trader/client/TraderClientSkeleton.java
==============================================================================
--- trunk/wsas/java/modules/samples/Trader/src/org/wso2/wsas/sample/trader/client/TraderClientSkeleton.java (original)
+++ trunk/wsas/java/modules/samples/Trader/src/org/wso2/wsas/sample/trader/client/TraderClientSkeleton.java Thu Apr 12 04:05:08 2007
@@ -51,7 +51,7 @@
}
} catch (Exception e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
Modified: trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/HttpTransportListener.java
==============================================================================
--- trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/HttpTransportListener.java (original)
+++ trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/HttpTransportListener.java Thu Apr 12 04:05:08 2007
@@ -44,7 +44,7 @@
try {
ip = NetworkUtils.getLocalHostname();
} catch (SocketException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
return new EndpointReference[]{getEPRForService(serviceName, ip)};
@@ -61,7 +61,7 @@
httpConnector.start();
}
} catch (Exception e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
}
Modified: trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/HttpsTransportListener.java
==============================================================================
--- trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/HttpsTransportListener.java (original)
+++ trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/HttpsTransportListener.java Thu Apr 12 04:05:08 2007
@@ -49,7 +49,7 @@
ip = NetworkUtils.getLocalHostname();
} catch (SocketException e) {
log.error(e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
return new EndpointReference[]{getEPRForService(serviceName, ip)};
@@ -139,7 +139,7 @@
}
} catch (Exception e) {
log.error(e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
// Persist the SSL Key Store
@@ -154,10 +154,10 @@
true);
} catch (KeyStoreAlreadyExistsException e) {
log.error(e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
} catch (ServerException e) {
log.error(e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
}
Modified: trunk/wsas/java/pom.xml
==============================================================================
--- trunk/wsas/java/pom.xml (original)
+++ trunk/wsas/java/pom.xml Thu Apr 12 04:05:08 2007
@@ -268,25 +268,237 @@
</plugins>
</build>
+ <dependencyManagement>
+ <dependencies>
+ <!-- Embedded Tomcate Dependencies starts -->
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>catalina-optional</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler-jdt</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+
+ <!--<dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>-->
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-factory</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-resources</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+
+ <!--<dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>-->
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>servlets-default</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>tomcat-http</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>tomcat-util</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-factory-dbcp</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tribes</artifactId>
+ <version>${tribes.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>juli</artifactId>
+ <version>${juli.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-modeler</groupId>
+ <artifactId>commons-modeler</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons.collections.version}</version>
+ </dependency>
+
+ <!-- Embedded Tomcat dependencies ends-->
+
+
+ <dependency>
+ <groupId>org.wso2.utils</groupId>
+ <artifactId>wso2utils</artifactId>
+ <version>${wso2utils.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-clustering</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mtompolicy</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-spring</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+
+ <!-- Rampart -->
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-policy</artifactId>
+ <version>${rampart.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-trust</artifactId>
+ <version>${rampart.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-core</artifactId>
+ <version>${rampart.version}</version>
+ </dependency>
+
+ <!--AXIOM-->
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>${javamail.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j</artifactId>
+ <version>${wss4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
<dependencies>
- <!-- Embedded Tomcate Dependencies starts -->
<dependency>
<groupId>tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>catalina-optional</artifactId>
- <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
- <version>${tomcat.version}</version>
<exclusions>
<exclusion>
<groupId>ant</groupId>
@@ -298,7 +510,6 @@
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler-jdt</artifactId>
- <version>${tomcat.version}</version>
</dependency>
<dependency>
@@ -307,82 +518,64 @@
<version>${tomcat.version}</version>
</dependency>
- <!--<dependency>
- <groupId>tomcat</groupId>
- <artifactId>jsp-api</artifactId>
- <version>${tomcat.version}</version>
- </dependency>-->
-
<dependency>
<groupId>tomcat</groupId>
<artifactId>naming-factory</artifactId>
- <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>naming-resources</artifactId>
- <version>${tomcat.version}</version>
</dependency>
- <!--<dependency>
- <groupId>tomcat</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${tomcat.version}</version>
- </dependency>-->
-
<dependency>
<groupId>tomcat</groupId>
<artifactId>servlets-default</artifactId>
- <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>tomcat-coyote</artifactId>
- <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>tomcat-http</artifactId>
- <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>tomcat-util</artifactId>
- <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>naming-factory-dbcp</artifactId>
- <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tribes</artifactId>
- <version>${tribes.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>juli</artifactId>
- <version>${juli.version}</version>
</dependency>
<dependency>
<groupId>commons-modeler</groupId>
<artifactId>commons-modeler</artifactId>
- <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
@@ -399,25 +592,17 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
- </dependency>
+
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>${commons.collections.version}</version>
</dependency>
- <!-- Embedded Tomcat dependencies ends-->
-
-
<!-- COMMONS dependencies -->
<dependency>
<groupId>org.wso2.utils</groupId>
<artifactId>wso2utils</artifactId>
- <version>${wso2utils.version}</version>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
@@ -442,6 +627,7 @@
<groupId>org.wso2.codegen</groupId>
<artifactId>wso2codegen</artifactId>
<version>${wso2codegen.version}</version>
+ <type>jar</type>
</dependency>
<!-- Mex mar -->
@@ -472,7 +658,6 @@
<groupId>org.wso2.statistics</groupId>
<artifactId>wso2statistics</artifactId>
<version>${wso2statistics.version}</version>
- <type>jar</type>
</dependency>
<!-- Throttle mar -->
<dependency>
@@ -501,16 +686,16 @@
<version>${wso2tracer.version}</version>
</dependency>
+
<!-- Axis2 Jars -->
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2</artifactId>
- <version>${axis2.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-clustering</artifactId>
- <version>${axis2.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.axis2</groupId>
@@ -518,10 +703,21 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mtompolicy</artifactId>
- <version>${axis2.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-spring</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.axis2</groupId>
@@ -533,25 +729,70 @@
<!-- Rampart Jars/Mars -->
<dependency>
<groupId>org.apache.rampart</groupId>
- <artifactId>rampart-core</artifactId>
- <version>${rampart.version}</version>
+ <artifactId>rampart-policy</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mtompolicy</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>httpcomponents-httpcore</groupId>
+ <artifactId>jakarta-httpcore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
- <artifactId>rampart</artifactId>
- <version>${rampart.version}</version>
- <type>mar</type>
+ <artifactId>rampart-trust</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mtompolicy</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>httpcomponents-httpcore</groupId>
+ <artifactId>jakarta-httpcore</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
- <artifactId>rampart-policy</artifactId>
- <version>${rampart.version}</version>
+ <artifactId>rampart-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mtompolicy</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>httpcomponents-httpcore</groupId>
+ <artifactId>jakarta-httpcore</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+
<dependency>
<groupId>org.apache.rampart</groupId>
- <artifactId>rampart-trust</artifactId>
+ <artifactId>rampart</artifactId>
<version>${rampart.version}</version>
+ <type>mar</type>
</dependency>
+
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rahas</artifactId>
@@ -559,17 +800,7 @@
<type>mar</type>
</dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-spring</artifactId>
- <version>${axis2.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+
<!-- Spring Jars has been included due to a dependency problem shown in some systems-->
<dependency>
<groupId>org.springframework</groupId>
@@ -597,17 +828,14 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>${axiom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>${axiom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-dom</artifactId>
- <version>${axiom.version}</version>
</dependency>
<dependency>
@@ -620,28 +848,12 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>${commons.httpclient.version}</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>commons-discovery</groupId>
<artifactId>commons-discovery</artifactId>
<version>${commons.discovery.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -660,10 +872,10 @@
<artifactId>derby</artifactId>
<version>${derby.version}</version>
</dependency>
+
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
- <version>${hibernate.version}</version>
<exclusions>
<exclusion>
<groupId>javax.transaction</groupId>
@@ -671,6 +883,7 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -687,10 +900,10 @@
<artifactId>wsdl4j</artifactId>
<version>${wsdl4j.version}</version>
</dependency>
+
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>${javamail.version}</version>
</dependency>
<dependency>
@@ -698,10 +911,10 @@
<artifactId>xbean</artifactId>
<version>${xbean.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
- <version>${wss4j.version}</version>
<exclusions>
<exclusion>
<groupId>axis</groupId>
@@ -715,6 +928,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>xml-security</groupId>
<artifactId>xmlsec</artifactId>
<version>${xmlsec.version}</version>
@@ -770,11 +988,7 @@
<version>${annogen.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>${ant.version}</version>
- </dependency>
+
<dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
@@ -1018,7 +1232,8 @@
<axiom.version>SNAPSHOT</axiom.version>
<addressing.version>SNAPSHOT</addressing.version>
<rampart.version>SNAPSHOT</rampart.version>
- <sandesha2.version>SNAPSHOT</sandesha2.version>
+ <!-- TODO Sandesha2 1.1 has given as follows due to dependency resolution problem. Will Fix it-->
+ <sandesha2.version>1.1</sandesha2.version>
<XmlSchema.version>SNAPSHOT</XmlSchema.version>
<neethi.version>SNAPSHOT</neethi.version>
<woden.version>1.0-incubating-SNAPSHOT</woden.version>
@@ -1033,7 +1248,6 @@
<jaxen.version>1.1-beta-10</jaxen.version>
-
<xmlsec.version>1.3.0</xmlsec.version>
<bcprov.jdk13.version>132</bcprov.jdk13.version>
@@ -1048,7 +1262,7 @@
<xmlunit.version>1.0</xmlunit.version>
<log4j.version>1.2.13</log4j.version>
- <jakarta.httpcore.version>4.0-alpha3</jakarta.httpcore.version>
+ <jakarta.httpcore.version>4.0-alpha4</jakarta.httpcore.version>
<commons.discovery.version>0.2</commons.discovery.version>
<commons.collections.version>3.1</commons.collections.version>
More information about the Wsas-java-dev
mailing list