From riftsaw-commits at lists.jboss.org Tue Jun 1 07:25:01 2010
Content-Type: multipart/mixed; boundary="===============8759200075861884145=="
MIME-Version: 1.0
From: riftsaw-commits at lists.jboss.org
To: riftsaw-commits at lists.jboss.org
Subject: [riftsaw-commits] riftsaw SVN: r688 -
trunk/docs/docbook/userguide/src/main/module.
Date: Tue, 01 Jun 2010 07:25:01 -0400
Message-ID: <201006011125.o51BP1TC029247@svn01.web.mwc.hst.phx2.redhat.com>
--===============8759200075861884145==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: objectiser
Date: 2010-06-01 07:25:01 -0400 (Tue, 01 Jun 2010)
New Revision: 688
Modified:
trunk/docs/docbook/userguide/src/main/module/wsconfig.xml
Log:
RIFTSAW-75 - added some documentation for how to provide cxf configuration =
details in the BPEL deployment.
Modified: trunk/docs/docbook/userguide/src/main/module/wsconfig.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/docs/docbook/userguide/src/main/module/wsconfig.xml 2010-05-31 12=
:23:39 UTC (rev 687)
+++ trunk/docs/docbook/userguide/src/main/module/wsconfig.xml 2010-06-01 11=
:25:01 UTC (rev 688)
@@ -90,4 +90,226 @@
=
=
+
+ Apache CXF Configuration
+ =
+
+ RiftSaw integrates with JBossWS, using the JAX-WS standard API, t=
o support the
+ following web service stacks: JBossWS native, Metro and Apache CX=
F. This section
+ explains how RiftSaw deployed BPEL processes can include addition=
al configuration
+ specifically applicable to the Apache CXF web service stack - and=
is therefore
+ only relevant if the JBossAS application server has been configur=
ed to use this
+ stack. See the Getting Started Guide for inf=
ormation on how to
+ switch to the Apache CXF stack when installing RiftSaw.
+
+ =
+
+ This section will explain how web service endpoints, whether serv=
er (i.e. representing
+ the BPEL process) or client (i.e. being used to invoke external w=
eb services), are
+ configured using the Apache CXF configuration format. It will als=
o discuss reasons
+ why you may wish to do this additional CXF specific configuration=
. However, for further
+ information on how to configure CXF, and the features that it off=
ers, the reader is
+ referred to the Apache CXF website http://cxf.apache.org.
+
+ =
+
+ Configuring the Server endpoint
+ =
+
+ To create a CXF configuration that will be used by the RiftSaw we=
b service provider
+ (i.e. the server), it is simply a case of placing a file called
+ jbossws-cxf.xml into the root folder of the =
BPEL deployment
+ (along side the deployment descriptor).
+
+ =
+
+ This is the same filename as used by jbossws-cxf, when deploying =
a web service based
+ on the use of JAXWS annotations. An example of the file content i=
s:
+
+ =
+
+
+ =
+
+
+
+
+
+ =
+
+
+
+
+
+
+
+
+ [
+
+ ]
+
+ [
+
+ ]
+
+ =
+ =
+
+ ]]>
+
+
+
+ This example configures the web service to use username token and digi=
tal signature
+ authentication.
+ =
+
+ =
+
+ Configuring the Client endpoint
+ =
+
+ When configuring client endpoints, representing web services invo=
ked by a BPEL
+ process, the configuration is currently separated into different =
files on a per
+ port basis - similar to the approach used by the Axis2 ODE integr=
ation.
+
+ =
+
+ The file name is of the form jbossws-cxf-{portname_loca=
l_part}.xml,
+ where the portname_local_part represents the=
local part of
+ the portname of the web service being invoked. For example, if th=
e WSDL for the invoked
+ web service is:
+
+ =
+
+
+
+ ...
+
+
+
+ ...
+
+
+
+ ]]>
+
+ =
+
+ then the CXF configuration file would be jbossws-cxf-Sec=
ureHelloWorldPort.xml.
+
+ =
+
+ The CXF configuration information within this file is associated w=
ith the CXF bus. For
+ example:
+
+ =
+
+
+
+
+
+
+
+
+ =
+
+
+
+
+
+ =
+
+
+ [
+
+ ]
+
+ [
+
+ ]
+
+
+
+ ]]>
+
+
+
+ This example configures the web service client to use username token a=
nd digital signature
+ authentication.
+ =
+
+
--===============8759200075861884145==--
From riftsaw-commits at lists.jboss.org Tue Jun 1 07:32:26 2010
Content-Type: multipart/mixed; boundary="===============6118979549388444310=="
MIME-Version: 1.0
From: riftsaw-commits at lists.jboss.org
To: riftsaw-commits at lists.jboss.org
Subject: [riftsaw-commits] riftsaw SVN: r689 -
trunk/docs/docbook/userguide/src/main/module.
Date: Tue, 01 Jun 2010 07:32:26 -0400
Message-ID: <201006011132.o51BWQl9030186@svn01.web.mwc.hst.phx2.redhat.com>
--===============6118979549388444310==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: objectiser
Date: 2010-06-01 07:32:25 -0400 (Tue, 01 Jun 2010)
New Revision: 689
Modified:
trunk/docs/docbook/userguide/src/main/module/wsconfig.xml
Log:
Added further text on the implementor attribute.
Modified: trunk/docs/docbook/userguide/src/main/module/wsconfig.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/docs/docbook/userguide/src/main/module/wsconfig.xml 2010-06-01 11=
:25:01 UTC (rev 688)
+++ trunk/docs/docbook/userguide/src/main/module/wsconfig.xml 2010-06-01 11=
:32:25 UTC (rev 689)
@@ -195,7 +195,16 @@
This example configures the web service to use username token and digi=
tal signature
authentication.
- =
+
+ =
+
+
+ The jaxws:endpoint element has an attribute calle=
d implementor
+ that defines the Java class implementing the JAXWS service. RiftSaw dy=
namically creates this
+ class, and therefore it is important that the attribute is set to the =
value @provider@
+ to enable the dynamically created Java class to be correctly configure=
d during deployment.
+
+ =
=
--===============6118979549388444310==--
From jboss-qa-internal at redhat.com Tue Jun 1 13:22:11 2010
Content-Type: multipart/mixed; boundary="===============0821957938765052625=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: riftsaw-commits at lists.jboss.org
Subject: [riftsaw-commits] Hudson build is still unstable: RiftSaw-postgres
#118
Date: Tue, 01 Jun 2010 13:22:10 -0400
Message-ID: <1568305120.3981275412930795.JavaMail.hudson@soa8.qa.atl2.redhat.com>
In-Reply-To: 1234526280.1611275310920147.JavaMail.hudson@soa8.qa.atl2.redhat.com
--===============0821957938765052625==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
See
--===============0821957938765052625==--
From jboss-qa-internal at redhat.com Tue Jun 1 13:57:39 2010
Content-Type: multipart/mixed; boundary="===============6067547217978401440=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: riftsaw-commits at lists.jboss.org
Subject: [riftsaw-commits] Hudson build is unstable: RiftSaw-mysql #107
Date: Tue, 01 Jun 2010 13:57:37 -0400
Message-ID: <590513717.4031275415057115.JavaMail.hudson@soa8.qa.atl2.redhat.com>
--===============6067547217978401440==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
See
--===============6067547217978401440==--
From jboss-qa-internal at redhat.com Tue Jun 1 16:22:18 2010
Content-Type: multipart/mixed; boundary="===============5484773822499716441=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: riftsaw-commits at lists.jboss.org
Subject: [riftsaw-commits] Hudson build is still unstable: Riftsaw-soa-p #39
Date: Tue, 01 Jun 2010 16:22:17 -0400
Message-ID: <704304460.4251275423737337.JavaMail.hudson@soa8.qa.atl2.redhat.com>
In-Reply-To: 314528132.2071275337268166.JavaMail.hudson@soa8.qa.atl2.redhat.com
--===============5484773822499716441==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
See
--===============5484773822499716441==--
From riftsaw-commits at lists.jboss.org Tue Jun 1 16:24:23 2010
Content-Type: multipart/mixed; boundary="===============0381223832932060062=="
MIME-Version: 1.0
From: riftsaw-commits at lists.jboss.org
To: riftsaw-commits at lists.jboss.org
Subject: [riftsaw-commits] riftsaw SVN: r690 - in trunk/stress-tests:
src/test/java/org/jboss/soa and 9 other directories.
Date: Tue, 01 Jun 2010 16:24:23 -0400
Message-ID: <201006012024.o51KONPI016315@svn01.web.mwc.hst.phx2.redhat.com>
--===============0381223832932060062==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: bbrodt
Date: 2010-06-01 16:24:20 -0400 (Tue, 01 Jun 2010)
New Revision: 690
Added:
trunk/stress-tests/src/test/java/org/jboss/soa/esb/
trunk/stress-tests/src/test/java/org/jboss/soa/esb/qa/
trunk/stress-tests/src/test/java/org/jboss/soa/esb/qa/teargas/
trunk/stress-tests/src/test/java/org/jboss/soa/esb/qa/teargas/TeargasCon=
st.java
trunk/stress-tests/src/test/java/org/jboss/soa/esb/qa/teargas/message/
trunk/stress-tests/src/test/java/org/jboss/soa/esb/qa/teargas/message/ge=
nerator/
trunk/stress-tests/src/test/java/org/jboss/soa/esb/qa/teargas/message/se=
nder/
trunk/stress-tests/src/test/java/org/jboss/soa/esb/qa/teargas/qs/
trunk/stress-tests/src/test/java/org/jboss/soa/esb/qa/teargas/qs/QSRunne=
r.java
Removed:
trunk/stress-tests/src/test/java/org/jboss/soa/esb/qa/teargas/qs/QSRunTe=
st.java
trunk/stress-tests/src/test/resources/performance/bpel/SimpleInvoke.cbp
trunk/stress-tests/src/test/resources/performance/war/src/org/jboss/soa/=
esb/
Modified:
trunk/stress-tests/build.xml
trunk/stress-tests/pom.xml
trunk/stress-tests/src/test/java/org/jboss/soa/bpel/tests/performance/Pe=
rformanceTestCase.java
trunk/stress-tests/src/test/resources/performance/bpel/SimpleInvoke.wsdl
trunk/stress-tests/src/test/resources/performance/bpel/bpel-deploy.xml
trunk/stress-tests/src/test/resources/performance/build.xml
Log:
https://jira.jboss.org/browse/RIFTSAW-182
Fixed performance tests and refactored some classes which will be used for =
additional multithreaded tests
Modified: trunk/stress-tests/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/stress-tests/build.xml 2010-06-01 11:32:25 UTC (rev 689)
+++ trunk/stress-tests/build.xml 2010-06-01 20:24:20 UTC (rev 690)
@@ -41,18 +41,20 @@
=
-
-
+
+
+
=
+
Modified: trunk/stress-tests/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/stress-tests/pom.xml 2010-06-01 11:32:25 UTC (rev 689)
+++ trunk/stress-tests/pom.xml 2010-06-01 20:24:20 UTC (rev 690)
@@ -278,6 +278,7 @@
${basedir}/src/test/resources/conf
${basedir}/target/rosetta.aop
+ ${basedir}/bin
Modified: trunk/stress-tests/src/test/java/org/jboss/soa/bpel/tests/perform=
ance/PerformanceTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/stress-tests/src/test/java/org/jboss/soa/bpel/tests/performance/P=
erformanceTestCase.java 2010-06-01 11:32:25 UTC (rev 689)
+++ trunk/stress-tests/src/test/java/org/jboss/soa/bpel/tests/performance/P=
erformanceTestCase.java 2010-06-01 20:24:20 UTC (rev 690)
@@ -1,49 +1,49 @@
package org.jboss.soa.bpel.tests.performance;
=
-import junit.framework.Test;
+import junit.framework.TestCase;
=
-import org.jboss.soa.bpel.tests.RiftSawTest;
-import org.jboss.soa.bpel.tests.RiftSawTestSetup;
-import org.jboss.soa.esb.qa.teargas.qs.QSRunTest;
+import org.jboss.soa.esb.qa.teargas.qs.QSRunner;
=
-public class PerformanceTestCase extends RiftSawTest {
+public class PerformanceTestCase extends TestCase {
=
- private static final String TEST_NAME =3D "Performance";
-
public PerformanceTestCase(String name) {
- super(TEST_NAME);
+ super(name);
}
- =
- public static Test suite() {
- return(new RiftSawTestSetup(PerformanceTestCase.class,
- TEST_NAME, "")); // nothing to do here - jars and wars are already d=
eployed
+
+ protected void setUp() throws Exception {
+ super.setUp();
}
- =
- public void testRun() throws Exception {
- String resources =3D System.getProperty("resources.dir");
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ public void testRunTest() throws Exception {
+ String resources =3D System.getenv("resources.dir");
int count =3D 1;
if (resources=3D=3Dnull)
- resources =3D "src/test/resources";
+ resources =3D "src/test/resources/performance";
try
{
- count =3D Integer.parseInt(System.getProperty("count"));
+ System.out.println("System Property \"count\"=3D" + System.getenv("coun=
t"));
+ count =3D Integer.parseInt(System.getenv("count"));
}
catch(Exception ex)
{
- fail(ex.getMessage());
}
=
String[] args =3D new String[3];
- args[0] =3D "-message=3D"+resources+"/performance/messages/hello_request=
1.xml";
+ args[0] =3D "-message=3D"+resources+"/messages/hello_request1.xml";
args[1] =3D "-address=3Dhttp://localhost:8080/SimpleInvoke";
args[2] =3D "-count=3D"+count;
=
- QSRunTest qs =3D new QSRunTest();
+ QSRunner qs =3D new QSRunner();
qs.parseArguments(args);
if (!qs.validArguments()) {
System.out.println("Usage: QSRunTest -address=3D -message=3D -count=3D");
System.out.println("Additional properties for message sender can be spe=
cified using -D=3D");
} else {
+ System.out.println("Running performance test with "+count+" messages.");
qs.runTest();
}
}
Copied: trunk/stress-tests/src/test/java/org/jboss/soa/esb/qa/teargas/Tearg=
asConst.java (from rev 681, trunk/stress-tests/src/test/resources/performan=
ce/war/src/org/jboss/soa/esb/qa/teargas/TeargasConst.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/stress-tests/src/test/java/org/jboss/soa/esb/qa/teargas/TeargasCo=
nst.java (rev 0)
+++ trunk/stress-tests/src/test/java/org/jboss/soa/esb/qa/teargas/TeargasCo=
nst.java 2010-06-01 20:24:20 UTC (rev 690)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated =
+ * by the @authors tag. All rights reserved. =
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors. =
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WIT=
HOUT A =
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNE=
SS 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 Licens=
e,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, =
+ * MA 02110-1301, USA.
+ * =
+ * (C) 2005-2008,
+ */
+
+package org.jboss.soa.esb.qa.teargas;
+
+/**
+ *
+ * @author mvecera
+ */
+public class TeargasConst {
+
+ public static final String MONITORING_QUEUE =3D "queue/teargas_jms_moni=
tor";
+ public static final String STOP_MESSAGE_PROPERTY =3D "This_is_the_very_=
last_message";
+ public static final String PERFORMANCE_MESSAGE_PROPERTY =3D "Teargas_Pe=
rformance";
+ public static final String TIME_MESSAGE_PROPERTY =3D "Teargas_Performan=
ce_Time";
+ public static final String COUNT_MESSAGE_PROPERTY =3D "Teargas_Performa=
nce_Count";
+ public static final String START_VALUE =3D "**START**";
+ public static final String STOP_VALUE =3D "**STOP**";
+ public static final String CHECK_POINT_VALUE =3D "**CHECK**";
+
+}
Copied: trunk/stress-tests/src/test/java/org/jboss/soa/esb/qa/teargas/messa=
ge/generator (from rev 681, trunk/stress-tests/src/test/resources/performan=
ce/war/src/org/jboss/soa/esb/qa/teargas/message/generator)
Copied: trunk/stress-tests/src/test/java/org/jboss/soa/esb/qa/teargas/messa=
ge/sender (from rev 681, trunk/stress-tests/src/test/resources/performance/=
war/src/org/jboss/soa/esb/qa/teargas/message/sender)
Copied: trunk/stress-tests/src/test/java/org/jboss/soa/esb/qa/teargas/qs (f=
rom rev 681, trunk/stress-tests/src/test/resources/performance/war/src/org/=
jboss/soa/esb/qa/teargas/qs)
Deleted: trunk/stress-tests/src/test/java/org/jboss/soa/esb/qa/teargas/qs/Q=
SRunTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/stress-tests/src/test/resources/performance/war/src/org/jboss/soa=
/esb/qa/teargas/qs/QSRunTest.java 2010-05-28 20:37:17 UTC (rev 681)
+++ trunk/stress-tests/src/test/java/org/jboss/soa/esb/qa/teargas/qs/QSRunT=
est.java 2010-06-01 20:24:20 UTC (rev 690)
@@ -1,163 +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.qa.teargas.qs;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Hashtable;
-import java.util.Map.Entry;
-import java.util.Vector;
-import org.jboss.soa.esb.qa.teargas.message.generator.AbstractMessageGener=
ator;
-import org.jboss.soa.esb.qa.teargas.message.generator.QSMessageGenerator;
-import org.jboss.soa.esb.qa.teargas.message.sender.HTTPSender;
-import org.jboss.soa.esb.qa.teargas.message.sender.MessageSender;
-
-/**
- *
- * @author mvecera
- */
-public class QSRunTest {
- private Vector params =3D new Vector();
- private Hashtable options =3D new Hashtable();
- private Hashtable properties =3D new Hashtable();
-
- private int count;
- private StringBuilder sbMessage =3D new StringBuilder();
- private String address;
- private MessageSender sender =3D null;
-
- public void parseArguments(String[] args) {
- int paramIndex =3D 0;
- for (int i =3D 0; i < args.length; i++) {
- if (args[i].startsWith("-")) {
- if (args[i].startsWith("-D")) {
- int loc =3D args[i].indexOf("=3D");
- String key =3D (loc > 0) ? args[i].substring(2, loc) : args=
[i].substring(2);
- String value =3D (loc > 0) ? args[i].substring(loc + 1) : "=
";
- properties.put(key.toLowerCase(), value);
- } else {
- int loc =3D args[i].indexOf("=3D");
- String key =3D (loc > 0) ? args[i].substring(1, loc) : args=
[i].substring(1);
- String value =3D (loc > 0) ? args[i].substring(loc + 1) : "=
";
- options.put(key.toLowerCase(), value);
- }
- } else {
- params.addElement(args[i]);
- }
- }
- }
-
- private boolean hasOption(String opt) {
- return options.containsKey(opt.toLowerCase());
- }
-
- private String getOption(String opt) {
- return options.get(opt.toLowerCase());
- }
-
- public void runTest() throws Exception {
- AbstractMessageGenerator generator =3D new QSMessageGenerator();
- if (sender =3D=3D null) {
- sender =3D new HTTPSender();
- }
-
- for (Entry e: properties.entrySet()) {
- sender.setProperty(e.getKey(), e.getValue());
- generator.setProperty(e.getKey(), e.getValue());
- }
-
- generator.init(address, sender);
- generator.generate(sbMessage.toString(), count);
- generator.close();
- }
-
- private void loadMessage(String fileName) throws IOException {
- FileReader fr =3D new FileReader(fileName);
- BufferedReader br =3D new BufferedReader(fr);
-
- String line =3D "";
- while ((line =3D br.readLine()) !=3D null) {
- sbMessage.append(line);
- }
-
- br.close();
- fr.close();
- }
-
- public boolean validArguments() {
- if (hasOption("message") && hasOption("address") && hasOption("count=
")) {
- try {
- count =3D Integer.parseInt(getOption("count"));
- } catch (NumberFormatException e) {
- System.err.println("Option count is not a valid number.");
- return false;
- }
-
- try {
- loadMessage(getOption("message"));
- } catch (IOException e) {
- System.err.println("Unable to read meesage file.");
- return false;
- }
-
- address =3D getOption("address");
- if (address =3D=3D null || "".equals(address)) {
- System.err.println("Invalid address.");
- return false;
- }
- }
-
- if (hasOption("sender")) {
- String senderClass =3D "org.jboss.soa.esb.qa.teargas.message.send=
er." + getOption("sender");
-
- try {
- sender =3D (MessageSender) Class.forName(senderClass, false, t=
his.getClass().getClassLoader()).newInstance();
- } catch (ClassNotFoundException e) {
- System.err.println("Unable to instantiate sender class - class=
not found: " + senderClass);
- return false;
- } catch (InstantiationException e) {
- System.err.println("Unable to instantiate sender class.");
- return false;
- } catch (IllegalAccessException e) {
- System.err.println("Unable to instantiate sender class.");
- return false;
- }
- }
-
- return true;
- }
-
- public static void main(String[] args) throws Exception {
- System.out.println("Teargas testing framework - QS Performance measu=
rement");
-
- QSRunTest qs =3D new QSRunTest();
- qs.parseArguments(args);
- if (!qs.validArguments()) {
- System.out.println("Usage: QSRunTest -address=3D -message=
=3D -count=3D");
- System.out.println("Additional properties for message sender can =
be specified using -D=3D");
- } else {
- qs.runTest();
- }
- }
-
-}
Copied: trunk/stress-tests/src/test/java/org/jboss/soa/esb/qa/teargas/qs/QS=
Runner.java (from rev 681, trunk/stress-tests/src/test/resources/performanc=
e/war/src/org/jboss/soa/esb/qa/teargas/qs/QSRunTest.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/stress-tests/src/test/java/org/jboss/soa/esb/qa/teargas/qs/QSRunn=
er.java (rev 0)
+++ trunk/stress-tests/src/test/java/org/jboss/soa/esb/qa/teargas/qs/QSRunn=
er.java 2010-06-01 20:24:20 UTC (rev 690)
@@ -0,0 +1,163 @@
+/*
+ * 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.qa.teargas.qs;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Hashtable;
+import java.util.Map.Entry;
+import java.util.Vector;
+import org.jboss.soa.esb.qa.teargas.message.generator.AbstractMessageGener=
ator;
+import org.jboss.soa.esb.qa.teargas.message.generator.QSMessageGenerator;
+import org.jboss.soa.esb.qa.teargas.message.sender.HTTPSender;
+import org.jboss.soa.esb.qa.teargas.message.sender.MessageSender;
+
+/**
+ *
+ * @author mvecera
+ */
+public class QSRunner {
+ private Vector params =3D new Vector();
+ private Hashtable options =3D new Hashtable();
+ private Hashtable properties =3D new Hashtable();
+
+ private int count;
+ private StringBuilder sbMessage =3D new StringBuilder();
+ private String address;
+ private MessageSender sender =3D null;
+
+ public void parseArguments(String[] args) {
+ int paramIndex =3D 0;
+ for (int i =3D 0; i < args.length; i++) {
+ if (args[i].startsWith("-")) {
+ if (args[i].startsWith("-D")) {
+ int loc =3D args[i].indexOf("=3D");
+ String key =3D (loc > 0) ? args[i].substring(2, loc) : args=
[i].substring(2);
+ String value =3D (loc > 0) ? args[i].substring(loc + 1) : "=
";
+ properties.put(key.toLowerCase(), value);
+ } else {
+ int loc =3D args[i].indexOf("=3D");
+ String key =3D (loc > 0) ? args[i].substring(1, loc) : args=
[i].substring(1);
+ String value =3D (loc > 0) ? args[i].substring(loc + 1) : "=
";
+ options.put(key.toLowerCase(), value);
+ }
+ } else {
+ params.addElement(args[i]);
+ }
+ }
+ }
+
+ private boolean hasOption(String opt) {
+ return options.containsKey(opt.toLowerCase());
+ }
+
+ private String getOption(String opt) {
+ return options.get(opt.toLowerCase());
+ }
+
+ public void runTest() throws Exception {
+ AbstractMessageGenerator generator =3D new QSMessageGenerator();
+ if (sender =3D=3D null) {
+ sender =3D new HTTPSender();
+ }
+
+ for (Entry e: properties.entrySet()) {
+ sender.setProperty(e.getKey(), e.getValue());
+ generator.setProperty(e.getKey(), e.getValue());
+ }
+
+ generator.init(address, sender);
+ generator.generate(sbMessage.toString(), count);
+ generator.close();
+ }
+
+ private void loadMessage(String fileName) throws IOException {
+ FileReader fr =3D new FileReader(fileName);
+ BufferedReader br =3D new BufferedReader(fr);
+
+ String line =3D "";
+ while ((line =3D br.readLine()) !=3D null) {
+ sbMessage.append(line);
+ }
+
+ br.close();
+ fr.close();
+ }
+
+ public boolean validArguments() {
+ if (hasOption("message") && hasOption("address") && hasOption("count=
")) {
+ try {
+ count =3D Integer.parseInt(getOption("count"));
+ } catch (NumberFormatException e) {
+ System.err.println("Option count is not a valid number.");
+ return false;
+ }
+
+ try {
+ loadMessage(getOption("message"));
+ } catch (IOException e) {
+ System.err.println("Unable to read meesage file.");
+ return false;
+ }
+
+ address =3D getOption("address");
+ if (address =3D=3D null || "".equals(address)) {
+ System.err.println("Invalid address.");
+ return false;
+ }
+ }
+
+ if (hasOption("sender")) {
+ String senderClass =3D "org.jboss.soa.esb.qa.teargas.message.send=
er." + getOption("sender");
+
+ try {
+ sender =3D (MessageSender) Class.forName(senderClass, false, t=
his.getClass().getClassLoader()).newInstance();
+ } catch (ClassNotFoundException e) {
+ System.err.println("Unable to instantiate sender class - class=
not found: " + senderClass);
+ return false;
+ } catch (InstantiationException e) {
+ System.err.println("Unable to instantiate sender class.");
+ return false;
+ } catch (IllegalAccessException e) {
+ System.err.println("Unable to instantiate sender class.");
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ public static void main(String[] args) throws Exception {
+ System.out.println("Teargas testing framework - QS Performance measu=
rement");
+
+ QSRunner qs =3D new QSRunner();
+ qs.parseArguments(args);
+ if (!qs.validArguments()) {
+ System.out.println("Usage: QSRunTest -address=3D -message=
=3D -count=3D");
+ System.out.println("Additional properties for message sender can =
be specified using -D=3D");
+ } else {
+ qs.runTest();
+ }
+ }
+
+}
Deleted: trunk/stress-tests/src/test/resources/performance/bpel/SimpleInvok=
e.cbp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)
Modified: trunk/stress-tests/src/test/resources/performance/bpel/SimpleInvo=
ke.wsdl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/stress-tests/src/test/resources/performance/bpel/SimpleInvoke.wsd=
l 2010-06-01 11:32:25 UTC (rev 689)
+++ trunk/stress-tests/src/test/resources/performance/bpel/SimpleInvoke.wsd=
l 2010-06-01 20:24:20 UTC (rev 690)
@@ -54,7 +54,7 @@
-
+
=
Modified: trunk/stress-tests/src/test/resources/performance/bpel/bpel-deplo=
y.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/stress-tests/src/test/resources/performance/bpel/bpel-deploy.xml =
2010-06-01 11:32:25 UTC (rev 689)
+++ trunk/stress-tests/src/test/resources/performance/bpel/bpel-deploy.xml =
2010-06-01 20:24:20 UTC (rev 690)
@@ -1,3 +1,4 @@
+
-
+
-
+
=
-
-
+
+
-
+
-
+
=
+ Deploy ${ws.war.name}
+ file=3D"${war.build.dir}/${ws.war.name}"/>
=
-
+ Undeploy ${ws.war.name}
+
=
- Deploy ${ant.project.name}
-
+ Deploy ${bpel.jar.name}
+
+
+
+
+
=
=
- Undeploy ${ant.project.name}
-
+ Undeploy ${bpel.jar.name}
+
=
=
false]]>
true]]>
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/eng=
ine/ode/JAXWSBindingContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/od=
e/JAXWSBindingContext.java 2010-06-02 13:31:07 UTC (rev 691)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/od=
e/JAXWSBindingContext.java 2010-06-02 16:28:23 UTC (rev 692)
@@ -44,10 +44,6 @@
public class JAXWSBindingContext implements BindingContext
{
protected final Log log =3D LogFactory.getLog(getClass());
-//we should consider having our own OdeConfigProperties class if we need m=
ore properties
- public final static String BPEL_UDDI_LOOKUP =3D "uddi.lookup";
- public final static String BPEL_WEBSERVICE_SECURE =3D "webservice.secur=
e";
- public final static String BPEL_WEBSERVICE_BASEURL =3D "webservice.baseu=
rl";
=
private BPELEngineImpl engine;
private EndpointManager endpointManager;
@@ -56,25 +52,7 @@
public JAXWSBindingContext(BPELEngineImpl server) {
this.engine =3D server;
this.endpointManager =3D new EndpointManager(this.engine);
- if (isUDDILookup()) {
- try {
- String webServiceHost =3D ServerConfigFactory.getServerConfig().getW=
ebServiceHost();
- int webServicePort =3D ServerConfigFactory.getServerConfig().getWebS=
ervicePort();
- URL url =3D new URL("http://" + webServiceHost + ":" + webServicePor=
t);
- if (isWebserviceSecure()) {
- int secureWebServicePort =3D ServerConfigFactory.getServerConfig().=
getWebServicePort();
- url =3D new URL("https://" + webServiceHost + ":" + secureWebServic=
ePort);
- }
- //give the user the option to override
- if (server.getOdeConfig().getProperty(BPEL_WEBSERVICE_BASEURL)=3D=3D=
null) {
- server.getOdeConfig().getProperties().setProperty(BPEL_WEBSERVICE_B=
ASEURL, url.toExternalForm());
- }
- uddiRegistration =3D UDDIClientFactory.newInstance(server.getOdeConf=
ig().getProperties());
- } catch (Exception e) {
- log.error(e.getMessage());
- log.error("Continuing without UDDI integration.");
- }
- }
+ =
}
=
public org.apache.ode.bpel.iapi.EndpointReference getEndpoint(QName serv=
iceName, String portName) {
@@ -98,7 +76,8 @@
}
else
{
- WSDLReference wsdlReference =3D createWSDLReference(processId, myRol=
eEndpoint);
+ WSDLReference wsdlReference =3D new WSDLHelper().createWSDLReference=
(engine, processId, =
+ myRoleEndpoint.serviceName, myRoleEndpoint.portName);
=
try
{
@@ -122,48 +101,7 @@
return(ref);
}
=
- private WSDLReference createWSDLReference(QName processId, Endpoint myRo=
leEndpoint)
- {
- File targetWSDLFile =3D findWSDLFile(processId, myRoleEndpoint);
- Definition wsdlDefinition =3D getWSDLDefinition(processId, myRoleEndpo=
int.serviceName);
- return new WSDLReference(wsdlDefinition, targetWSDLFile.toURI());
- }
-
- private File findWSDLFile(QName processId, Endpoint myRoleEndpoint)
- {
- ProcessConf pconf =3D engine._store.getProcessConfiguration(processId);
- List files =3D pconf.getFiles();
- File targetWsdlFile =3D null;
- for(File f : files)
- {
- if(f.getName().endsWith(".wsdl"))
- {
- try
- {
- WSDLReader wsdlReader =3D WSDLFactory.newInstance().newWSDLReade=
r();
- Definition def =3D wsdlReader.readWSDL(f.toURL().toExternalForm(=
));
- URL url =3D new WSDLParser(def).getServiceLocationURL(myRoleEndp=
oint.serviceName, myRoleEndpoint.portName);
- if(url!=3Dnull)
- {
- targetWsdlFile =3D f;
- log.debug("Matching "+processId + " to WSDL file "+targetWsdlF=
ile);
- break;
- }
-
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
- }
-
- if(null=3D=3DtargetWsdlFile)
- throw new ContextException("Unable to find target WSDL file for "+ m=
yRoleEndpoint);
-
- return targetWsdlFile;
- }
-
+ =
public void deactivateMyRoleEndpoint(Endpoint myRoleEndpoint)
{
log.info("Deactivate my role endpoint: "+myRoleEndpoint);
@@ -195,22 +133,7 @@
Endpoint initialPartn=
erEndpoint) {
// NOTE: This implementation assumes that the initial value of the
// partner role determines the binding.
- Definition wsdlDefinition =3D null;
- URL wsdlUrl =3D null;
- if (isUDDILookup()) {
- WSDLReference wsdlReference =3D uddiRegistration.lookupWSDL(
- initialPartnerEndpoint.serviceName,
- initialPartnerEndpoint.portName);
- if (wsdlReference!=3Dnull) {
- wsdlDefinition =3D wsdlReference.getDefinition();
- wsdlUrl =3D wsdlReference.getWsdlURL();
- }
- }
- if (isUDDILookup()=3D=3Dfalse || wsdlUrl=3D=3Dnull) {
- WSDLReference wsdlReference =3D createWSDLReference(processId, initia=
lPartnerEndpoint);
- wsdlDefinition =3D wsdlReference.getDefinition();
- wsdlUrl =3D wsdlReference.getWsdlURL();
- }
+ =
=
=
// TODO: TEAM_ODE:
@@ -231,7 +154,7 @@
=
try
{
- PartnerChannel channel =3D endpointManager.createClient(endpointMD, =
wsdlDefinition, wsdlUrl, pconf);
+ PartnerChannel channel =3D endpointManager.createClient(endpointMD, =
engine , pconf);
=
return new PartnerRoleChannelImpl(channel);
}
@@ -241,29 +164,11 @@
}
}
=
- private Definition getWSDLDefinition(QName processId, QName serviceName)
- {
- ProcessConf pconf =3D engine._store.getProcessConfiguration(processId);
- Definition wsdl =3D pconf.getDefinitionForService(serviceName);
- if (wsdl =3D=3D null)
- throw new ContextException("Unable to access WSDL definition to acti=
vate MyRole endpoint for service " + serviceName
- + " on process "+ processId);
-
- return wsdl;
- }
-
+ =
public long calculateSizeofService(
org.apache.ode.bpel.iapi.EndpointReference arg0) {
// TODO Auto-generated method stub
return 0;
}
- =
- public boolean isUDDILookup() {
- return Boolean.valueOf(engine.getOdeConfig().getProperty(BPEL_UDDI_L=
OOKUP, "false"));
- }
- =
- public boolean isWebserviceSecure() {
- return Boolean.valueOf(engine.getOdeConfig().getProperty(BPEL_WEBSER=
VICE_SECURE, "false"));
- }
=
}
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/=
EndpointManager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/Endpoi=
ntManager.java 2010-06-02 13:31:07 UTC (rev 691)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/Endpoi=
ntManager.java 2010-06-02 16:28:23 UTC (rev 692)
@@ -35,6 +35,7 @@
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.kernel.Kernel;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.soa.bpel.runtime.engine.ode.BPELEngineImpl;
import org.jboss.soa.bpel.runtime.engine.ode.ExecutionEnvironment;
import org.jboss.soa.bpel.runtime.engine.ode.UDDIClientFactory;
import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration;
@@ -302,13 +303,13 @@
}
=
public WebServiceClient createClient(
- EndpointMetaData metaData,Definition wsdlDefinition, URL wsdlUrl, Pr=
ocessConf pconf)
+ EndpointMetaData metaData, BPELEngineImpl server, ProcessConf pconf)
throws EndpointManagementException
{
try
{
WebServiceClient client =3D
- new WebServiceClient(metaData, wsdlDefinition, wsdlUrl, executio=
nEnvironment, pconf);
+ new WebServiceClient(metaData, executionEnvironment, server, pco=
nf);
=
return client;
=
Added: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSD=
LHelper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSDLHe=
lper.java (rev 0)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSDLHe=
lper.java 2010-06-02 16:28:23 UTC (rev 692)
@@ -0,0 +1,75 @@
+package org.jboss.soa.bpel.runtime.ws;
+
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+
+import javax.wsdl.Definition;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.namespace.QName;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.iapi.ContextException;
+import org.apache.ode.bpel.iapi.ProcessConf;
+import org.jboss.soa.bpel.runtime.engine.ode.BPELEngineImpl;
+
+public class WSDLHelper {
+ =
+ protected final Log log =3D LogFactory.getLog(getClass());
+
+ =
+ public WSDLReference createWSDLReference(BPELEngineImpl engine, QName pr=
ocessId, QName serviceName, String portName)
+ {
+ File targetWSDLFile =3D findWSDLFile(engine, processId, serviceName, =
portName);
+ Definition wsdlDefinition =3D getWSDLDefinition(engine, processId, se=
rviceName);
+ return new WSDLReference(wsdlDefinition, targetWSDLFile.toURI());
+ }
+
+ private File findWSDLFile(BPELEngineImpl engine, QName processId, QName=
serviceName, String portName)
+ {
+ ProcessConf pconf =3D engine._store.getProcessConfiguration(processId=
);
+ List files =3D pconf.getFiles();
+ File targetWsdlFile =3D null;
+ for(File f : files)
+ {
+ if(f.getName().endsWith(".wsdl"))
+ {
+ try
+ {
+ WSDLReader wsdlReader =3D WSDLFactory.newInstance().newWSDLRead=
er();
+ Definition def =3D wsdlReader.readWSDL(f.toURL().toExternalForm=
());
+ URL url =3D new WSDLParser(def).getServiceLocationURL(serviceNa=
me, portName);
+ if(url!=3Dnull)
+ {
+ targetWsdlFile =3D f;
+ log.debug("Matching "+processId + " to WSDL file "+targetWsdl=
File);
+ break;
+ }
+
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+ if(null=3D=3DtargetWsdlFile)
+ throw new ContextException("Unable to find target WSDL file for "+ =
serviceName);
+
+ return targetWsdlFile;
+ }
+ =
+ private Definition getWSDLDefinition(BPELEngineImpl engine, QName proce=
ssId, QName serviceName)
+ {
+ ProcessConf pconf =3D engine._store.getProcessConfiguration(processId=
);
+ Definition wsdl =3D pconf.getDefinitionForService(serviceName);
+ if (wsdl =3D=3D null)
+ throw new ContextException("Unable to access WSDL definition to act=
ivate MyRole endpoint for service " + serviceName
+ + " on process "+ processId);
+
+ return wsdl;
+ }
+}
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/=
WebServiceClient.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebSer=
viceClient.java 2010-06-02 13:31:07 UTC (rev 691)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebSer=
viceClient.java 2010-06-02 16:28:23 UTC (rev 692)
@@ -47,7 +47,11 @@
import org.apache.ode.utils.DOMUtils;
import org.jboss.soa.bpel.runtime.engine.EndpointReference;
import org.jboss.soa.bpel.runtime.engine.PartnerChannel;
+import org.jboss.soa.bpel.runtime.engine.ode.BPELEngineImpl;
import org.jboss.soa.bpel.runtime.engine.ode.ExecutionEnvironment;
+import org.jboss.soa.bpel.runtime.engine.ode.UDDIClientFactory;
+import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration;
+import org.jboss.soa.bpel.runtime.integration.ServerConfigFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
=
@@ -59,17 +63,23 @@
*/
public class WebServiceClient implements PartnerChannel
{
- private static final String JAXWS_CLIENT_INITIALIZER =3D "jaxws.client=
.initializer.impl";
+ private static final String JAXWS_CLIENT_INITIALIZER =3D "jaxws.client.i=
nitializer.impl";
+//we should consider having our own OdeConfigProperties class if we need m=
ore properties
+ public final static String BPEL_UDDI_LOOKUP =3D "uddi.lookup";
+ public final static String BPEL_WEBSERVICE_SECURE =3D "webservice.secur=
e";
+ public final static String BPEL_WEBSERVICE_BASEURL =3D "webservice.baseu=
rl";
=
protected final Log log =3D LogFactory.getLog(getClass());
-
+ private boolean isInitialized=3Dfalse;
+ private BPELEngineImpl engine;
+ private UDDIRegistration uddiRegistration =3D null;
private URL wsdlUrl;
=
private String id;
=
private Dispatch dispatcher =3D null;
private EndpointMetaData metaData =3D null;
- private Definition wsdlDefintion;
+ private Definition wsdlDefinition;
=
private final QName serviceName;
private final QName port;
@@ -79,24 +89,59 @@
private ExecutionEnvironment executionEnvironment;
private java.net.URI baseURI;
=
- public WebServiceClient(EndpointMetaData metaData, Definition wsdlDefint=
ion, URL wsdlUrl , ExecutionEnvironment env,
- ProcessConf pconf)
+ public WebServiceClient(EndpointMetaData metaData, ExecutionEnvironment =
env,
+ BPELEngineImpl engine, ProcessConf pconf)
{
+ this.engine =3D engine;
this.executionEnvironment =3D env;
this.metaData =3D metaData;
- this.wsdlDefintion =3D wsdlDefintion;
- this.wsdlUrl =3D wsdlUrl;
=
this.id =3D metaData.getEndpointId();
this.serviceName =3D metaData.getServiceName();
this.port =3D new QName(serviceName.getNamespaceURI(), metaData.getPor=
tName());
-
- this.messageAdapter =3D new SOAPMessageAdapter(this.wsdlDefintion, ser=
viceName, port.getLocalPart());
=
this.baseURI =3D pconf.getBaseURI();
=
log.debug("Web Service Client: Base URI=3D"+pconf.getBaseURI());
- }
+ }
+ =
+ private synchronized void initialize() {
+ if (isUDDILookup()) {
+ try {
+ String webServiceHost =3D ServerConfigFactory.getServerConfig().get=
WebServiceHost();
+ int webServicePort =3D ServerConfigFactory.getServerConfig().getWeb=
ServicePort();
+ URL url =3D new URL("http://" + webServiceHost + ":" + webServicePo=
rt);
+ if (isWebserviceSecure()) {
+ int secureWebServicePort =3D ServerConfigFactory.getServerConfig()=
.getWebServicePort();
+ url =3D new URL("https://" + webServiceHost + ":" + secureWebServi=
cePort);
+ }
+ //give the user the option to override
+ if (engine.getOdeConfig().getProperty(BPEL_WEBSERVICE_BASEURL)=3D=
=3Dnull) {
+ engine.getOdeConfig().getProperties().setProperty(BPEL_WEBSERVICE_=
BASEURL, url.toExternalForm());
+ }
+ uddiRegistration =3D UDDIClientFactory.newInstance(engine.getOdeCon=
fig().getProperties());
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ log.error("Continuing without UDDI integration.");
+ }
+ }
+ if (isUDDILookup()) {
+ WSDLReference wsdlReference =3D uddiRegistration.lookupWSDL(
+ metaData.getServiceName(),
+ metaData.getPortName());
+ if (wsdlReference!=3Dnull) {
+ wsdlDefinition =3D wsdlReference.getDefinition();
+ wsdlUrl =3D wsdlReference.getWsdlURL();
+ }
+ }
+ if (isUDDILookup()=3D=3Dfalse || wsdlUrl=3D=3Dnull) {
+ WSDLReference wsdlReference =3D new WSDLHelper().createWSDLReference=
(engine, =
+ metaData.getProcessId(), metaData.getServiceName(), metaData.getPo=
rtName());
+ wsdlDefinition =3D wsdlReference.getDefinition();
+ wsdlUrl =3D wsdlReference.getWsdlURL();
+ }
+ isInitialized=3Dtrue;
+ }
=
public EndpointReference getEndpointReference()
{
@@ -106,8 +151,10 @@
=
public void invoke(final PartnerRoleMessageExchange mex)
{
- log.debug("Invoking dispatcher "+this.id);
-
+ if (!isInitialized) initialize();
+ log.debug("Invoking dispatcher "+this.id);
+ =
+ =
boolean isTwoWay =3D mex.getMessageExchangePattern()
=3D=3D org.apache.ode.bpel.iapi.MessageExchange.MessageExchangePat=
tern.REQUEST_RESPONSE;
=
@@ -284,7 +331,7 @@
+ "\n" + DOMWriter.printNode(odeMsgEl, true));
=
QName faultType =3D fault.getMessage().getQName();
- QName faultName =3D new QName(wsdlDefintion.getTargetNamespace(), =
fault.getName());
+ QName faultName =3D new QName(wsdlDefinition.getTargetNamespace(),=
fault.getName());
Message response =3D mex.createMessage(faultType);
response.setMessage(odeMsgEl);
=
@@ -312,12 +359,13 @@
throw new RuntimeException("Not implemented. Should be removed form in=
terface");
}
=
- private Dispatch getDispatcher(QName portName)
+ private synchronized Dispatch getDispatcher(QName portName)
{
- if(null=3D=3Ddispatcher)
- {
+ =
+ if(null=3D=3Ddispatcher) {
+ =
log.debug("Creating Dispatcher ("+this.id+") on " + wsdlUrl + ": "+s=
erviceName);
- =
+ this.messageAdapter =3D new SOAPMessageAdapter(this.wsdlDefinition, =
serviceName, port.getLocalPart());
initializeStack(portName);
=
Service service =3D Service.create(this.wsdlUrl, serviceName);
@@ -358,5 +406,16 @@
{
return "WebServiceClient {service=3D"+serviceName+",port=3D"+port+"}";
}
+ =
+ public boolean isUDDILookup() {
+ return Boolean.valueOf(engine.getOdeConfig().getProperty(BPEL_UDDI_L=
OOKUP, "false"));
+ }
+ =
+ public boolean isWebserviceSecure() {
+ return Boolean.valueOf(engine.getOdeConfig().getProperty(BPEL_WEBSER=
VICE_SECURE, "false"));
+ }
+ =
+ =
=
+
}
Modified: trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegi=
strationImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrati=
onImpl.java 2010-06-02 13:31:07 UTC (rev 691)
+++ trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrati=
onImpl.java 2010-06-02 16:28:23 UTC (rev 692)
@@ -21,10 +21,6 @@
*/
package org.jboss.soa.bpel.uddi;
=
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
import java.net.URL;
import java.rmi.RemoteException;
import java.util.List;
@@ -47,9 +43,9 @@
import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.apache.juddi.v3.client.transport.TransportException;
-import org.jboss.soa.bpel.runtime.engine.ode.JAXWSBindingContext;
import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration;
import org.jboss.soa.bpel.runtime.ws.WSDLReference;
+import org.jboss.soa.bpel.runtime.ws.WebServiceClient;
import org.uddi.api_v3.AccessPoint;
import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.BindingTemplates;
@@ -486,6 +482,6 @@
* @return
*/
private String getWebserviceBaseUrl() {
- return (properties.getProperty(JAXWSBindingContext.BPEL_WEBSERVICE_=
BASEURL, "http://localhost:8080"));
+ return (properties.getProperty(WebServiceClient.BPEL_WEBSERVICE_BAS=
EURL, "http://localhost:8080"));
}
}
Modified: trunk/runtime/uddi300/src/main/java/org/jboss/soa/bpel/uddi300/UD=
DI300RegistrationImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/runtime/uddi300/src/main/java/org/jboss/soa/bpel/uddi300/UDDI300R=
egistrationImpl.java 2010-06-02 13:31:07 UTC (rev 691)
+++ trunk/runtime/uddi300/src/main/java/org/jboss/soa/bpel/uddi300/UDDI300R=
egistrationImpl.java 2010-06-02 16:28:23 UTC (rev 692)
@@ -21,10 +21,6 @@
*/
package org.jboss.soa.bpel.uddi300;
=
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
import java.net.URL;
import java.rmi.RemoteException;
import java.util.List;
@@ -46,9 +42,9 @@
import org.apache.juddi.v3.client.config.UDDIClerk;
import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.transport.TransportException;
-import org.jboss.soa.bpel.runtime.engine.ode.JAXWSBindingContext;
import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration;
import org.jboss.soa.bpel.runtime.ws.WSDLReference;
+import org.jboss.soa.bpel.runtime.ws.WebServiceClient;
import org.uddi.api_v3.AccessPoint;
import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.BindingTemplates;
@@ -66,10 +62,13 @@
import org.uddi.v3_service.DispositionReportFaultMessage;
=
/**
+ * This implementation is to support jUDDI-client-3.0.0 which ships with
+ * JBESB-4.7, which will no longer be supported in the next release.
* =
* * @author Kurt T Stam
*
*/
+(a)Deprecated()
public class UDDI300RegistrationImpl extends AnnotationProcessor implement=
s UDDIRegistration {
=
protected static final Log log =3D LogFactory.getLog(UDDI300RegistrationI=
mpl.class);
@@ -442,6 +441,6 @@
* @return
*/
private String getWebserviceBaseUrl() {
- return (properties.getProperty(JAXWSBindingContext.BPEL_WEBSERVICE_=
BASEURL, "http://localhost:8080"));
+ return (properties.getProperty(WebServiceClient.BPEL_WEBSERVICE_BAS=
EURL, "http://localhost:8080"));
}
}
--===============3441503248557258272==--
From jboss-qa-internal at redhat.com Wed Jun 2 12:57:24 2010
Content-Type: multipart/mixed; boundary="===============2984211648297396330=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: riftsaw-commits at lists.jboss.org
Subject: [riftsaw-commits] Hudson build is still unstable: RiftSaw-postgres
#119
Date: Wed, 02 Jun 2010 12:57:23 -0400
Message-ID: <1699659399.6531275497843196.JavaMail.hudson@soa8.qa.atl2.redhat.com>
In-Reply-To: 1568305120.3981275412930795.JavaMail.hudson@soa8.qa.atl2.redhat.com
--===============2984211648297396330==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
See
--===============2984211648297396330==--
From jboss-qa-internal at redhat.com Wed Jun 2 13:59:35 2010
Content-Type: multipart/mixed; boundary="===============2018641556556795486=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: riftsaw-commits at lists.jboss.org
Subject: [riftsaw-commits] Hudson build is still unstable: RiftSaw-mysql #108
Date: Wed, 02 Jun 2010 13:59:29 -0400
Message-ID: <339935577.6711275501573260.JavaMail.hudson@soa8.qa.atl2.redhat.com>
In-Reply-To: 590513717.4031275415057115.JavaMail.hudson@soa8.qa.atl2.redhat.com
--===============2018641556556795486==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
See
--===============2018641556556795486==--
From riftsaw-commits at lists.jboss.org Wed Jun 2 14:57:04 2010
Content-Type: multipart/mixed; boundary="===============2490588779802190335=="
MIME-Version: 1.0
From: riftsaw-commits at lists.jboss.org
To: riftsaw-commits at lists.jboss.org
Subject: [riftsaw-commits] riftsaw SVN: r693 - in trunk/stress-tests:
src/test/java/org/jboss/soa/bpel/tests/performance and 1 other directory.
Date: Wed, 02 Jun 2010 14:57:04 -0400
Message-ID: <201006021857.o52Iv4PA012469@svn01.web.mwc.hst.phx2.redhat.com>
--===============2490588779802190335==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: bbrodt
Date: 2010-06-02 14:57:02 -0400 (Wed, 02 Jun 2010)
New Revision: 693
Modified:
trunk/stress-tests/pom.xml
trunk/stress-tests/src/test/java/org/jboss/soa/bpel/tests/performance/Pe=
rformanceTestCase.java
Log:
https://jira.jboss.org/browse/RIFTSAW-182
Message count is now passed in to PerformanceTestCase by maven -Dcount=3D
Modified: trunk/stress-tests/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/stress-tests/pom.xml 2010-06-02 16:28:23 UTC (rev 692)
+++ trunk/stress-tests/pom.xml 2010-06-02 18:57:02 UTC (rev 693)
@@ -278,7 +278,6 @@
${basedir}/src/test/resources/conf
${basedir}/target/rosetta.aop
- ${basedir}/bin
@@ -301,6 +300,10 @@
java.rmi.server.ignoreStubClasses
true
+
+ count
+ ${count}
+
true
Modified: trunk/stress-tests/src/test/java/org/jboss/soa/bpel/tests/perform=
ance/PerformanceTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/stress-tests/src/test/java/org/jboss/soa/bpel/tests/performance/P=
erformanceTestCase.java 2010-06-02 16:28:23 UTC (rev 692)
+++ trunk/stress-tests/src/test/java/org/jboss/soa/bpel/tests/performance/P=
erformanceTestCase.java 2010-06-02 18:57:02 UTC (rev 693)
@@ -25,11 +25,11 @@
resources =3D "src/test/resources/performance";
try
{
- System.out.println("System Property \"count\"=3D" + System.getenv("coun=
t"));
- count =3D Integer.parseInt(System.getenv("count"));
+ count =3D Integer.parseInt(System.getProperty("count"));
}
catch(Exception ex)
{
+ fail("No message count specified. Please run the build with \"-Dcount=
=3D\"");
}
=
String[] args =3D new String[3];
--===============2490588779802190335==--
From jboss-qa-internal at redhat.com Wed Jun 2 16:25:23 2010
Content-Type: multipart/mixed; boundary="===============2171905794403532633=="
MIME-Version: 1.0
From: jboss-qa-internal at redhat.com
To: riftsaw-commits at lists.jboss.org
Subject: [riftsaw-commits] Hudson build is still unstable: Riftsaw-soa-p #40
Date: Wed, 02 Jun 2010 16:25:19 -0400
Message-ID: <908683445.7191275510322230.JavaMail.hudson@soa8.qa.atl2.redhat.com>
In-Reply-To: 704304460.4251275423737337.JavaMail.hudson@soa8.qa.atl2.redhat.com
--===============2171905794403532633==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
See
--===============2171905794403532633==--
From riftsaw-commits at lists.jboss.org Wed Jun 2 22:22:30 2010
Content-Type: multipart/mixed; boundary="===============5209676271574097689=="
MIME-Version: 1.0
From: riftsaw-commits at lists.jboss.org
To: riftsaw-commits at lists.jboss.org
Subject: [riftsaw-commits] riftsaw SVN: r694 - in branches/ODE/ODE-1.x:
axis2-war/src/main/assembly and 2 other directories.
Date: Wed, 02 Jun 2010 22:22:29 -0400
Message-ID: <201006030222.o532MTRd013645@svn01.web.mwc.hst.phx2.redhat.com>
--===============5209676271574097689==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: jeff.yuchang
Date: 2010-06-02 22:22:28 -0400 (Wed, 02 Jun 2010)
New Revision: 694
Modified:
branches/ODE/ODE-1.x/BUILDING
branches/ODE/ODE-1.x/NOTICE
branches/ODE/ODE-1.x/RELEASE_NOTES
branches/ODE/ODE-1.x/Rakefile
branches/ODE/ODE-1.x/axis2-war/src/main/assembly/bin.xml
branches/ODE/ODE-1.x/axis2-war/src/main/webapp/deployment.html
branches/ODE/ODE-1.x/axis2-war/src/main/webapp/processes.html
branches/ODE/ODE-1.x/distro/src/main/assembly/jbi.xml
branches/ODE/ODE-1.x/distro/src/main/assembly/war.xml
Log:
* upgraded to the latest 1.3.4 branch, which has been voted for release atm.
Modified: branches/ODE/ODE-1.x/BUILDING
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ODE/ODE-1.x/BUILDING 2010-06-02 18:57:02 UTC (rev 693)
+++ branches/ODE/ODE-1.x/BUILDING 2010-06-03 02:22:28 UTC (rev 694)
@@ -20,17 +20,17 @@
=
* Ruby 1.8.x with RubyGems 0.9 or later. For Windows users using the Ruby=
One-Click Installer is the easiest (http://rubyforge.org/projects/rubyinst=
aller/). For Linux or Mac OS users, a Ruby interpreter is usually preinstal=
led. Just make sure to have the ruby-dev package (mkmf is needed for RJB).
=
- * Buildr. Install it by running 'gem install buildr -v 1.2.10'. A proper =
JAVA_HOME environment variable must be set. Make sure to choose either win3=
2 or ruby platforms (don't choose java for Antwrap, that's JRuby).
+ * Buildr. Install it by running 'gem install buildr -v 1.3.5'. A proper J=
AVA_HOME environment variable must be set. Make sure to choose either win32=
or ruby platforms (don't choose java for Antwrap, that's JRuby).
=
Building is then pretty simple. Open a command in the source root director=
y and run:
=
-rake package
+buildr _1.3.5_ package
=
To try the test cases bundled with ODE:
=
-rake test
+buildr _1.3.5_ test
=
-It just works! For more information about buildr see http://buildr.rubyfor=
ge.org/.
+It just works! For more information about buildr see http://buildr.apache.=
org/.
=
Running in Tomcat (WAR deployment)
----------------------------------
Modified: branches/ODE/ODE-1.x/NOTICE
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ODE/ODE-1.x/NOTICE 2010-06-02 18:57:02 UTC (rev 693)
+++ branches/ODE/ODE-1.x/NOTICE 2010-06-03 02:22:28 UTC (rev 694)
@@ -20,6 +20,19 @@
http://www.sybase.com
=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+=3D=3D Bubbling Notice =
=3D=3D
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+
+This product includes software (Javascript Bubbling Library) under a =
+BSD license.
+
+Copyright (c) 2007, Caridy Pati=EF=BF=BDo. All rights reserved.
+Portions Copyright (c) 2007, Yahoo!, Inc. All rights reserved.
+Code licensed under the BSD License:
+http://www.bubbling-library.com/eng/licence
+version: 1.5.0
+
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=3D=3D Derby Notice =
=3D=3D
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=
@@ -139,6 +152,16 @@
License 2.0
=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+=3D=3D YUI Notice =
=3D=3D
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+
+This product includes software developed by the Yahoo! Inc.
+Copyright (c) 2008, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.5.2
+
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=3D=3D OASIS Notice =
=3D=3D
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=
Modified: branches/ODE/ODE-1.x/RELEASE_NOTES
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ODE/ODE-1.x/RELEASE_NOTES 2010-06-02 18:57:02 UTC (rev 693)
+++ branches/ODE/ODE-1.x/RELEASE_NOTES 2010-06-03 02:22:28 UTC (rev 694)
@@ -2,19 +2,25 @@
Apache ODE Release Notes
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=
-Apache ODE 1.3.2 includes about 130 bug fixes and new features. =
-It's also the most stable version of ODE released so far.
+Apache ODE 1.3.4 includes about 100 bug fixes and new features. It's =
+also the most stable version of ODE released so far. =
=
-Apache ODE 1.3.2 requires Java 1.5.x. The WAR distribution can run in
-most J2EE servlet container. The JBI distribution should be able to
-run in any JBI container but has only been tested with ServiceMix
-3.1 so far. See the BUILDING file if you want to build your own
-distribution from the source release.
+Apache ODE 1.3.4 requires Java 1.5.x or higher. The WAR distribution can =
+run in most J2EE servlet container. The JBI distribution should be able =
+to run in any JBI container but has only been tested with ServiceMix 3.2.1
+and latest ServiceMix 4 (OSGi bundle) so far. See the BUILDING file if you =
+want to build your own distribution from the source release. =
=
+New Features:
+------------
+ * [ODE-483] - Instance replayer
+ * [ODE-776] - Build support for both Buildr and Maven 2/3
+ * [ODE-778] - Add a possibility to deploy processes as OSGi bundles
+ * [ODE-814] - Add spring confgurable process properties
+
Changes:
--------
+------- =
=
-See our Jira for more information:
+See our Jira for more information: =
=
-https://issues.apache.org/jira/browse/ODE/fixforversion/12313906
-
+https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=3D1231027=
0&styleName=3DHtml&version=3D12314168
Modified: branches/ODE/ODE-1.x/Rakefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ODE/ODE-1.x/Rakefile 2010-06-02 18:57:02 UTC (rev 693)
+++ branches/ODE/ODE-1.x/Rakefile 2010-06-03 02:22:28 UTC (rev 694)
@@ -126,7 +126,7 @@
end
test.setup unzip("#{webapp_dir}/WEB-INF"=3D>project("dao-jpa-ojpa-derb=
y").package(:zip))
test.setup unzip("#{webapp_dir}/WEB-INF"=3D>project("dao-hibernate-db"=
).package(:zip))
- test.exclude('*') if Buildr.environment =3D=3D 'hudson'
+ test.exclude('*') if Buildr.environment =3D=3D 'hudson' || ENV["notest=
ng"]
=
NativeDB.prepare_configs test, _(".")
=
Modified: branches/ODE/ODE-1.x/axis2-war/src/main/assembly/bin.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ODE/ODE-1.x/axis2-war/src/main/assembly/bin.xml 2010-06-02 18:=
57:02 UTC (rev 693)
+++ branches/ODE/ODE-1.x/axis2-war/src/main/assembly/bin.xml 2010-06-03 02:=
22:28 UTC (rev 694)
@@ -129,8 +129,7 @@
org.apache.geronimo.modules:geronimo-kernel
org.apache.geronimo.components:geronimo-transaction
org.apache.geronimo.components:geronimo-connector =
- org.apache.woden:woden-api =
- org.apache.woden:woden-impl-dom =
+ org.apache.woden:woden =
woodstox:wstx-asl =
org.apache.neethi:neethi =
org.apache.ws.commons.schema:XmlSchema
@@ -175,10 +174,7 @@
/WEB-INF/modules
- org.apache.rampart:rampart:mar
- org.apache.rampart:rahas:mar
- org.apache.axis2:addressing:mar
- org.apache.axis2:mex:mar =
+ org.apache.axis2:addressing:mar
=
Modified: branches/ODE/ODE-1.x/axis2-war/src/main/webapp/deployment.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ODE/ODE-1.x/axis2-war/src/main/webapp/deployment.html 2010-06-=
02 18:57:02 UTC (rev 693)
+++ branches/ODE/ODE-1.x/axis2-war/src/main/webapp/deployment.html 2010-06-=
03 02:22:28 UTC (rev 694)
@@ -7,7 +7,7 @@
-
+