[jboss-svn-commits] JBL Code SVN: r13399 - in labs/jbossesb/trunk/product: services/soap and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jul 12 08:32:41 EDT 2007
Author: tfennelly
Date: 2007-07-12 08:32:41 -0400 (Thu, 12 Jul 2007)
New Revision: 13399
Added:
labs/jbossesb/trunk/product/services/soap/lib/ext/build-time/jbossws-jboss42.jar
labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/jbossws/
labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/jbossws/ESBWebMetaDataAdapter.java
Modified:
labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml
labs/jbossesb/trunk/product/services/soap/base-project-build.xml
labs/jbossesb/trunk/product/services/soap/lib/ext/build-time/jboss-jaxws.jar
labs/jbossesb/trunk/product/services/soap/lib/ext/build-time/jbossws-core.jar
labs/jbossesb/trunk/product/services/soap/lib/ext/build-time/jbossws-spi.jar
Log:
Patch for the JBossWS 2.0.0GA issue introduced since building the SOAPProcessor.
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml 2007-07-12 10:44:47 UTC (rev 13398)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml 2007-07-12 12:32:41 UTC (rev 13399)
@@ -126,8 +126,7 @@
template and will then use OGNL to populate the values (from the Smooks
EXTRACTED_BEANS_HASH) into the soap message. -->
<action name="soapui-client" class="org.jboss.soa.esb.actions.soap.SOAPClient">
- <!-- property name="wsdl" value="http://localhost:18080/active-bpel/services/RetailerCallback?wsdl"/ -->
- <property name="wsdl" value="https://localhost:18443/active-bpel/services/RetailerCallback?wsdl"/>
+ <property name="wsdl" value="http://localhost:18080/active-bpel/services/RetailerCallback?wsdl"/>
<property name="operation" value="SendSalesOrderNotification"/>
<property name="paramsLocation" value="EXTRACTED_BEANS_HASH"/>
<property name="responseXStreamConfig">
Modified: labs/jbossesb/trunk/product/services/soap/base-project-build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/soap/base-project-build.xml 2007-07-12 10:44:47 UTC (rev 13398)
+++ labs/jbossesb/trunk/product/services/soap/base-project-build.xml 2007-07-12 12:32:41 UTC (rev 13399)
@@ -31,7 +31,7 @@
<fileset dir="${esb.product.lib.dir}" includes="*.jar"/>
<!-- Product Jars. -->
<pathelement location="src/test/resources"/>
- <fileset dir="../../lib/ext" includes="jboss-system.jar"/>
+ <fileset dir="../../lib/ext" includes="jboss-system.jar,jboss.jar"/>
</path>
<target name="echoCP">
Modified: labs/jbossesb/trunk/product/services/soap/lib/ext/build-time/jboss-jaxws.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/trunk/product/services/soap/lib/ext/build-time/jbossws-core.jar
===================================================================
(Binary files differ)
Added: labs/jbossesb/trunk/product/services/soap/lib/ext/build-time/jbossws-jboss42.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/soap/lib/ext/build-time/jbossws-jboss42.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossesb/trunk/product/services/soap/lib/ext/build-time/jbossws-spi.jar
===================================================================
(Binary files differ)
Added: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/jbossws/ESBWebMetaDataAdapter.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/jbossws/ESBWebMetaDataAdapter.java (rev 0)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/jbossws/ESBWebMetaDataAdapter.java 2007-07-12 12:32:41 UTC (rev 13399)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, 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.jbossws;
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.J2eeApplicationMetaData;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData;
+import org.jboss.wsf.container.jboss42.WebMetaDataAdapter;
+
+/**
+ * Build container independent web meta data
+ * <p/>
+ * This class overrides {@link WebMetaDataAdapter} in order to work around
+ * a NullP Exception bug in JBossWS 2.0.0GA. It should be removed once there's
+ * a fix for this bug.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class ESBWebMetaDataAdapter extends WebMetaDataAdapter {
+
+ public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di) {
+ if (di.parent != null) {
+ J2eeApplicationMetaData appmd = (J2eeApplicationMetaData) di.parent.metaData;
+ if (appmd == null) {
+ // Explicitly initialise this variable if it's not set - avoids the NPE...
+ di.parent.metaData = new J2eeApplicationMetaData();
+ }
+ }
+
+ return super.buildUnifiedWebMetaData(dep, udi, di);
+ }
+}
Property changes on: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/jbossws/ESBWebMetaDataAdapter.java
___________________________________________________________________
Name: svn:eol-style
+ native
More information about the jboss-svn-commits
mailing list