[jboss-svn-commits] JBL Code SVN: r21290 - in labs/jbossesb/workspace/dbevenius/security: product and 15 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jul 30 02:39:42 EDT 2008
Author: beve
Date: 2008-07-30 02:39:41 -0400 (Wed, 30 Jul 2008)
New Revision: 21290
Added:
labs/jbossesb/workspace/dbevenius/security/product/lib/ext/antlr-2.7.7.jar
labs/jbossesb/workspace/dbevenius/security/product/lib/ext/stringtemplate-3.2.jar
labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/SessionExecutorInit.java
labs/jbossesb/workspace/dbevenius/security/product/services/soap/lib/ext/jcip-annotations.jar
labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/
labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletRequest.java
labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletResponse.java
labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletContext.java
labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletInputStream.java
labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletOutputStream.java
labs/jbossesb/workspace/dbevenius/security/testlib/
labs/jbossesb/workspace/dbevenius/security/testlib/emma.jar
labs/jbossesb/workspace/dbevenius/security/testlib/emma_ant.jar
labs/jbossesb/workspace/dbevenius/security/testlib/hsqldb.jar
labs/jbossesb/workspace/dbevenius/security/testlib/jakarta-oro-2.0.8.jar
labs/jbossesb/workspace/dbevenius/security/testlib/jboss-jaxb-intros.jar
labs/jbossesb/workspace/dbevenius/security/testlib/jboss-remoting.jar
labs/jbossesb/workspace/dbevenius/security/testlib/jbossweb.jar
labs/jbossesb/workspace/dbevenius/security/testlib/junit-4.1.jar
labs/jbossesb/workspace/dbevenius/security/testlib/mockejb.jar
labs/jbossesb/workspace/dbevenius/security/testlib/opencsv-1.6.jar
labs/jbossesb/workspace/dbevenius/security/testlib/properties-plugin.jar
labs/jbossesb/workspace/dbevenius/security/testlib/wsdl4j-1.6.2.jar
labs/jbossesb/workspace/dbevenius/security/testlib/xalan-2.7.0.jar
Removed:
labs/jbossesb/workspace/dbevenius/security/product/lib/ext/antlr-2.7.6.jar
labs/jbossesb/workspace/dbevenius/security/product/lib/ext/antlr-3.0b7.jar
labs/jbossesb/workspace/dbevenius/security/product/lib/ext/emma.jar
labs/jbossesb/workspace/dbevenius/security/product/lib/ext/emma_ant.jar
labs/jbossesb/workspace/dbevenius/security/product/lib/ext/hsqldb.jar
labs/jbossesb/workspace/dbevenius/security/product/lib/ext/jakarta-oro-2.0.8.jar
labs/jbossesb/workspace/dbevenius/security/product/lib/ext/jboss-jaxb-intros.jar
labs/jbossesb/workspace/dbevenius/security/product/lib/ext/jboss-remoting.jar
labs/jbossesb/workspace/dbevenius/security/product/lib/ext/jbossweb.jar
labs/jbossesb/workspace/dbevenius/security/product/lib/ext/junit-4.1.jar
labs/jbossesb/workspace/dbevenius/security/product/lib/ext/mockejb.jar
labs/jbossesb/workspace/dbevenius/security/product/lib/ext/opencsv-1.6.jar
labs/jbossesb/workspace/dbevenius/security/product/lib/ext/properties-plugin.jar
labs/jbossesb/workspace/dbevenius/security/product/lib/ext/stringtemplate-3.0.jar
labs/jbossesb/workspace/dbevenius/security/product/lib/ext/wsdl4j-1.6.2.jar
labs/jbossesb/workspace/dbevenius/security/product/lib/ext/xalan-2.7.0.jar
labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletRequest.java
labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletResponse.java
labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletContext.java
labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletInputStream.java
labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletOutputStream.java
labs/jbossesb/workspace/dbevenius/security/testlib/emma.jar
labs/jbossesb/workspace/dbevenius/security/testlib/emma_ant.jar
labs/jbossesb/workspace/dbevenius/security/testlib/hsqldb.jar
labs/jbossesb/workspace/dbevenius/security/testlib/jakarta-oro-2.0.8.jar
labs/jbossesb/workspace/dbevenius/security/testlib/jboss-jaxb-intros.jar
labs/jbossesb/workspace/dbevenius/security/testlib/jboss-remoting.jar
labs/jbossesb/workspace/dbevenius/security/testlib/jbossweb.jar
labs/jbossesb/workspace/dbevenius/security/testlib/junit-4.1.jar
labs/jbossesb/workspace/dbevenius/security/testlib/mockejb.jar
labs/jbossesb/workspace/dbevenius/security/testlib/opencsv-1.6.jar
labs/jbossesb/workspace/dbevenius/security/testlib/properties-plugin.jar
labs/jbossesb/workspace/dbevenius/security/testlib/wsdl4j-1.6.2.jar
labs/jbossesb/workspace/dbevenius/security/testlib/xalan-2.7.0.jar
Modified:
labs/jbossesb/workspace/dbevenius/security/
labs/jbossesb/workspace/dbevenius/security/product/build.xml
labs/jbossesb/workspace/dbevenius/security/product/rosetta/build.xml
labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/internal/soa/esb/remoting/HttpUnmarshaller.java
labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsSession.java
labs/jbossesb/workspace/dbevenius/security/product/rosetta/tests/build.xml
labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/db.lck
labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/db.log
labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/db.properties
labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/db.script
labs/jbossesb/workspace/dbevenius/security/product/services/base-project-build.xml
labs/jbossesb/workspace/dbevenius/security/product/services/jbpm/ant-task/build.xml
labs/jbossesb/workspace/dbevenius/security/product/services/soap/base-project-build.xml
labs/jbossesb/workspace/dbevenius/security/product/services/soap/lib/ext/Wise-core.jar
labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPProcessor.java
labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SOAPClient.java
labs/jbossesb/workspace/dbevenius/security/product/services/soapui-client/build.xml
Log:
merge from main
Property changes on: labs/jbossesb/workspace/dbevenius/security
___________________________________________________________________
Name: svnmerge-integrated
- /labs/jbossesb/trunk:1-21222
+ /labs/jbossesb/trunk:1-21285
Modified: labs/jbossesb/workspace/dbevenius/security/product/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/build.xml 2008-07-30 04:40:20 UTC (rev 21289)
+++ labs/jbossesb/workspace/dbevenius/security/product/build.xml 2008-07-30 06:39:41 UTC (rev 21290)
@@ -87,7 +87,7 @@
<property name="org.jboss.esb.internal.javadocs.dest" location="javadocs"/>
<property name="org.jboss.esb.internal.samples.javadocs.dest" location="samples/javadocs"/>
- <property name="junit.jar" location="lib/ext/junit-4.1.jar"/>
+ <property name="junit.jar" location="../testlib/junit-4.1.jar"/>
<macrodef name="runant">
<attribute name="target"/>
<attribute name="failonerror" default="true"/>
@@ -110,7 +110,7 @@
</macrodef>
<path id="emma.libs">
- <fileset dir="lib/ext" includes="emma*.jar"/>
+ <fileset dir="../testlib" includes="emma*.jar"/>
</path>
<taskdef resource="emma_ant.properties" classpathref="emma.libs" />
Deleted: labs/jbossesb/workspace/dbevenius/security/product/lib/ext/antlr-2.7.6.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/security/product/lib/ext/antlr-2.7.7.jar (from rev 21257, labs/jbossesb/trunk/product/lib/ext/antlr-2.7.7.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/product/lib/ext/antlr-3.0b7.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/product/lib/ext/emma.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/product/lib/ext/emma_ant.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/product/lib/ext/hsqldb.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/product/lib/ext/jakarta-oro-2.0.8.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/product/lib/ext/jboss-jaxb-intros.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/product/lib/ext/jboss-remoting.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/product/lib/ext/jbossweb.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/product/lib/ext/junit-4.1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/product/lib/ext/mockejb.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/product/lib/ext/opencsv-1.6.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/product/lib/ext/properties-plugin.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/product/lib/ext/stringtemplate-3.0.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/security/product/lib/ext/stringtemplate-3.2.jar (from rev 21257, labs/jbossesb/trunk/product/lib/ext/stringtemplate-3.2.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/product/lib/ext/wsdl4j-1.6.2.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/product/lib/ext/xalan-2.7.0.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/security/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/rosetta/build.xml 2008-07-30 04:40:20 UTC (rev 21289)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/build.xml 2008-07-30 06:39:41 UTC (rev 21290)
@@ -14,6 +14,7 @@
<path id="org.jboss.esb.rosetta.base.classpath">
<fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
+ <fileset dir="../../testlib" includes="emma*.jar"/>
<fileset dir="${org.jboss.esb.ext.lib.dir}/standalone" includes="*.jar"/>
<pathelement location="${gendir}/classes"/>
</path>
Modified: labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/internal/soa/esb/remoting/HttpUnmarshaller.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/internal/soa/esb/remoting/HttpUnmarshaller.java 2008-07-30 04:40:20 UTC (rev 21289)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/internal/soa/esb/remoting/HttpUnmarshaller.java 2008-07-30 06:39:41 UTC (rev 21290)
@@ -116,6 +116,26 @@
//boolean isError = isErrorReturn(metadata);
//if(isBinary || isError)
+ if (metadata != null) {
+ Object value = metadata.get("Content-Type");
+ if (value == null) {
+ value = metadata.get("content-type");
+ }
+ if (value != null) {
+ if (value instanceof List) {
+ List valueList = (List) value;
+ if (valueList != null && valueList.size() > 0) {
+ value = valueList.get(0);
+ }
+ }
+ final String contentType = (String)value ;
+ if (contentType.startsWith("multipart/"))
+ {
+ return totalByteArray ;
+ }
+ }
+ }
+
try {
ret = new String(totalByteArray);
}
Modified: labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsSession.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsSession.java 2008-07-30 04:40:20 UTC (rev 21289)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsSession.java 2008-07-30 06:39:41 UTC (rev 21290)
@@ -82,6 +82,11 @@
{
this.id = id ;
this.session = session ;
+ // Workaround for JBESB-1873
+ if ("org.jboss.jms.client.JBossSession".equals(session.getClass().getName()))
+ {
+ SessionExecutorInit.initExecutor(session) ;
+ }
}
public long getId()
Copied: labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/SessionExecutorInit.java (from rev 21257, labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/SessionExecutorInit.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/SessionExecutorInit.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/SessionExecutorInit.java 2008-07-30 06:39:41 UTC (rev 21290)
@@ -0,0 +1,70 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.internal.soa.esb.rosetta.pooling;
+
+import javax.jms.Session;
+
+import org.jboss.jms.client.JBossSession;
+import org.jboss.jms.client.delegate.ClientSessionDelegate;
+import org.jboss.jms.client.state.HierarchicalState;
+import org.jboss.jms.client.state.SessionState;
+import org.jboss.jms.delegate.SessionDelegate;
+
+
+/**
+ * Force executor initialisation for JBossSession.
+ */
+public class SessionExecutorInit
+{
+ /**
+ * This method uses internal knowledge of the JBoss Messaging version
+ * used within the project. It initialises the thread used in the internal
+ * QueuedExecutor so that it is created as a daemon thread instead of a normal
+ * application thread.
+ *
+ * JBESB-1873
+ *
+ * @param session The created session to check.
+ */
+ public static void initExecutor(final Session session)
+ {
+ try
+ {
+ if (session instanceof JBossSession)
+ {
+ final JBossSession jbossSession = (JBossSession)session ;
+ final SessionDelegate sessionDelegate = jbossSession.getDelegate() ;
+ if (sessionDelegate instanceof ClientSessionDelegate)
+ {
+ final ClientSessionDelegate clientSessionDelegate = (ClientSessionDelegate)sessionDelegate ;
+ final HierarchicalState state = clientSessionDelegate.getState() ;
+ if (state instanceof SessionState)
+ {
+ final SessionState sessionState = (SessionState)state ;
+ sessionState.getExecutor().restart() ;
+ }
+ }
+ }
+ }
+ catch (final Throwable th) {} // Hide all errors
+ }
+}
Modified: labs/jbossesb/workspace/dbevenius/security/product/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/rosetta/tests/build.xml 2008-07-30 04:40:20 UTC (rev 21289)
+++ labs/jbossesb/workspace/dbevenius/security/product/rosetta/tests/build.xml 2008-07-30 06:39:41 UTC (rev 21290)
@@ -25,6 +25,7 @@
<path id="org.jboss.esb.tests.base.classpath">
<fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
+ <fileset dir="${org.jboss.esb.root.dir}/../testlib" includes="*.jar"/>
<fileset dir="${org.jboss.esb.ftp.lib.dir}" includes="*.jar"/>
<pathelement location="${org.jboss.esb.module.classes.root.dir}/rosetta"/>
<pathelement location="${gendir}/classes"/>
Modified: labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/db.lck
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/db.lck 2008-07-30 04:40:20 UTC (rev 21289)
+++ labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/db.lck 2008-07-30 06:39:41 UTC (rev 21290)
@@ -1 +1 @@
-HSQLLOCK
\ No newline at end of file
+HSQLLOCK
\ No newline at end of file
Modified: labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/db.log
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/db.log 2008-07-30 04:40:20 UTC (rev 21289)
+++ labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/db.log 2008-07-30 06:39:41 UTC (rev 21290)
@@ -1,52 +1,4 @@
-/*C23*/SET SCHEMA PUBLIC
+/*C3*/SET SCHEMA PUBLIC
CONNECT USER SA
-DELETE FROM ORDERS WHERE ORDERID='1213712709484-FL-DLH-02' AND USERID='ACID' AND ORDERDATE='2006-11-15' AND SHIPADDR1='901 San Antonio Road' AND SHIPADDR2='MS UCUP02-206' AND SHIPCITY='Palo Alto' AND SHIPSTATE='CA' AND SHIPZIP='30253' AND SHIPCOUNTRY='USA' AND BILLADDR1='901 San Antonio Road' AND BILLADDR2='MS UCUP02-206' AND BILLCITY='Palo Alto' AND BILLSTATE='CA' AND BILLZIP='30253' AND BILLCOUNTRY='USA' AND COURIER='UPS' AND TOTALPRICE=22.23 AND BILLTOFIRSTNAME='ACID' AND BILLTOLASTNAME='Pets' AND SHIPTOFIRSTNAME='ACID' AND SHIPTOLASTNAME='Pets' AND CREDITCARD='999 9999 9999 9999' AND EXPRDATE='12/03' AND CARDTYPE='Visa' AND LOCALE='CA'
-DELETE FROM ORDERS WHERE ORDERID='1213712709484-FI-FW-02' AND USERID='ACID' AND ORDERDATE='2006-11-15' AND SHIPADDR1='901 San Antonio Road' AND SHIPADDR2='MS UCUP02-206' AND SHIPCITY='Palo Alto' AND SHIPSTATE='CA' AND SHIPZIP='30253' AND SHIPCOUNTRY='USA' AND BILLADDR1='901 San Antonio Road' AND BILLADDR2='MS UCUP02-206' AND BILLCITY='Palo Alto' AND BILLSTATE='CA' AND BILLZIP='30253' AND BILLCOUNTRY='USA' AND COURIER='UPS' AND TOTALPRICE=22.23 AND BILLTOFIRSTNAME='ACID' AND BILLTOLASTNAME='Pets' AND SHIPTOFIRSTNAME='ACID' AND SHIPTOLASTNAME='Pets' AND CREDITCARD='999 9999 9999 9999' AND EXPRDATE='12/03' AND CARDTYPE='Visa' AND LOCALE='CA'
-DELETE FROM ORDERS WHERE ORDERID='1213712709484-K9-DL-01' AND USERID='ACID' AND ORDERDATE='2006-11-15' AND SHIPADDR1='901 San Antonio Road' AND SHIPADDR2='MS UCUP02-206' AND SHIPCITY='Palo Alto' AND SHIPSTATE='CA' AND SHIPZIP='30253' AND SHIPCOUNTRY='USA' AND BILLADDR1='901 San Antonio Road' AND BILLADDR2='MS UCUP02-206' AND BILLCITY='Palo Alto' AND BILLSTATE='CA' AND BILLZIP='30253' AND BILLCOUNTRY='USA' AND COURIER='UPS' AND TOTALPRICE=22.23 AND BILLTOFIRSTNAME='ACID' AND BILLTOLASTNAME='Pets' AND SHIPTOFIRSTNAME='ACID' AND SHIPTOLASTNAME='Pets' AND CREDITCARD='999 9999 9999 9999' AND EXPRDATE='12/03' AND CARDTYPE='Visa' AND LOCALE='CA'
-DELETE FROM ORDERS WHERE ORDERID='1213712709484-K9-CW-01' AND USERID='ACID' AND ORDERDATE='2006-11-15' AND SHIPADDR1='901 San Antonio Road' AND SHIPADDR2='MS UCUP02-206' AND SHIPCITY='Palo Alto' AND SHIPSTATE='CA' AND SHIPZIP='30253' AND SHIPCOUNTRY='USA' AND BILLADDR1='901 San Antonio Road' AND BILLADDR2='MS UCUP02-206' AND BILLCITY='Palo Alto' AND BILLSTATE='CA' AND BILLZIP='30253' AND BILLCOUNTRY='USA' AND COURIER='UPS' AND TOTALPRICE=22.23 AND BILLTOFIRSTNAME='ACID' AND BILLTOLASTNAME='Pets' AND SHIPTOFIRSTNAME='ACID' AND SHIPTOLASTNAME='Pets' AND CREDITCARD='999 9999 9999 9999' AND EXPRDATE='12/03' AND CARDTYPE='Visa' AND LOCALE='CA'
-DELETE FROM ORDERS WHERE ORDERID='1213712709484-RP-SN-01' AND USERID='ACID' AND ORDERDATE='2006-11-15' AND SHIPADDR1='901 San Antonio Road' AND SHIPADDR2='MS UCUP02-206' AND SHIPCITY='Palo Alto' AND SHIPSTATE='CA' AND SHIPZIP='30253' AND SHIPCOUNTRY='USA' AND BILLADDR1='901 San Antonio Road' AND BILLADDR2='MS UCUP02-206' AND BILLCITY='Palo Alto' AND BILLSTATE='CA' AND BILLZIP='30253' AND BILLCOUNTRY='USA' AND COURIER='UPS' AND TOTALPRICE=22.23 AND BILLTOFIRSTNAME='ACID' AND BILLTOLASTNAME='Pets' AND SHIPTOFIRSTNAME='ACID' AND SHIPTOLASTNAME='Pets' AND CREDITCARD='999 9999 9999 9999' AND EXPRDATE='12/03' AND CARDTYPE='Visa' AND LOCALE='CA'
-DELETE FROM ORDERS WHERE ORDERID='1213712709484-FI-SW-01' AND USERID='ACID' AND ORDERDATE='2006-11-15' AND SHIPADDR1='901 San Antonio Road' AND SHIPADDR2='MS UCUP02-206' AND SHIPCITY='Palo Alto' AND SHIPSTATE='CA' AND SHIPZIP='30253' AND SHIPCOUNTRY='USA' AND BILLADDR1='901 San Antonio Road' AND BILLADDR2='MS UCUP02-206' AND BILLCITY='Palo Alto' AND BILLSTATE='CA' AND BILLZIP='30253' AND BILLCOUNTRY='USA' AND COURIER='UPS' AND TOTALPRICE=22.23 AND BILLTOFIRSTNAME='ACID' AND BILLTOLASTNAME='Pets' AND SHIPTOFIRSTNAME='ACID' AND SHIPTOLASTNAME='Pets' AND CREDITCARD='999 9999 9999 9999' AND EXPRDATE='12/03' AND CARDTYPE='Visa' AND LOCALE='CA'
-DELETE FROM ORDERS WHERE ORDERID='1213712709484-K9-RT-02' AND USERID='ACID' AND ORDERDATE='2006-11-15' AND SHIPADDR1='901 San Antonio Road' AND SHIPADDR2='MS UCUP02-206' AND SHIPCITY='Palo Alto' AND SHIPSTATE='CA' AND SHIPZIP='30253' AND SHIPCOUNTRY='USA' AND BILLADDR1='901 San Antonio Road' AND BILLADDR2='MS UCUP02-206' AND BILLCITY='Palo Alto' AND BILLSTATE='CA' AND BILLZIP='30253' AND BILLCOUNTRY='USA' AND COURIER='UPS' AND TOTALPRICE=22.23 AND BILLTOFIRSTNAME='ACID' AND BILLTOLASTNAME='Pets' AND SHIPTOFIRSTNAME='ACID' AND SHIPTOLASTNAME='Pets' AND CREDITCARD='999 9999 9999 9999' AND EXPRDATE='12/03' AND CARDTYPE='Visa' AND LOCALE='CA'
-DELETE FROM ORDERS WHERE ORDERID='1213712709484-K9-RT-02' AND USERID='ACID' AND ORDERDATE='2006-11-15' AND SHIPADDR1='901 San Antonio Road' AND SHIPADDR2='MS UCUP02-206' AND SHIPCITY='Palo Alto' AND SHIPSTATE='CA' AND SHIPZIP='30253' AND SHIPCOUNTRY='USA' AND BILLADDR1='901 San Antonio Road' AND BILLADDR2='MS UCUP02-206' AND BILLCITY='Palo Alto' AND BILLSTATE='CA' AND BILLZIP='30253' AND BILLCOUNTRY='USA' AND COURIER='UPS' AND TOTALPRICE=22.23 AND BILLTOFIRSTNAME='ACID' AND BILLTOLASTNAME='Pets' AND SHIPTOFIRSTNAME='ACID' AND SHIPTOLASTNAME='Pets' AND CREDITCARD='999 9999 9999 9999' AND EXPRDATE='12/03' AND CARDTYPE='Visa' AND LOCALE='CA'
-DELETE FROM ORDERS WHERE ORDERID='1213712709484-K9-PO-02' AND USERID='ACID' AND ORDERDATE='2006-11-15' AND SHIPADDR1='901 San Antonio Road' AND SHIPADDR2='MS UCUP02-206' AND SHIPCITY='Palo Alto' AND SHIPSTATE='CA' AND SHIPZIP='30253' AND SHIPCOUNTRY='USA' AND BILLADDR1='901 San Antonio Road' AND BILLADDR2='MS UCUP02-206' AND BILLCITY='Palo Alto' AND BILLSTATE='CA' AND BILLZIP='30253' AND BILLCOUNTRY='USA' AND COURIER='UPS' AND TOTALPRICE=22.23 AND BILLTOFIRSTNAME='ACID' AND BILLTOLASTNAME='Pets' AND SHIPTOFIRSTNAME='ACID' AND SHIPTOLASTNAME='Pets' AND CREDITCARD='999 9999 9999 9999' AND EXPRDATE='12/03' AND CARDTYPE='Visa' AND LOCALE='CA'
-DELETE FROM ORDERS WHERE ORDERID='1213712709484-RP-SN-01' AND USERID='ACID' AND ORDERDATE='2006-11-15' AND SHIPADDR1='901 San Antonio Road' AND SHIPADDR2='MS UCUP02-206' AND SHIPCITY='Palo Alto' AND SHIPSTATE='CA' AND SHIPZIP='30253' AND SHIPCOUNTRY='USA' AND BILLADDR1='901 San Antonio Road' AND BILLADDR2='MS UCUP02-206' AND BILLCITY='Palo Alto' AND BILLSTATE='CA' AND BILLZIP='30253' AND BILLCOUNTRY='USA' AND COURIER='UPS' AND TOTALPRICE=22.23 AND BILLTOFIRSTNAME='ACID' AND BILLTOLASTNAME='Pets' AND SHIPTOFIRSTNAME='ACID' AND SHIPTOLASTNAME='Pets' AND CREDITCARD='999 9999 9999 9999' AND EXPRDATE='12/03' AND CARDTYPE='Visa' AND LOCALE='CA'
-/*C24*/SET SCHEMA PUBLIC
-CONNECT USER SA
SET AUTOCOMMIT FALSE
-INSERT INTO ORDERS VALUES('1213739454593-AV-CB-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213739454593-K9-BD-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213739454593-FI-FW-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213739454593-RP-LI-02','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213739454593-K9-CW-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213739454593-AV-CB-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213739454593-AV-CB-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213739454593-FI-SW-02','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213739454593-RP-SN-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213739454593-RP-LI-02','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-COMMIT
DISCONNECT
-/*C23*/DELETE FROM ORDERS WHERE ORDERID='1213739454593-AV-CB-01' AND USERID='ACID' AND ORDERDATE='2006-11-15' AND SHIPADDR1='901 San Antonio Road' AND SHIPADDR2='MS UCUP02-206' AND SHIPCITY='Palo Alto' AND SHIPSTATE='CA' AND SHIPZIP='30253' AND SHIPCOUNTRY='USA' AND BILLADDR1='901 San Antonio Road' AND BILLADDR2='MS UCUP02-206' AND BILLCITY='Palo Alto' AND BILLSTATE='CA' AND BILLZIP='30253' AND BILLCOUNTRY='USA' AND COURIER='UPS' AND TOTALPRICE=22.23 AND BILLTOFIRSTNAME='ACID' AND BILLTOLASTNAME='Pets' AND SHIPTOFIRSTNAME='ACID' AND SHIPTOLASTNAME='Pets' AND CREDITCARD='999 9999 9999 9999' AND EXPRDATE='12/03' AND CARDTYPE='Visa' AND LOCALE='CA'
-DELETE FROM ORDERS WHERE ORDERID='1213739454593-K9-BD-01' AND USERID='ACID' AND ORDERDATE='2006-11-15' AND SHIPADDR1='901 San Antonio Road' AND SHIPADDR2='MS UCUP02-206' AND SHIPCITY='Palo Alto' AND SHIPSTATE='CA' AND SHIPZIP='30253' AND SHIPCOUNTRY='USA' AND BILLADDR1='901 San Antonio Road' AND BILLADDR2='MS UCUP02-206' AND BILLCITY='Palo Alto' AND BILLSTATE='CA' AND BILLZIP='30253' AND BILLCOUNTRY='USA' AND COURIER='UPS' AND TOTALPRICE=22.23 AND BILLTOFIRSTNAME='ACID' AND BILLTOLASTNAME='Pets' AND SHIPTOFIRSTNAME='ACID' AND SHIPTOLASTNAME='Pets' AND CREDITCARD='999 9999 9999 9999' AND EXPRDATE='12/03' AND CARDTYPE='Visa' AND LOCALE='CA'
-DELETE FROM ORDERS WHERE ORDERID='1213739454593-FI-FW-01' AND USERID='ACID' AND ORDERDATE='2006-11-15' AND SHIPADDR1='901 San Antonio Road' AND SHIPADDR2='MS UCUP02-206' AND SHIPCITY='Palo Alto' AND SHIPSTATE='CA' AND SHIPZIP='30253' AND SHIPCOUNTRY='USA' AND BILLADDR1='901 San Antonio Road' AND BILLADDR2='MS UCUP02-206' AND BILLCITY='Palo Alto' AND BILLSTATE='CA' AND BILLZIP='30253' AND BILLCOUNTRY='USA' AND COURIER='UPS' AND TOTALPRICE=22.23 AND BILLTOFIRSTNAME='ACID' AND BILLTOLASTNAME='Pets' AND SHIPTOFIRSTNAME='ACID' AND SHIPTOLASTNAME='Pets' AND CREDITCARD='999 9999 9999 9999' AND EXPRDATE='12/03' AND CARDTYPE='Visa' AND LOCALE='CA'
-DELETE FROM ORDERS WHERE ORDERID='1213739454593-RP-LI-02' AND USERID='ACID' AND ORDERDATE='2006-11-15' AND SHIPADDR1='901 San Antonio Road' AND SHIPADDR2='MS UCUP02-206' AND SHIPCITY='Palo Alto' AND SHIPSTATE='CA' AND SHIPZIP='30253' AND SHIPCOUNTRY='USA' AND BILLADDR1='901 San Antonio Road' AND BILLADDR2='MS UCUP02-206' AND BILLCITY='Palo Alto' AND BILLSTATE='CA' AND BILLZIP='30253' AND BILLCOUNTRY='USA' AND COURIER='UPS' AND TOTALPRICE=22.23 AND BILLTOFIRSTNAME='ACID' AND BILLTOLASTNAME='Pets' AND SHIPTOFIRSTNAME='ACID' AND SHIPTOLASTNAME='Pets' AND CREDITCARD='999 9999 9999 9999' AND EXPRDATE='12/03' AND CARDTYPE='Visa' AND LOCALE='CA'
-DELETE FROM ORDERS WHERE ORDERID='1213739454593-K9-CW-01' AND USERID='ACID' AND ORDERDATE='2006-11-15' AND SHIPADDR1='901 San Antonio Road' AND SHIPADDR2='MS UCUP02-206' AND SHIPCITY='Palo Alto' AND SHIPSTATE='CA' AND SHIPZIP='30253' AND SHIPCOUNTRY='USA' AND BILLADDR1='901 San Antonio Road' AND BILLADDR2='MS UCUP02-206' AND BILLCITY='Palo Alto' AND BILLSTATE='CA' AND BILLZIP='30253' AND BILLCOUNTRY='USA' AND COURIER='UPS' AND TOTALPRICE=22.23 AND BILLTOFIRSTNAME='ACID' AND BILLTOLASTNAME='Pets' AND SHIPTOFIRSTNAME='ACID' AND SHIPTOLASTNAME='Pets' AND CREDITCARD='999 9999 9999 9999' AND EXPRDATE='12/03' AND CARDTYPE='Visa' AND LOCALE='CA'
-DELETE FROM ORDERS WHERE ORDERID='1213739454593-AV-CB-01' AND USERID='ACID' AND ORDERDATE='2006-11-15' AND SHIPADDR1='901 San Antonio Road' AND SHIPADDR2='MS UCUP02-206' AND SHIPCITY='Palo Alto' AND SHIPSTATE='CA' AND SHIPZIP='30253' AND SHIPCOUNTRY='USA' AND BILLADDR1='901 San Antonio Road' AND BILLADDR2='MS UCUP02-206' AND BILLCITY='Palo Alto' AND BILLSTATE='CA' AND BILLZIP='30253' AND BILLCOUNTRY='USA' AND COURIER='UPS' AND TOTALPRICE=22.23 AND BILLTOFIRSTNAME='ACID' AND BILLTOLASTNAME='Pets' AND SHIPTOFIRSTNAME='ACID' AND SHIPTOLASTNAME='Pets' AND CREDITCARD='999 9999 9999 9999' AND EXPRDATE='12/03' AND CARDTYPE='Visa' AND LOCALE='CA'
-DELETE FROM ORDERS WHERE ORDERID='1213739454593-AV-CB-01' AND USERID='ACID' AND ORDERDATE='2006-11-15' AND SHIPADDR1='901 San Antonio Road' AND SHIPADDR2='MS UCUP02-206' AND SHIPCITY='Palo Alto' AND SHIPSTATE='CA' AND SHIPZIP='30253' AND SHIPCOUNTRY='USA' AND BILLADDR1='901 San Antonio Road' AND BILLADDR2='MS UCUP02-206' AND BILLCITY='Palo Alto' AND BILLSTATE='CA' AND BILLZIP='30253' AND BILLCOUNTRY='USA' AND COURIER='UPS' AND TOTALPRICE=22.23 AND BILLTOFIRSTNAME='ACID' AND BILLTOLASTNAME='Pets' AND SHIPTOFIRSTNAME='ACID' AND SHIPTOLASTNAME='Pets' AND CREDITCARD='999 9999 9999 9999' AND EXPRDATE='12/03' AND CARDTYPE='Visa' AND LOCALE='CA'
-DELETE FROM ORDERS WHERE ORDERID='1213739454593-FI-SW-02' AND USERID='ACID' AND ORDERDATE='2006-11-15' AND SHIPADDR1='901 San Antonio Road' AND SHIPADDR2='MS UCUP02-206' AND SHIPCITY='Palo Alto' AND SHIPSTATE='CA' AND SHIPZIP='30253' AND SHIPCOUNTRY='USA' AND BILLADDR1='901 San Antonio Road' AND BILLADDR2='MS UCUP02-206' AND BILLCITY='Palo Alto' AND BILLSTATE='CA' AND BILLZIP='30253' AND BILLCOUNTRY='USA' AND COURIER='UPS' AND TOTALPRICE=22.23 AND BILLTOFIRSTNAME='ACID' AND BILLTOLASTNAME='Pets' AND SHIPTOFIRSTNAME='ACID' AND SHIPTOLASTNAME='Pets' AND CREDITCARD='999 9999 9999 9999' AND EXPRDATE='12/03' AND CARDTYPE='Visa' AND LOCALE='CA'
-DELETE FROM ORDERS WHERE ORDERID='1213739454593-RP-SN-01' AND USERID='ACID' AND ORDERDATE='2006-11-15' AND SHIPADDR1='901 San Antonio Road' AND SHIPADDR2='MS UCUP02-206' AND SHIPCITY='Palo Alto' AND SHIPSTATE='CA' AND SHIPZIP='30253' AND SHIPCOUNTRY='USA' AND BILLADDR1='901 San Antonio Road' AND BILLADDR2='MS UCUP02-206' AND BILLCITY='Palo Alto' AND BILLSTATE='CA' AND BILLZIP='30253' AND BILLCOUNTRY='USA' AND COURIER='UPS' AND TOTALPRICE=22.23 AND BILLTOFIRSTNAME='ACID' AND BILLTOLASTNAME='Pets' AND SHIPTOFIRSTNAME='ACID' AND SHIPTOLASTNAME='Pets' AND CREDITCARD='999 9999 9999 9999' AND EXPRDATE='12/03' AND CARDTYPE='Visa' AND LOCALE='CA'
-DELETE FROM ORDERS WHERE ORDERID='1213739454593-RP-LI-02' AND USERID='ACID' AND ORDERDATE='2006-11-15' AND SHIPADDR1='901 San Antonio Road' AND SHIPADDR2='MS UCUP02-206' AND SHIPCITY='Palo Alto' AND SHIPSTATE='CA' AND SHIPZIP='30253' AND SHIPCOUNTRY='USA' AND BILLADDR1='901 San Antonio Road' AND BILLADDR2='MS UCUP02-206' AND BILLCITY='Palo Alto' AND BILLSTATE='CA' AND BILLZIP='30253' AND BILLCOUNTRY='USA' AND COURIER='UPS' AND TOTALPRICE=22.23 AND BILLTOFIRSTNAME='ACID' AND BILLTOLASTNAME='Pets' AND SHIPTOFIRSTNAME='ACID' AND SHIPTOLASTNAME='Pets' AND CREDITCARD='999 9999 9999 9999' AND EXPRDATE='12/03' AND CARDTYPE='Visa' AND LOCALE='CA'
-/*C25*/SET SCHEMA PUBLIC
-CONNECT USER SA
-SET AUTOCOMMIT FALSE
-INSERT INTO ORDERS VALUES('1213739684328-FL-DLH-02','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213739684328-FL-DSH-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213739684328-FI-SW-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213739684328-RP-SN-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213739684328-K9-RT-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213739684328-AV-SB-02','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213739684328-K9-RT-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213739684328-RP-SN-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213739684328-RP-SN-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213739684328-K9-DL-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-COMMIT
-DISCONNECT
Modified: labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/db.properties
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/db.properties 2008-07-30 04:40:20 UTC (rev 21289)
+++ labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/db.properties 2008-07-30 06:39:41 UTC (rev 21290)
@@ -1,5 +1,5 @@
#HSQL Database Engine 1.8.0.8
-#Tue Jun 17 22:47:17 BST 2008
+#Tue Jul 22 13:31:24 BST 2008
hsqldb.script_format=0
runtime.gc_interval=0
sql.enforce_strict_size=false
Modified: labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/db.script
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/db.script 2008-07-30 04:40:20 UTC (rev 21289)
+++ labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/huge-split-enrich-transform-route/05_Database/db.script 2008-07-30 06:39:41 UTC (rev 21290)
@@ -32,16 +32,16 @@
INSERT INTO BANNERDATA VALUES('DOGS','<image src="../images/banner_dogs.gif">')
INSERT INTO BANNERDATA VALUES('FISH','<image src="../images/banner_fish.gif">')
INSERT INTO BANNERDATA VALUES('REPTILES','<image src="../images/banner_reptiles.gif">')
-INSERT INTO ORDERS VALUES('1213712709484-FL-DLH-02','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213712709484-FI-FW-02','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213712709484-K9-DL-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213712709484-K9-CW-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213712709484-RP-SN-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213712709484-FI-SW-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213712709484-K9-RT-02','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213712709484-K9-RT-02','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213712709484-K9-PO-02','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
-INSERT INTO ORDERS VALUES('1213712709484-RP-SN-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES('1213739684328-FL-DLH-02','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES('1213739684328-FL-DSH-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES('1213739684328-FI-SW-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES('1213739684328-RP-SN-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES('1213739684328-K9-RT-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES('1213739684328-AV-SB-02','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES('1213739684328-K9-RT-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES('1213739684328-RP-SN-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES('1213739684328-RP-SN-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
+INSERT INTO ORDERS VALUES('1213739684328-K9-DL-01','ACID','2006-11-15','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','901 San Antonio Road','MS UCUP02-206','Palo Alto','CA','30253','USA','UPS',22.23,'ACID','Pets','ACID','Pets','999 9999 9999 9999','12/03','Visa','CA')
INSERT INTO ORDERSTATUS VALUES(1000,1000,'2007-05-25','P')
INSERT INTO ORDERSTATUS VALUES(1001,1001,'2007-05-25','P')
INSERT INTO ORDERSTATUS VALUES(1002,1002,'2007-05-25','P')
Modified: labs/jbossesb/workspace/dbevenius/security/product/services/base-project-build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/services/base-project-build.xml 2008-07-30 04:40:20 UTC (rev 21289)
+++ labs/jbossesb/workspace/dbevenius/security/product/services/base-project-build.xml 2008-07-30 06:39:41 UTC (rev 21290)
@@ -40,7 +40,11 @@
<fileset dir="${esb.product.lib.dir}" includes="*.jar" /> <!-- Product Jars. -->
<fileset dir="${esb.product.lib.ext}" includes="*.jar" />
</path>
-
+
+ <path id="test.classpath">
+ <fileset dir="${esb.root.dir}/../testlib" includes="*.jar" />
+ </path>
+
<target name="echoCP">
<property name="cp" refid="classpath" />
<echo message="Classpath is ${cp}" />
@@ -98,7 +102,10 @@
<mkdir dir="build/tests/classes"/>
<mkdir dir="build/tests/report"/>
<javac srcdir="src/test/java" destdir="build/tests/classes" debug="on" >
- <classpath refid="classpath" />
+ <classpath>
+ <path refid="classpath" />
+ <path refid="test.classpath" />
+ </classpath>
</javac>
<copy todir="build/tests/classes" >
<fileset dir="src/test/java" includes="**/*.xml" />
@@ -122,6 +129,7 @@
<pathelement location="${coverage.dir}/instr"/>
<pathelement location="build/tests/classes/"/>
<path refid="classpath" />
+ <path refid="test.classpath" />
</classpath>
<!-- emma jvm args -->
<jvmarg value="-Demma.coverage.out.file=${coverage.dir}/coverage.emma" />
Modified: labs/jbossesb/workspace/dbevenius/security/product/services/jbpm/ant-task/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/services/jbpm/ant-task/build.xml 2008-07-30 04:40:20 UTC (rev 21289)
+++ labs/jbossesb/workspace/dbevenius/security/product/services/jbpm/ant-task/build.xml 2008-07-30 06:39:41 UTC (rev 21290)
@@ -4,8 +4,8 @@
<path id="classpath">
<pathelement location="src/test/resources"/>
<pathelement location="${basedir}/../../../lib/ext/commons-codec-1.3.jar" />
- <pathelement location="${basedir}/../../../lib/ext/junit-4.1.jar" />
<pathelement location="${basedir}/../../../lib/ext/commons-httpclient.jar" />
+ <pathelement location="${basedir}/../../../../testlib/junit-4.1.jar" />
<pathelement location="${ant.library.dir}/ant.jar" />
</path>
Modified: labs/jbossesb/workspace/dbevenius/security/product/services/soap/base-project-build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/services/soap/base-project-build.xml 2008-07-30 04:40:20 UTC (rev 21289)
+++ labs/jbossesb/workspace/dbevenius/security/product/services/soap/base-project-build.xml 2008-07-30 06:39:41 UTC (rev 21290)
@@ -12,6 +12,7 @@
-->
<dirname property="services.dir" file="${ant.file.base-build}"/>
<property file="${services.dir}/build.properties"/>
+ <property name="esb.root.dir" location="../.."/>
<target name="clean">
<delete dir="build"/>
@@ -38,6 +39,10 @@
<fileset dir="../../lib/ext" includes="jboss-system.jar,jboss.jar"/>
</path>
+ <path id="test.classpath">
+ <fileset dir="${esb.root.dir}/../testlib" includes="*.jar" />
+ </path>
+
<target name="echoCP">
<property name="cp" refid="classpath"/>
<echo message="Classpath is ${cp}"/>
@@ -91,7 +96,10 @@
<mkdir dir="build/test/classes"/>
<mkdir dir="build/test/report"/>
<javac srcdir="src/test/java" destdir="build/test/classes" debug="on">
- <classpath refid="classpath"/>
+ <classpath>
+ <path refid="classpath" />
+ <path refid="test.classpath" />
+ </classpath>
</javac>
<copy todir="build/test/classes">
<fileset dir="src/test/java" includes="**/*.xml"/>
@@ -100,6 +108,7 @@
<formatter type="plain" usefile="false"/>
<classpath>
<path refid="classpath"/>
+ <path refid="test.classpath" />
<pathelement location="src/test/java"/>
</classpath>
<sysproperty key="log4j.configuration" value="log4j.xml"/>
Modified: labs/jbossesb/workspace/dbevenius/security/product/services/soap/lib/ext/Wise-core.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/security/product/services/soap/lib/ext/jcip-annotations.jar (from rev 21257, labs/jbossesb/trunk/product/services/soap/lib/ext/jcip-annotations.jar)
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPProcessor.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPProcessor.java 2008-07-30 04:40:20 UTC (rev 21289)
+++ labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPProcessor.java 2008-07-30 06:39:41 UTC (rev 21290)
@@ -19,31 +19,37 @@
*/
package org.jboss.soa.esb.actions.soap;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.management.ObjectName;
+
import org.jboss.internal.soa.esb.publish.Publish;
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
import org.jboss.soa.esb.actions.ActionProcessingException;
import org.jboss.soa.esb.actions.ActionUtils;
+import org.jboss.soa.esb.actions.soap.adapter.SOAPProcessorHttpServletRequest;
+import org.jboss.soa.esb.actions.soap.adapter.SOAPProcessorHttpServletResponse;
+import org.jboss.soa.esb.actions.soap.adapter.SOAPProcessorServletContext;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.listeners.message.MessageDeliverException;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.MessagePayloadProxy;
+import org.jboss.soa.esb.message.Properties;
import org.jboss.soa.esb.message.ResponseHeader;
import org.jboss.soa.esb.message.body.content.BytesBody;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointRegistry;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-import javax.management.ObjectName;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.Set;
-
/**
* JBoss Webservices SOAP Processor.
* <p/>
@@ -133,7 +139,6 @@
public Message process(Message message) throws ActionProcessingException {
Endpoint endpoint = getServiceEndpoint(jbossws_endpoint);
byte[] soapMessage;
- String response = null;
if(endpoint == null) {
throw new ActionProcessingException("Unknown Service Endpoint '" + jbossws_endpoint + "'.");
@@ -144,34 +149,93 @@
messageTL.set(message);
RequestHandler requestHandler = endpoint.getRequestHandler();
- InvocationContext invocationContext = new InvocationContext();
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- requestHandler.handleRequest(endpoint, new ByteArrayInputStream(soapMessage), os, invocationContext);
-
- Object contentType = message.getProperties().getProperty("Content-Type");
- if(!(contentType instanceof ResponseHeader)) {
- message.getProperties().setProperty("Content-Type", new ResponseHeader("Content-Type", "text/xml"));
+ final Map<String, List<String>> headers = new HashMap<String, List<String>>() ;
+ final Properties properties = message.getProperties() ;
+ final String[] names = properties.getNames() ;
+ for(final String name: names)
+ {
+ final Object value = properties.getProperty(name) ;
+ if (value != null)
+ {
+ final String normalisedName = name.toLowerCase() ;
+ final List<String> values = headers.get(normalisedName) ;
+ if (values == null)
+ {
+ final List<String> newValues = new ArrayList<String>() ;
+ newValues.add(value.toString()) ;
+ headers.put(normalisedName, newValues) ;
+ }
+ else
+ {
+ values.add(value.toString()) ;
+ }
+ }
}
-
- response = new String(os.toByteArray()).trim();
+
+ final String requestContentType = getHeaderValue(headers, "content-type") ;
+ if ("application/octet-stream".equals(requestContentType))
+ {
+ headers.remove("content-type") ;
+ }
+ final String path = getHeaderValue(headers, "path") ;
+ final SOAPProcessorHttpServletRequest servletRequest = new SOAPProcessorHttpServletRequest(path, soapMessage, headers) ;
+ final SOAPProcessorHttpServletResponse servletResponse = new SOAPProcessorHttpServletResponse() ;
+ final SOAPProcessorServletContext servletContext = new SOAPProcessorServletContext() ;
+ requestHandler.handleHttpRequest(endpoint, servletRequest, servletResponse, servletContext) ;
+
+ // This may have been changed, make sure we get the current version.
+ message = messageTL.get();
+ final Properties responseProperties = message.getProperties() ;
+ final String contentType = servletResponse.getContentType() ;
+ final Map<String, List<String>> responseHeaders = servletResponse.getHeaders() ;
+ // We deal with Content-Type below
+ // HTTP Headers *should* be case-insensitive but not with JBR
+ responseHeaders.remove("content-type") ;
+
+ for(Map.Entry<String, List<String>> header: responseHeaders.entrySet())
+ {
+ // We can only deal with the first value in the list.
+ responseProperties.setProperty(header.getKey(), new ResponseHeader(header.getKey(), header.getValue().get(0))) ;
+ }
+
+ final byte[] responseData = servletResponse.getContent() ;
+ if(contentType != null) {
+ responseProperties.setProperty("Content-Type", new ResponseHeader("Content-Type", contentType));
+ } else {
+ responseProperties.setProperty("Content-Type", new ResponseHeader("Content-Type", "text/xml"));
+ }
+
+ if ((contentType != null) && contentType.startsWith("multipart/")) {
+ payloadProxy.setPayload(message, responseData) ;
+ } else {
+ final String charset = servletResponse.getCharset() ;
+ if (charset == null) {
+ payloadProxy.setPayload(message, new String(responseData)) ;
+ } else {
+ payloadProxy.setPayload(message, new String(responseData, charset)) ;
+ }
+ }
} catch (Exception ex) {
throw new ActionProcessingException("Cannot process SOAP request", ex);
} finally {
- // Get the message instance set on the Threadlocal before removing it. The Webservice endpoint
- // may have reset it with a new Message instance.
- message = messageTL.get();
messageTL.remove();
- try {
- payloadProxy.setPayload(message, response);
- } catch (MessageDeliverException e) {
- throw new ActionProcessingException(e);
- }
}
return message;
}
+ private String getHeaderValue(final Map<String, List<String>> headers,
+ final String header)
+ {
+ final List<String> values = headers.get(header) ;
+ if (values != null)
+ {
+ return values.get(0) ;
+ }
+ return null ;
+ }
+
private byte[] getSOAPMessagePayload(Message message) throws ActionProcessingException {
byte[] soapMessage;
Object messagePayload;
Copied: labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter (from rev 21257, labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter)
Deleted: labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletRequest.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletRequest.java 2008-07-28 13:52:44 UTC (rev 21257)
+++ labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletRequest.java 2008-07-30 06:39:41 UTC (rev 21290)
@@ -1,324 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.soa.esb.actions.soap.adapter;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.Principal;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-/**
- * This is an adapter used when integrating with JBossWS.
- *
- * @author <a href="mailto:kevin.conner at jboss.com">Kevin Conner</a>
- */
-public class SOAPProcessorHttpServletRequest implements HttpServletRequest
-{
- private final Map<String, List<String>> headers ;
-
- private final byte[] content ;
-
- private final String path ;
-
- public SOAPProcessorHttpServletRequest(final String path, final byte[] content, final Map<String, List<String>> headers)
- {
- this.path = path ;
- this.content = content ;
- this.headers = headers ;
- }
-
- public String getHeader(final String name)
- {
- final List<String> values = headers.get(name) ;
- if (values != null)
- {
- return values.get(0) ;
- }
- return null ;
- }
-
- public Enumeration getHeaderNames()
- {
- return Collections.enumeration(headers.keySet()) ;
- }
-
- public String getMethod()
- {
- // always use POST
- return "POST" ;
- }
-
- public String getPathInfo()
- {
- return null ;
- }
-
- public String getQueryString()
- {
- return null ;
- }
-
- public String getRequestURI()
- {
- return (path == null ? "/" : path) ;
- }
-
- public String getContextPath()
- {
- return "" ;
- }
-
- public HttpSession getSession(boolean arg0)
- {
- return null ;
- }
-
- public String getContentType()
- {
- return getHeader("Content-Type") ;
- }
-
- public ServletInputStream getInputStream() throws IOException
- {
- return new SOAPProcessorServletInputStream(new ByteArrayInputStream(content)) ;
- }
-
- public String getParameter(final String name)
- {
- return null ;
- }
-
- public Principal getUserPrincipal()
- {
- // TODO link this is with security
- return null ;
- }
-
- public boolean isUserInRole(final String name)
- {
- // TODO link this is with security
- return false ;
- }
-
- /*
- * The following methods are not supported by this adapter.
- */
-
- public StringBuffer getRequestURL()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String getAuthType()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public Cookie[] getCookies()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public long getDateHeader(String arg0)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public Enumeration getHeaders(String arg0)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public int getIntHeader(String arg0)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String getPathTranslated()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String getRemoteUser()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String getRequestedSessionId()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String getServletPath()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public HttpSession getSession()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public boolean isRequestedSessionIdFromCookie()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public boolean isRequestedSessionIdFromURL()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public boolean isRequestedSessionIdFromUrl()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public boolean isRequestedSessionIdValid()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public Enumeration getAttributeNames()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String getCharacterEncoding()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public int getContentLength()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public Locale getLocale()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public Enumeration getLocales()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public Map getParameterMap()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public Enumeration getParameterNames()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String[] getParameterValues(String arg0)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String getProtocol()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public BufferedReader getReader() throws IOException
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String getRealPath(String arg0)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String getRemoteAddr()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String getRemoteHost()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public RequestDispatcher getRequestDispatcher(String arg0)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String getScheme()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String getServerName()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public int getServerPort()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public boolean isSecure()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void removeAttribute(String arg0)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void setAttribute(String arg0, Object arg1)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void setCharacterEncoding(String arg0)
- throws UnsupportedEncodingException
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public Object getAttribute(String arg0)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletRequest.java (from rev 21257, labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletRequest.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletRequest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletRequest.java 2008-07-30 06:39:41 UTC (rev 21290)
@@ -0,0 +1,324 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.actions.soap.adapter;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.Principal;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+/**
+ * This is an adapter used when integrating with JBossWS.
+ *
+ * @author <a href="mailto:kevin.conner at jboss.com">Kevin Conner</a>
+ */
+public class SOAPProcessorHttpServletRequest implements HttpServletRequest
+{
+ private final Map<String, List<String>> headers ;
+
+ private final byte[] content ;
+
+ private final String path ;
+
+ public SOAPProcessorHttpServletRequest(final String path, final byte[] content, final Map<String, List<String>> headers)
+ {
+ this.path = path ;
+ this.content = content ;
+ this.headers = headers ;
+ }
+
+ public String getHeader(final String name)
+ {
+ final List<String> values = headers.get(name) ;
+ if (values != null)
+ {
+ return values.get(0) ;
+ }
+ return null ;
+ }
+
+ public Enumeration getHeaderNames()
+ {
+ return Collections.enumeration(headers.keySet()) ;
+ }
+
+ public String getMethod()
+ {
+ // always use POST
+ return "POST" ;
+ }
+
+ public String getPathInfo()
+ {
+ return null ;
+ }
+
+ public String getQueryString()
+ {
+ return null ;
+ }
+
+ public String getRequestURI()
+ {
+ return (path == null ? "/" : path) ;
+ }
+
+ public String getContextPath()
+ {
+ return "" ;
+ }
+
+ public HttpSession getSession(boolean arg0)
+ {
+ return null ;
+ }
+
+ public String getContentType()
+ {
+ return getHeader("Content-Type") ;
+ }
+
+ public ServletInputStream getInputStream() throws IOException
+ {
+ return new SOAPProcessorServletInputStream(new ByteArrayInputStream(content)) ;
+ }
+
+ public String getParameter(final String name)
+ {
+ return null ;
+ }
+
+ public Principal getUserPrincipal()
+ {
+ // TODO link this is with security
+ return null ;
+ }
+
+ public boolean isUserInRole(final String name)
+ {
+ // TODO link this is with security
+ return false ;
+ }
+
+ /*
+ * The following methods are not supported by this adapter.
+ */
+
+ public StringBuffer getRequestURL()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String getAuthType()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public Cookie[] getCookies()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public long getDateHeader(String arg0)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public Enumeration getHeaders(String arg0)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public int getIntHeader(String arg0)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String getPathTranslated()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String getRemoteUser()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String getRequestedSessionId()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String getServletPath()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public HttpSession getSession()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public boolean isRequestedSessionIdFromCookie()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public boolean isRequestedSessionIdFromURL()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public boolean isRequestedSessionIdFromUrl()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public boolean isRequestedSessionIdValid()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public Enumeration getAttributeNames()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String getCharacterEncoding()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public int getContentLength()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public Locale getLocale()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public Enumeration getLocales()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public Map getParameterMap()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public Enumeration getParameterNames()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String[] getParameterValues(String arg0)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String getProtocol()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public BufferedReader getReader() throws IOException
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String getRealPath(String arg0)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String getRemoteAddr()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String getRemoteHost()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public RequestDispatcher getRequestDispatcher(String arg0)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String getScheme()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String getServerName()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public int getServerPort()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public boolean isSecure()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void removeAttribute(String arg0)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void setAttribute(String arg0, Object arg1)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void setCharacterEncoding(String arg0)
+ throws UnsupportedEncodingException
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public Object getAttribute(String arg0)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletResponse.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletResponse.java 2008-07-28 13:52:44 UTC (rev 21257)
+++ labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletResponse.java 2008-07-30 06:39:41 UTC (rev 21290)
@@ -1,291 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.soa.esb.actions.soap.adapter;
-
-import java.io.BufferedWriter;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * This is an adapter used when integrating with JBossWS.
- *
- * @author <a href="mailto:kevin.conner at jboss.com">Kevin Conner</a>
- */
-public class SOAPProcessorHttpServletResponse implements HttpServletResponse
-{
- private static final String CHARSET = "charset=" ;
-
- private Map<String, List<String>> headers = new HashMap<String, List<String>>() ;
-
- private int status ;
-
- private ByteArrayOutputStream baos ;
-
- private boolean streamReturned ;
-
- public SOAPProcessorHttpServletResponse()
- {
- baos = new ByteArrayOutputStream() ;
- }
-
- public void addHeader(final String name, final String value)
- {
- final String normalisedName = name.toLowerCase() ;
- final List<String> values = headers.get(normalisedName) ;
- if (values != null)
- {
- values.add(value) ;
- }
- else
- {
- final List<String> newValues = new ArrayList<String>() ;
- newValues.add(value) ;
- headers.put(normalisedName, newValues) ;
- }
- }
-
- public void setHeader(final String name, final String value)
- {
- final List<String> values = new ArrayList<String>() ;
- values.add(value) ;
- headers.put(name.toLowerCase(), values) ;
- }
-
- public void setStatus(final int status)
- {
- this.status = status ;
- }
-
- public ServletOutputStream getOutputStream() throws IOException
- {
- if (streamReturned)
- {
- throw new IOException("Output stream already accessed") ;
- }
- streamReturned = true ;
- return new SOAPProcessorServletOutputStream(baos) ;
- }
-
- public PrintWriter getWriter() throws IOException
- {
- if (streamReturned)
- {
- throw new IOException("Output stream already accessed") ;
- }
- streamReturned = true ;
- final String charset = getCharset() ;
- final OutputStreamWriter osw = (charset != null ? new OutputStreamWriter(baos, charset) : new OutputStreamWriter(baos)) ;
- return new PrintWriter(new BufferedWriter(osw)) ;
- }
-
- public void setContentType(final String contentType)
- {
- setHeader("content-type", contentType) ;
- }
-
- public int getStatus()
- {
- return status ;
- }
-
- public Map<String, List<String>> getHeaders()
- {
- return headers ;
- }
-
- public byte[] getContent()
- {
- return baos.toByteArray() ;
- }
-
- public String getContentType()
- {
- final List<String> values = headers.get("content-type") ;
- if (values != null)
- {
- return values.get(0) ;
- }
- return null ;
- }
-
- public String getCharset()
- {
- final String contentType = getContentType() ;
- if (contentType != null)
- {
- final int index = contentType.indexOf(CHARSET) ;
- if (index >= 0)
- {
- final int beginIndex = index + CHARSET.length() ;
- if (beginIndex < contentType.length())
- {
- final int endIndex = contentType.indexOf(';', beginIndex) ;
- if (endIndex >= 0)
- {
- return contentType.substring(beginIndex, endIndex).trim() ;
- }
- else
- {
- return contentType.substring(beginIndex).trim();
- }
- }
- }
- }
- return null ;
- }
-
- /*
- * The following methods are not supported by this adapter.
- */
-
- public void addCookie(Cookie arg0)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void addDateHeader(String arg0, long arg1)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void addIntHeader(String arg0, int arg1)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public boolean containsHeader(String arg0)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String encodeRedirectURL(String arg0)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String encodeRedirectUrl(String arg0)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String encodeURL(String arg0)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String encodeUrl(String arg0)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void sendError(int arg0) throws IOException
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void sendError(int arg0, String arg1) throws IOException
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void sendRedirect(String arg0) throws IOException
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void setDateHeader(String arg0, long arg1)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void setIntHeader(String arg0, int arg1)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void setStatus(int arg0, String arg1)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void flushBuffer() throws IOException
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public int getBufferSize()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String getCharacterEncoding()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public Locale getLocale()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public boolean isCommitted()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void reset()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void resetBuffer()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void setBufferSize(int arg0)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void setContentLength(int arg0)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void setLocale(Locale arg0)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletResponse.java (from rev 21257, labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletResponse.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletResponse.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletResponse.java 2008-07-30 06:39:41 UTC (rev 21290)
@@ -0,0 +1,291 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.actions.soap.adapter;
+
+import java.io.BufferedWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * This is an adapter used when integrating with JBossWS.
+ *
+ * @author <a href="mailto:kevin.conner at jboss.com">Kevin Conner</a>
+ */
+public class SOAPProcessorHttpServletResponse implements HttpServletResponse
+{
+ private static final String CHARSET = "charset=" ;
+
+ private Map<String, List<String>> headers = new HashMap<String, List<String>>() ;
+
+ private int status ;
+
+ private ByteArrayOutputStream baos ;
+
+ private boolean streamReturned ;
+
+ public SOAPProcessorHttpServletResponse()
+ {
+ baos = new ByteArrayOutputStream() ;
+ }
+
+ public void addHeader(final String name, final String value)
+ {
+ final String normalisedName = name.toLowerCase() ;
+ final List<String> values = headers.get(normalisedName) ;
+ if (values != null)
+ {
+ values.add(value) ;
+ }
+ else
+ {
+ final List<String> newValues = new ArrayList<String>() ;
+ newValues.add(value) ;
+ headers.put(normalisedName, newValues) ;
+ }
+ }
+
+ public void setHeader(final String name, final String value)
+ {
+ final List<String> values = new ArrayList<String>() ;
+ values.add(value) ;
+ headers.put(name.toLowerCase(), values) ;
+ }
+
+ public void setStatus(final int status)
+ {
+ this.status = status ;
+ }
+
+ public ServletOutputStream getOutputStream() throws IOException
+ {
+ if (streamReturned)
+ {
+ throw new IOException("Output stream already accessed") ;
+ }
+ streamReturned = true ;
+ return new SOAPProcessorServletOutputStream(baos) ;
+ }
+
+ public PrintWriter getWriter() throws IOException
+ {
+ if (streamReturned)
+ {
+ throw new IOException("Output stream already accessed") ;
+ }
+ streamReturned = true ;
+ final String charset = getCharset() ;
+ final OutputStreamWriter osw = (charset != null ? new OutputStreamWriter(baos, charset) : new OutputStreamWriter(baos)) ;
+ return new PrintWriter(new BufferedWriter(osw)) ;
+ }
+
+ public void setContentType(final String contentType)
+ {
+ setHeader("content-type", contentType) ;
+ }
+
+ public int getStatus()
+ {
+ return status ;
+ }
+
+ public Map<String, List<String>> getHeaders()
+ {
+ return headers ;
+ }
+
+ public byte[] getContent()
+ {
+ return baos.toByteArray() ;
+ }
+
+ public String getContentType()
+ {
+ final List<String> values = headers.get("content-type") ;
+ if (values != null)
+ {
+ return values.get(0) ;
+ }
+ return null ;
+ }
+
+ public String getCharset()
+ {
+ final String contentType = getContentType() ;
+ if (contentType != null)
+ {
+ final int index = contentType.indexOf(CHARSET) ;
+ if (index >= 0)
+ {
+ final int beginIndex = index + CHARSET.length() ;
+ if (beginIndex < contentType.length())
+ {
+ final int endIndex = contentType.indexOf(';', beginIndex) ;
+ if (endIndex >= 0)
+ {
+ return contentType.substring(beginIndex, endIndex).trim() ;
+ }
+ else
+ {
+ return contentType.substring(beginIndex).trim();
+ }
+ }
+ }
+ }
+ return null ;
+ }
+
+ /*
+ * The following methods are not supported by this adapter.
+ */
+
+ public void addCookie(Cookie arg0)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void addDateHeader(String arg0, long arg1)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void addIntHeader(String arg0, int arg1)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public boolean containsHeader(String arg0)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String encodeRedirectURL(String arg0)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String encodeRedirectUrl(String arg0)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String encodeURL(String arg0)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String encodeUrl(String arg0)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void sendError(int arg0) throws IOException
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void sendError(int arg0, String arg1) throws IOException
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void sendRedirect(String arg0) throws IOException
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void setDateHeader(String arg0, long arg1)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void setIntHeader(String arg0, int arg1)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void setStatus(int arg0, String arg1)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void flushBuffer() throws IOException
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public int getBufferSize()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String getCharacterEncoding()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public Locale getLocale()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public boolean isCommitted()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void reset()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void resetBuffer()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void setBufferSize(int arg0)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void setContentLength(int arg0)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void setLocale(Locale arg0)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletContext.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletContext.java 2008-07-28 13:52:44 UTC (rev 21257)
+++ labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletContext.java 2008-07-30 06:39:41 UTC (rev 21290)
@@ -1,164 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.soa.esb.actions.soap.adapter;
-
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Set;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-
-/**
- * This is an adapter used when integrating with JBossWS.
- *
- * @author <a href="mailto:kevin.conner at jboss.com">Kevin Conner</a>
- */
-public class SOAPProcessorServletContext implements ServletContext
-{
- public Object getAttribute(final String name)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public Enumeration getAttributeNames()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public ServletContext getContext(final String name)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String getInitParameter(final String param)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public Enumeration getInitParameterNames()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public int getMajorVersion()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public int getMinorVersion()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String getMimeType(final String file)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public RequestDispatcher getNamedDispatcher(final String name)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String getRealPath(final String path)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public RequestDispatcher getRequestDispatcher(final String path)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public URL getResource(final String path)
- throws MalformedURLException
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public InputStream getResourceAsStream(final String path)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public Set getResourcePaths(final String path)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String getServerInfo()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public Servlet getServlet(final String name)
- throws ServletException
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public String getServletContextName()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public Enumeration getServletNames()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public Enumeration getServlets()
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void log(final String msg)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void log(final Exception ex, final String msg)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void log(final String msg, final Throwable th)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void removeAttribute(final String name)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-
- public void setAttribute(final String name, final Object value)
- {
- throw new UnsupportedOperationException("Not yet supported") ;
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletContext.java (from rev 21257, labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletContext.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletContext.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletContext.java 2008-07-30 06:39:41 UTC (rev 21290)
@@ -0,0 +1,164 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.actions.soap.adapter;
+
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Set;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
+/**
+ * This is an adapter used when integrating with JBossWS.
+ *
+ * @author <a href="mailto:kevin.conner at jboss.com">Kevin Conner</a>
+ */
+public class SOAPProcessorServletContext implements ServletContext
+{
+ public Object getAttribute(final String name)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public Enumeration getAttributeNames()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public ServletContext getContext(final String name)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String getInitParameter(final String param)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public Enumeration getInitParameterNames()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public int getMajorVersion()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public int getMinorVersion()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String getMimeType(final String file)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public RequestDispatcher getNamedDispatcher(final String name)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String getRealPath(final String path)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public RequestDispatcher getRequestDispatcher(final String path)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public URL getResource(final String path)
+ throws MalformedURLException
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public InputStream getResourceAsStream(final String path)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public Set getResourcePaths(final String path)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String getServerInfo()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public Servlet getServlet(final String name)
+ throws ServletException
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public String getServletContextName()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public Enumeration getServletNames()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public Enumeration getServlets()
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void log(final String msg)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void log(final Exception ex, final String msg)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void log(final String msg, final Throwable th)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void removeAttribute(final String name)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+
+ public void setAttribute(final String name, final Object value)
+ {
+ throw new UnsupportedOperationException("Not yet supported") ;
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletInputStream.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletInputStream.java 2008-07-28 13:52:44 UTC (rev 21257)
+++ labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletInputStream.java 2008-07-30 06:39:41 UTC (rev 21290)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.soa.esb.actions.soap.adapter;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.servlet.ServletInputStream;
-
-/**
- * This is an adapter used when integrating with JBossWS.
- *
- * @author <a href="mailto:kevin.conner at jboss.com">Kevin Conner</a>
- */
-public class SOAPProcessorServletInputStream extends ServletInputStream
-{
- private final InputStream is ;
-
- SOAPProcessorServletInputStream(final InputStream is)
- {
- this.is = is ;
- }
-
- @Override
- public int read() throws IOException
- {
- return is.read() ;
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletInputStream.java (from rev 21257, labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletInputStream.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletInputStream.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletInputStream.java 2008-07-30 06:39:41 UTC (rev 21290)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.actions.soap.adapter;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.servlet.ServletInputStream;
+
+/**
+ * This is an adapter used when integrating with JBossWS.
+ *
+ * @author <a href="mailto:kevin.conner at jboss.com">Kevin Conner</a>
+ */
+public class SOAPProcessorServletInputStream extends ServletInputStream
+{
+ private final InputStream is ;
+
+ SOAPProcessorServletInputStream(final InputStream is)
+ {
+ this.is = is ;
+ }
+
+ @Override
+ public int read() throws IOException
+ {
+ return is.read() ;
+ }
+}
Deleted: labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletOutputStream.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletOutputStream.java 2008-07-28 13:52:44 UTC (rev 21257)
+++ labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletOutputStream.java 2008-07-30 06:39:41 UTC (rev 21290)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.soa.esb.actions.soap.adapter;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.servlet.ServletOutputStream;
-
-/**
- * This is an adapter used when integrating with JBossWS.
- *
- * @author <a href="mailto:kevin.conner at jboss.com">Kevin Conner</a>
- */
-public class SOAPProcessorServletOutputStream extends ServletOutputStream
-{
- private final OutputStream os ;
-
- SOAPProcessorServletOutputStream(final OutputStream os)
- {
- this.os = os ;
- }
-
- @Override
- public void write(final int byteVal)
- throws IOException
- {
- os.write(byteVal) ;
- }
-}
Copied: labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletOutputStream.java (from rev 21257, labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletOutputStream.java)
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletOutputStream.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletOutputStream.java 2008-07-30 06:39:41 UTC (rev 21290)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.actions.soap.adapter;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import javax.servlet.ServletOutputStream;
+
+/**
+ * This is an adapter used when integrating with JBossWS.
+ *
+ * @author <a href="mailto:kevin.conner at jboss.com">Kevin Conner</a>
+ */
+public class SOAPProcessorServletOutputStream extends ServletOutputStream
+{
+ private final OutputStream os ;
+
+ SOAPProcessorServletOutputStream(final OutputStream os)
+ {
+ this.os = os ;
+ }
+
+ @Override
+ public void write(final int byteVal)
+ throws IOException
+ {
+ os.write(byteVal) ;
+ }
+}
Modified: labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SOAPClient.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SOAPClient.java 2008-07-30 04:40:20 UTC (rev 21289)
+++ labs/jbossesb/workspace/dbevenius/security/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SOAPClient.java 2008-07-30 06:39:41 UTC (rev 21290)
@@ -123,17 +123,27 @@
* </ol>
* <h2>JAX-WS Handler for the SOAP Request/Response Message</h2>
* It's often necessary to be able to transform the SOAP request or response, especially in header. This may be to simply add some
- * standard SOAP handlers. Wise support JAXWS Soap Handler, both custom or a predefined one based on smooks. Current
- * implementation of the action have some limitation: support only smooks ones and all handler is intended to transform both input
- * and output messages. These limitations will be removed in future. <p/> Transformation of the SOAP request (before sending) is
- * supported by configuring the SOAPClient action with a Smooks transformation configuration property as follows:
+ * standard SOAP handlers. Wise support JAXWS Soap Handler, both custom or a predefined one based on smooks. <p/> Transformation
+ * of the SOAP request (before sending) is supported by configuring the SOAPClient action with a Smooks transformation
+ * configuration property as follows:
*
* <pre>
* <property name="smooksTransform" value="/transforms/order-transform.xml" />
* </pre>
*
+ * <p>
* The value of the "smooksTransform" property is resolved by first checking it as a filesystem based resource. Failing that, it's
* checked as a classpath resource and failing that, as a URI based resource.
+ * </p>
+ * <p>
+ * It's also possible to provide a set of custom standard JAXWS Soap Handler. The parameter accept a list of classes implementing
+ * SoapHandler interface. Classes have to provide full qualified name and be separated by semi-columns.
+ * </p>
+ *
+ * <pre>
+ * <property name="custom-handlers" value="package.Class1;package.Class2" />
+ * </pre>
+ *
* <h2>Logging the SOAP Request/Response Message</h2>
* It's useful for debug purpose to view soap Message sent and response received. Wise achieve this goal using a JAX-WS handler
* printing all messages exchanged on System.out You can enable as follow:
@@ -195,6 +205,7 @@
super.initialise();
try {
WSDynamicClientFactory.getInstace().clearCache();
+
} catch (Exception e) {
throw new ActionLifecycleException("Error durinfg wise client cache cleaning", e);
}
@@ -207,8 +218,9 @@
}
public Message process( final Message message ) throws ActionProcessingException {
- Map params;
+ Object params;
WSDynamicClient client = null;
+ // get client from cache
try {
client = WSDynamicClientFactory.getInstace().getClient(wsdl, serviceName, username, password);
} catch (Exception e) {
@@ -217,14 +229,14 @@
}
try {
- params = (Map)payloadProxy.getPayload(message);
+ params = payloadProxy.getPayload(message);
} catch (MessageDeliverException e) {
throw new ActionProcessingException("Could not locate SOAP message parameters from payload", e);
}
- if (params.isEmpty()) {
- logger.warn("Params Map found in message, but the map is empty.");
- }
+ // if (params.isEmpty()) {
+ // logger.warn("Params Map found in message, but the map is empty.");
+ // }
Map<String, WSEndpoint> endpointsMap = client.processEndpoints();
WSEndpoint endpoint;
if (endPointName != null) {
@@ -235,7 +247,11 @@
for (String config : smooksHandler) {
logger.info("adding smooks handler:" + config);
- endpoint.addHandler(new SmooksHandler(config, params));
+ if (params instanceof Map) {
+ endpoint.addHandler(new SmooksHandler(config, (Map)params));
+ } else {
+ endpoint.addHandler(new SmooksHandler(config, null));
+ }
}
for (String config : customHandlers) {
@@ -265,20 +281,15 @@
} catch (WiseException e) {
throw new ActionProcessingException("Could not call method" + this.soapAction, e);
}
- System.out.println("#3:" + result.getType());
- System.out.println("#3:" + result.getValue());
WiseMapper mapper = null;
if (this.smooksResponseMapperURL != null) {
mapper = new SmooksMapper(this.smooksResponseMapperURL, "smook/report/report.html");
}
- result.setMapper(mapper);
-
// And process the response into the message...
try {
- System.out.println("#4:" + (result.getMappedResult()).toString());
- payloadProxy.setPayload(message, result.getMappedResult());
+ payloadProxy.setPayload(message, result.getMappedResult(mapper));
} catch (Exception e) {
throw new ActionProcessingException("Could not set payload to SOAP message", e);
}
Modified: labs/jbossesb/workspace/dbevenius/security/product/services/soapui-client/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/services/soapui-client/build.xml 2008-07-30 04:40:20 UTC (rev 21289)
+++ labs/jbossesb/workspace/dbevenius/security/product/services/soapui-client/build.xml 2008-07-30 06:39:41 UTC (rev 21290)
@@ -18,6 +18,7 @@
<path location="${basedir}/src/test/resources"/>
<fileset dir="src/lib" includes="*.jar" />
<fileset dir="../../lib/ext" includes="*.jar" />
+ <fileset dir="../../../testlib" includes="*.jar"/>
<path refid="jboss-esb-dependencies" />
</path>
Copied: labs/jbossesb/workspace/dbevenius/security/testlib (from rev 21257, labs/jbossesb/trunk/testlib)
Deleted: labs/jbossesb/workspace/dbevenius/security/testlib/emma.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/security/testlib/emma.jar (from rev 21257, labs/jbossesb/trunk/testlib/emma.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/testlib/emma_ant.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/security/testlib/emma_ant.jar (from rev 21257, labs/jbossesb/trunk/testlib/emma_ant.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/testlib/hsqldb.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/security/testlib/hsqldb.jar (from rev 21257, labs/jbossesb/trunk/testlib/hsqldb.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/testlib/jakarta-oro-2.0.8.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/security/testlib/jakarta-oro-2.0.8.jar (from rev 21257, labs/jbossesb/trunk/testlib/jakarta-oro-2.0.8.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/testlib/jboss-jaxb-intros.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/security/testlib/jboss-jaxb-intros.jar (from rev 21257, labs/jbossesb/trunk/testlib/jboss-jaxb-intros.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/testlib/jboss-remoting.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/security/testlib/jboss-remoting.jar (from rev 21257, labs/jbossesb/trunk/testlib/jboss-remoting.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/testlib/jbossweb.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/security/testlib/jbossweb.jar (from rev 21257, labs/jbossesb/trunk/testlib/jbossweb.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/testlib/junit-4.1.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/security/testlib/junit-4.1.jar (from rev 21257, labs/jbossesb/trunk/testlib/junit-4.1.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/testlib/mockejb.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/security/testlib/mockejb.jar (from rev 21257, labs/jbossesb/trunk/testlib/mockejb.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/testlib/opencsv-1.6.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/security/testlib/opencsv-1.6.jar (from rev 21257, labs/jbossesb/trunk/testlib/opencsv-1.6.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/testlib/properties-plugin.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/security/testlib/properties-plugin.jar (from rev 21257, labs/jbossesb/trunk/testlib/properties-plugin.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/testlib/wsdl4j-1.6.2.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/security/testlib/wsdl4j-1.6.2.jar (from rev 21257, labs/jbossesb/trunk/testlib/wsdl4j-1.6.2.jar)
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/workspace/dbevenius/security/testlib/xalan-2.7.0.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/security/testlib/xalan-2.7.0.jar (from rev 21257, labs/jbossesb/trunk/testlib/xalan-2.7.0.jar)
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list