Author: jsdelfino
Date: Fri Sep 14 03:36:29 2007
New Revision: 575610
URL: http://svn.apache.org/viewvc?rev=575610&view=rev
Log:
Bring up Tuscany on top of WebSphere 6.1. Accomodate for behavior differences
in HttpServletRequest.getServletPath() and getPathInfo(). Tolerate errors
creating SchemaFactories on older 1.5 JDK. The core and Java runtime as well as
WS bindings should now work with these fixes. Also adjusted the
calculator-webapp sample to use the new TuscanyServletFilter instead of the
deprecated TuscanyContextListener.
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/pom.xml
incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
incubator/tuscany/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
Modified: incubator/tuscany/java/sca/modules/assembly-xml/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/pom.xml?rev=575610&r1=575609&r2=575610&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/pom.xml Fri Sep 14 03:36:29
2007
@@ -88,6 +88,12 @@
</dependency>
<dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.0</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-assembly-xsd</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml?rev=575610&r1=575609&r2=575610&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml Fri Sep 14
03:36:29 2007
@@ -231,7 +231,7 @@
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.6.0</version>
+ <version>2.7.0</version>
</dependency>
<dependency>
Modified:
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java?rev=575610&r1=575609&r2=575610&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
(original)
+++
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
Fri Sep 14 03:36:29 2007
@@ -51,6 +51,10 @@
public ValidatingXMLStreamReader(XMLStreamReader reader, Schema schema)
throws XMLStreamException {
super(reader);
+ if (schema == null) {
+ return;
+ }
+
handler = schema.newValidatorHandler();
handler.setDocumentLocator(new LocatorAdaptor());
try {
@@ -64,23 +68,26 @@
// get the metadata we need from the document
handler.setErrorHandler(new ErrorHandler() {
public void error(SAXParseException exception) throws SAXException
{
- logger.warning(exception.getMessage());
+ //logger.warning(exception.getMessage());
}
public void fatalError(SAXParseException exception) throws
SAXException {
- logger.warning(exception.getMessage());
+ //logger.warning(exception.getMessage());
}
public void warning(SAXParseException exception) throws
SAXException {
- logger.warning(exception.getMessage());
+ //logger.warning(exception.getMessage());
}
});
}
@Override
public int next() throws XMLStreamException {
+ if (handler == null) {
+ return super.next();
+ }
+
int event = super.next();
-
try {
switch (event) {
case XMLStreamConstants.START_DOCUMENT:
@@ -113,9 +120,12 @@
@Override
public int nextTag() throws XMLStreamException {
- int event;
+ if (handler == null) {
+ return super.nextTag();
+ }
+
for (;;) {
- event = super.getEventType();
+ int event = super.getEventType();
try {
switch (event) {
case XMLStreamConstants.START_DOCUMENT:
Modified:
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java?rev=575610&r1=575609&r2=575610&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
(original)
+++
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
Fri Sep 14 03:36:29 2007
@@ -87,7 +87,6 @@
import org.apache.tuscany.sca.runtime.RuntimeWireProcessor;
import org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint;
import org.apache.tuscany.sca.work.WorkScheduler;
-import org.xml.sax.SAXException;
public class ReallySmallRuntimeBuilder {
@@ -191,12 +190,14 @@
registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
// Load the Assembly XSD, used for validation
- SchemaFactory schemaFactory =
SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
- Schema schema;
+ Schema schema = null;
try {
+ SchemaFactory schemaFactory =
SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
schema =
schemaFactory.newSchema(ReallySmallRuntimeBuilder.class.getClassLoader().getResource("tuscany-sca.xsd"));
- } catch (SAXException e) {
- throw new ActivationException(e);
+ } catch (Error e) {
+ //FIXME Log this
+ } catch (Exception e) {
+ //FIXME Log this
}
// Create and register document processors for SCA assembly XML
Modified:
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java?rev=575610&r1=575609&r2=575610&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
(original)
+++
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
Fri Sep 14 03:36:29 2007
@@ -38,6 +38,7 @@
*/
public class TuscanyServletFilter implements Filter {
private static final long serialVersionUID = 1L;
+ //private static final Logger logger =
Logger.getLogger(WebAppServletHost.class.getName());
private WebAppServletHost servletHost;
@@ -70,7 +71,11 @@
public void doFilter(ServletRequest request, ServletResponse response,
javax.servlet.FilterChain chain) throws IOException ,ServletException {
// Get the servlet path
- String path = ((HttpServletRequest)request).getServletPath();
+ HttpServletRequest httpRequest = (HttpServletRequest)request;
+ String path = httpRequest.getPathInfo();
+ if (path == null) {
+ path = httpRequest.getServletPath();
+ }
if (path == null) {
path = "/";
}
Modified:
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java?rev=575610&r1=575609&r2=575610&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
(original)
+++
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
Fri Sep 14 03:36:29 2007
@@ -36,7 +36,6 @@
import javax.servlet.ServletException;
import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.http.DefaultResourceServlet;
import org.apache.tuscany.sca.host.http.ServletHost;
import org.apache.tuscany.sca.host.http.ServletMappingException;
Modified:
incubator/tuscany/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml?rev=575610&r1=575609&r2=575610&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
(original)
+++
incubator/tuscany/java/sca/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
Fri Sep 14 03:36:29 2007
@@ -24,10 +24,16 @@
<display-name>Tuscany Calculator Web Service Sample</display-name>
- <listener>
-
<listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
- </listener>
-
+ <filter>
+ <filter-name>tuscany</filter-name>
+
<filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>tuscany</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
<welcome-file-list id="WelcomeFileList">
<welcome-file>calc.jsp</welcome-file>
</welcome-file-list>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
