riftsaw SVN: r394 - trunk/distribution/src/main/release.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2009-12-16 06:29:54 -0500 (Wed, 16 Dec 2009)
New Revision: 394
Modified:
trunk/distribution/src/main/release/ReleaseNotes.txt
Log:
Updated release note URL.
Modified: trunk/distribution/src/main/release/ReleaseNotes.txt
===================================================================
--- trunk/distribution/src/main/release/ReleaseNotes.txt 2009-12-16 10:48:49 UTC (rev 393)
+++ trunk/distribution/src/main/release/ReleaseNotes.txt 2009-12-16 11:29:54 UTC (rev 394)
@@ -7,7 +7,7 @@
a new GWT based admin console, and database support for HSQL, MYSQL and Postgres.
The detailed report for this release can be found at:
-https://jira.jboss.org/jira/secure/ConfigureReport.jspa?versions=12314239§ions=.1.7.2.4.10.9.8.3.12.11.5&style=none&selectedProjectId=12310843&reportKey=pl.net.mamut%3Areleasenotes&Next=Next
+https://jira.jboss.org/jira/secure/ReleaseNote.jspa?version=12314239&styleName=Html&projectId=12310843&Create=Create
Known Issues:
15 years, 9 months
riftsaw SVN: r393 - in branches/ODE/ODE-2.0-maven: jacob and 1 other directory.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2009-12-16 05:48:49 -0500 (Wed, 16 Dec 2009)
New Revision: 393
Added:
branches/ODE/ODE-2.0-maven/jacob/pom.xml
Modified:
branches/ODE/ODE-2.0-maven/pom.xml
Log:
* add pom file for jacob module.
Added: branches/ODE/ODE-2.0-maven/jacob/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/jacob/pom.xml (rev 0)
+++ branches/ODE/ODE-2.0-maven/jacob/pom.xml 2009-12-16 10:48:49 UTC (rev 393)
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jacob</artifactId>
+ <packaging>jar</packaging>
+ <name>ODE :: Java Concurrent Objects (JACOB)</name>
+ <parent>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jacob-ap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>apt-maven-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <configuration>
+ <factory>org.apache.ode.jacob.ap.JacobAnnotationProcessorFactory</factory>
+ <outputDirectory>target/generated/apt</outputDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ <goal>test-process</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jacob-ap</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: branches/ODE/ODE-2.0-maven/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/pom.xml 2009-12-16 09:43:03 UTC (rev 392)
+++ branches/ODE/ODE-2.0-maven/pom.xml 2009-12-16 10:48:49 UTC (rev 393)
@@ -99,6 +99,7 @@
<modules>
<module>utils</module>
<module>jacob-ap</module>
+ <module>jacob</module>
</modules>
<build>
@@ -335,6 +336,11 @@
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
+ <artifactId>ode-jacob-ap</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
<artifactId>ode-jacob</artifactId>
<version>${project.version}</version>
</dependency>
15 years, 9 months
riftsaw SVN: r392 - trunk/integration-tests.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2009-12-16 04:43:03 -0500 (Wed, 16 Dec 2009)
New Revision: 392
Modified:
trunk/integration-tests/pom.xml
Log:
Re-enable integration tests.
Modified: trunk/integration-tests/pom.xml
===================================================================
--- trunk/integration-tests/pom.xml 2009-12-16 08:31:12 UTC (rev 391)
+++ trunk/integration-tests/pom.xml 2009-12-16 09:43:03 UTC (rev 392)
@@ -277,19 +277,7 @@
<excludes>
<exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELAtmTestCase.java</exclude>
<exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELPurchaseTestCase.java</exclude>
- <!--exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELTravelAgencyTestCase.java</exclude-->
- <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java</exclude>
- <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java</exclude>
- <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java</exclude>
- <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java</exclude>
- <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationTestCase.java</exclude>
- <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleInvokeTestCase.java</exclude>
- <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java</exclude>
- <exclude>org/jboss/soa/bpel/tests/samples/QuickstartESBBPELHelloWorldTestCase.java</exclude>
- <exclude>org/jboss/soa/bpel/tests/samples/QuickstartESBBPELLoanFaultTestCase.java</exclude>
- <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java</exclude>
- <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java</exclude>
- <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java</exclude>
+ <exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELTravelAgencyTestCase.java</exclude>
</excludes>
</configuration>
<executions>
15 years, 9 months
riftsaw SVN: r391 - in branches/ODE/ODE-2.0-maven: jacob-ap and 1 other directory.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2009-12-16 03:31:12 -0500 (Wed, 16 Dec 2009)
New Revision: 391
Added:
branches/ODE/ODE-2.0-maven/jacob-ap/pom.xml
Modified:
branches/ODE/ODE-2.0-maven/pom.xml
Log:
* add pom for jacob-ap module.
Added: branches/ODE/ODE-2.0-maven/jacob-ap/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/jacob-ap/pom.xml (rev 0)
+++ branches/ODE/ODE-2.0-maven/jacob-ap/pom.xml 2009-12-16 08:31:12 UTC (rev 391)
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<project>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jacob-ap</artifactId>
+ <packaging>jar</packaging>
+ <name>ODE :: Java Concurrent Objects (JACOB) - APT</name>
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>sun.jdk</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.5.0</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+
+
+</project>
Modified: branches/ODE/ODE-2.0-maven/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/pom.xml 2009-12-16 03:24:53 UTC (rev 390)
+++ branches/ODE/ODE-2.0-maven/pom.xml 2009-12-16 08:31:12 UTC (rev 391)
@@ -93,12 +93,12 @@
<derby.version>10.1.2.1</derby.version>
<xstream.version>1.2</xstream.version>
<junit.version>4.3.1</junit.version>
-
</properties>
<modules>
<module>utils</module>
+ <module>jacob-ap</module>
</modules>
<build>
15 years, 9 months
riftsaw SVN: r390 - trunk/runtime/engine-assembly/src/main/resources/bpel-sql.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2009-12-15 22:24:53 -0500 (Tue, 15 Dec 2009)
New Revision: 390
Modified:
trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql
trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql
Log:
* RIFTSAW-139
Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql
===================================================================
--- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql 2009-12-15 18:31:02 UTC (rev 389)
+++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql 2009-12-16 03:24:53 UTC (rev 390)
@@ -41,6 +41,7 @@
create table BPEL_XML_DATA (ID bigint not null auto_increment, LDATA_ID bigint, NAME varchar(255) not null, SCOPE_ID bigint, PIID bigint, IS_SIMPLE_TYPE bit, INSERT_TIME datetime, MLOCK integer not null, primary key (ID));
create table LARGE_DATA (ID bigint not null auto_increment, BIN_DATA blob, INSERT_TIME datetime, MLOCK integer not null, primary key (ID));
create table VAR_PROPERTY (ID bigint not null auto_increment, XML_DATA_ID bigint, PROP_VALUE varchar(255), PROP_NAME varchar(255) not null, INSERT_TIME datetime, MLOCK integer not null, primary key (ID));
+
create index IDX_CORRELATOR_CID on BPEL_CORRELATOR (CID);
create index IDX_BPEL_CORRELATOR_MESSAGE_CKEY on BPEL_CORRELATOR_MESSAGE_CKEY (CKEY);
create index IDX_SELECTOR_CORRELATOR on BPEL_SELECTORS (CORRELATOR);
@@ -48,3 +49,41 @@
create index IDX_SELECTOR_SELGRPID on BPEL_SELECTORS (SELGRPID);
create index IDX_UNMATCHED_CKEY on BPEL_UNMATCHED (CORRELATION_KEY);
create index IDX_UNMATCHED_CORRELATOR on BPEL_UNMATCHED (CORRELATOR);
+
+create index IDX_XMLDATA_IID on BPEL_XML_DATA (PIID) ;
+create index IDX_XMLDATA_LDATA_ID on BPEL_XML_DATA (LDATA_ID) ;
+create index IDX_XMLDATA_SID on BPEL_XML_DATA (SCOPE_ID) ;
+create index IDX_XMLDATA_NAME on BPEL_XML_DATA (NAME) ;
+create index IDX_XMLDATA_NAME_SID on BPEL_XML_DATA (NAME, SCOPE_ID) ;
+create index IDX_EVENT_IID on BPEL_EVENT (IID) ;
+create index IDX_EVENT_PID on BPEL_EVENT (PID) ;
+create index IDX_CORR_SET_NAME on BPEL_CORRELATION_SET (CORR_SET_NAME) ;
+create index IDX_CORR_SET_SCOPE_ID on BPEL_CORRELATION_SET (SCOPE_ID) ;
+create index IDX_BPEL_INSTANCE_PROCESS_ID on BPEL_INSTANCE (PROCESS_ID) ;
+create index IDX_BPEL_INSTANCE_STATE on BPEL_INSTANCE (STATE) ;
+create index IDX_BPEL_PROCESS_TYPE_NAME on BPEL_PROCESS (type_name) ;
+create index IDX_BPEL_PROCESS_TYPE_NS on BPEL_PROCESS (type_ns) ;
+create index IDX_BPEL_CORRELATOR_PROCESS_ID on BPEL_CORRELATOR (PROCESS_ID) ;
+create index IDX_UNMATCHED_CORRELATOR_CKEY on BPEL_UNMATCHED (CORRELATOR,CORRELATION_KEY) ;
+create index IDX_RECOVERY_LDATAID on BPEL_ACTIVITY_RECOVERY (LDATA_ID) ;
+create index IDX_EVENT_LDATAID on BPEL_EVENT (LDATA_ID) ;
+create index IDX_FAULT_LDATAID on BPEL_FAULT (LDATA_ID) ;
+create index IDX_MESSAGE_LDATAID on BPEL_MESSAGE (DATA) ;
+create index IDX_INSTANCE_LDATAID on BPEL_INSTANCE (JACOB_STATE) ;
+create index IDX_MEXCEPR_LDATAID on BPEL_MESSAGE_EXCHANGE (LDATA_CEPR_ID) ;
+create index IDX_MEXEPR_LDATAID on BPEL_MESSAGE_EXCHANGE (LDATA_EPR_ID) ;
+create index IDX_PLINK_VAL_PROCESS_IDX on BPEL_PLINK_VAL (PROCESS) ;
+create index IDX_PLINK_VAL_SCOPE on BPEL_PLINK_VAL (SCOPE) ;
+create index IDX_PLINKMYR_LDATAID on BPEL_PLINK_VAL (MYROLE_EPR) ;
+create index IDX_PLINKPR_LDATAID on BPEL_PLINK_VAL (PARTNERROLE_EPR) ;
+create index IDX_PLINK_VAL_MODELID on BPEL_PLINK_VAL (MODELID) ;
+create index IDX_SELECTOR_INSTANCE on BPEL_SELECTORS (PIID) ;
+create index IDX_VARPROP_XMLDATA on VAR_PROPERTY (XML_DATA_ID) ;
+create index IDX_VARPROP_NAME on VAR_PROPERTY (PROP_NAME) ;
+create index IDX_VARPROP_VALUE on VAR_PROPERTY (PROP_VALUE) ;
+create index IDX_UNMATCHED_MEX on BPEL_UNMATCHED (MEX) ;
+create index IDX_MESSAGE_MEX on BPEL_MESSAGE(MEX);
+create index IDX_MESSAGE_EXCHANGE_PIID on BPEL_MESSAGE_EXCHANGE(PIID);
+create index IDX_SCOPE_PIID on BPEL_SCOPE(PIID);
+create index IDX_LARGE_DATA_ID on LARGE_DATA(ID);
+create index IDX_BPEL_MEX_PROPS_MEX on BPEL_MEX_PROPS (MEX) ;
Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql
===================================================================
--- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql 2009-12-15 18:31:02 UTC (rev 389)
+++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql 2009-12-16 03:24:53 UTC (rev 390)
@@ -38,6 +38,7 @@
create table BPEL_XML_DATA (ID int8 not null, LDATA_ID int8, NAME varchar(255) not null, SCOPE_ID int8, PIID int8, IS_SIMPLE_TYPE bool, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
create table LARGE_DATA (ID int8 not null, BIN_DATA bytea, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
create table VAR_PROPERTY (ID int8 not null, XML_DATA_ID int8, PROP_VALUE varchar(255), PROP_NAME varchar(255) not null, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID));
+
create index IDX_CORRELATOR_CID on BPEL_CORRELATOR (CID);
create index IDX_BPEL_CORRELATOR_MESSAGE_CKEY on BPEL_CORRELATOR_MESSAGE_CKEY (CKEY);
create index IDX_SELECTOR_CORRELATOR on BPEL_SELECTORS (CORRELATOR);
@@ -46,3 +47,41 @@
create index IDX_UNMATCHED_CKEY on BPEL_UNMATCHED (CORRELATION_KEY);
create index IDX_UNMATCHED_CORRELATOR on BPEL_UNMATCHED (CORRELATOR);
create sequence hibernate_sequence;
+
+create index IDX_XMLDATA_IID on BPEL_XML_DATA (PIID) ;
+create index IDX_XMLDATA_LDATA_ID on BPEL_XML_DATA (LDATA_ID) ;
+create index IDX_XMLDATA_SID on BPEL_XML_DATA (SCOPE_ID) ;
+create index IDX_XMLDATA_NAME on BPEL_XML_DATA (NAME) ;
+create index IDX_XMLDATA_NAME_SID on BPEL_XML_DATA (NAME, SCOPE_ID) ;
+create index IDX_EVENT_IID on BPEL_EVENT (IID) ;
+create index IDX_EVENT_PID on BPEL_EVENT (PID) ;
+create index IDX_CORR_SET_NAME on BPEL_CORRELATION_SET (CORR_SET_NAME) ;
+create index IDX_CORR_SET_SCOPE_ID on BPEL_CORRELATION_SET (SCOPE_ID) ;
+create index IDX_BPEL_INSTANCE_PROCESS_ID on BPEL_INSTANCE (PROCESS_ID) ;
+create index IDX_BPEL_INSTANCE_STATE on BPEL_INSTANCE (STATE) ;
+create index IDX_BPEL_PROCESS_TYPE_NAME on BPEL_PROCESS (type_name) ;
+create index IDX_BPEL_PROCESS_TYPE_NS on BPEL_PROCESS (type_ns) ;
+create index IDX_BPEL_CORRELATOR_PROCESS_ID on BPEL_CORRELATOR (PROCESS_ID) ;
+create index IDX_UNMATCHED_CORRELATOR_CKEY on BPEL_UNMATCHED (CORRELATOR,CORRELATION_KEY) ;
+create index IDX_RECOVERY_LDATAID on BPEL_ACTIVITY_RECOVERY (LDATA_ID) ;
+create index IDX_EVENT_LDATAID on BPEL_EVENT (LDATA_ID) ;
+create index IDX_FAULT_LDATAID on BPEL_FAULT (LDATA_ID) ;
+create index IDX_MESSAGE_LDATAID on BPEL_MESSAGE (DATA) ;
+create index IDX_INSTANCE_LDATAID on BPEL_INSTANCE (JACOB_STATE) ;
+create index IDX_MEXCEPR_LDATAID on BPEL_MESSAGE_EXCHANGE (LDATA_CEPR_ID) ;
+create index IDX_MEXEPR_LDATAID on BPEL_MESSAGE_EXCHANGE (LDATA_EPR_ID) ;
+create index IDX_PLINK_VAL_PROCESS_IDX on BPEL_PLINK_VAL (PROCESS) ;
+create index IDX_PLINK_VAL_SCOPE on BPEL_PLINK_VAL (SCOPE) ;
+create index IDX_PLINKMYR_LDATAID on BPEL_PLINK_VAL (MYROLE_EPR) ;
+create index IDX_PLINKPR_LDATAID on BPEL_PLINK_VAL (PARTNERROLE_EPR) ;
+create index IDX_PLINK_VAL_MODELID on BPEL_PLINK_VAL (MODELID) ;
+create index IDX_SELECTOR_INSTANCE on BPEL_SELECTORS (PIID) ;
+create index IDX_VARPROP_XMLDATA on VAR_PROPERTY (XML_DATA_ID) ;
+create index IDX_VARPROP_NAME on VAR_PROPERTY (PROP_NAME) ;
+create index IDX_VARPROP_VALUE on VAR_PROPERTY (PROP_VALUE) ;
+create index IDX_UNMATCHED_MEX on BPEL_UNMATCHED (MEX) ;
+create index IDX_MESSAGE_MEX on BPEL_MESSAGE(MEX);
+create index IDX_MESSAGE_EXCHANGE_PIID on BPEL_MESSAGE_EXCHANGE(PIID);
+create index IDX_SCOPE_PIID on BPEL_SCOPE(PIID);
+create index IDX_LARGE_DATA_ID on LARGE_DATA(ID);
+create index IDX_BPEL_MEX_PROPS_MEX on BPEL_MEX_PROPS (MEX) ;
15 years, 9 months
riftsaw SVN: r389 - in trunk: distribution/src/main/release/db/juddi and 5 other directories.
by riftsaw-commits@lists.jboss.org
Author: kurtstam
Date: 2009-12-15 13:31:02 -0500 (Tue, 15 Dec 2009)
New Revision: 389
Added:
trunk/distribution/src/main/release/db/juddi/
trunk/distribution/src/main/release/db/juddi/esb.juddi.client.xml
trunk/distribution/src/main/release/db/juddi/jbossesb_BusinessEntity.xml
trunk/distribution/src/main/release/db/juddi/jbossesb_tModels.xml
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/UDDIRegistration.java
Modified:
trunk/distribution/src/main/release/db/bpel.properties
trunk/distribution/src/main/release/install/build.xml
trunk/runtime/engine-assembly/src/main/resources/bpel.properties
trunk/runtime/engine/pom.xml
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
Log:
RIFTSAW-11, adding jUDDI integration
Modified: trunk/distribution/src/main/release/db/bpel.properties
===================================================================
--- trunk/distribution/src/main/release/db/bpel.properties 2009-12-15 17:41:39 UTC (rev 388)
+++ trunk/distribution/src/main/release/db/bpel.properties 2009-12-15 18:31:02 UTC (rev 389)
@@ -87,6 +87,10 @@
bpel.db.mode=EXTERNAL
bpel.db.ext.dataSource=java:BPELDB
+# if set to true will self-register BPEL endpoints upon deployment to a UDDI.
+# this uses the juddi-client-3.0.0 and the uddi client config can be set in the uddi.xml
+# file
+bpel.uddi.registration=true
hibernate.dialect=@dialect@
hibernate.hbm2ddl.auto=update
Added: trunk/distribution/src/main/release/db/juddi/esb.juddi.client.xml
===================================================================
--- trunk/distribution/src/main/release/db/juddi/esb.juddi.client.xml (rev 0)
+++ trunk/distribution/src/main/release/db/juddi/esb.juddi.client.xml 2009-12-15 18:31:02 UTC (rev 389)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<uddi>
+ <reloadDelay>5000</reloadDelay>
+ <manager name="test-manager">
+ <nodes>
+ <node>
+ <!-- required 'default' node -->
+ <name>default</name>
+ <description>Main jUDDI node</description>
+ <properties>
+ <property name="keyDomain" value="esb.jboss.org"/>
+ <property name="businessKey" value="redhat-jboss"/>
+ <property name="serviceDescription" value="BPEL Service deployed by Riftsaw"/>
+ <property name="bindingDescription" value="BPEL Endpoint deployed by Riftsaw"/>
+ </properties>
+ <!-- JAX-WS Transport
+ <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+ <custodyTransferUrl>http://${jboss.esb.bind.address}:8080/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
+ <inquiryUrl>http://${jboss.esb.bind.address}:8080/juddiv3/services/inquiry?wsdl</inquiryUrl>
+ <publishUrl>http://${jboss.esb.bind.address}:8080/juddiv3/services/publish?wsdl</publishUrl>
+ <securityUrl>http://${jboss.esb.bind.address}:8080/juddiv3/services/security?wsdl</securityUrl>
+ <subscriptionUrl>http://${jboss.esb.bind.address}:8080/juddiv3/services/subscription?wsdl</subscriptionUrl>
+ <subscriptionListenerUrl>http://${jboss.esb.bind.address}:8080/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
+ <juddiApiUrl>http://${jboss.esb.bind.address}:8080/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
+ -->
+ <!-- In VM Transport Settings -->
+ <proxyTransport>org.jboss.internal.soa.esb.registry.client.JuddiInVMTransport</proxyTransport>
+ <custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
+ <inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl>
+ <publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl>
+ <securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl>
+ <subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl>
+ <subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl>
+ <juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl>
+ <!-- RMI Transport Settings
+ <proxyTransport>org.apache.juddi.v3.client.transport.RMITransport</proxyTransport>
+ <custodyTransferUrl>/juddiv3/UDDICustodyTransferService</custodyTransferUrl>
+ <inquiryUrl>/juddiv3/UDDIInquiryService</inquiryUrl>
+ <publishUrl>/juddiv3/UDDIPublicationService</publishUrl>
+ <securityUrl>/juddiv3/UDDISecurityService</securityUrl>
+ <subscriptionUrl>/juddiv3/UDDISubscriptionService</subscriptionUrl>
+ <subscriptionListenerUrl>/juddiv3/UDDISubscriptionListenerService</subscriptionListenerUrl>
+ <juddiApiUrl>/juddiv3/JUDDIApiService</juddiApiUrl>
+ <javaNamingFactoryInitial>org.jnp.interfaces.NamingContextFactory</javaNamingFactoryInitial>
+ <javaNamingFactoryUrlPkgs>org.jboss.naming</javaNamingFactoryUrlPkgs>
+ <javaNamingProviderUrl>jnp://${jboss.esb.bind.address}:1099</javaNamingProviderUrl>
+ -->
+ </node>
+ </nodes>
+ <clerks registerOnStartup="true">
+ <clerk name="BPELClerk" node="default" publisher="jbossesb" password="jbossesb" />
+ </clerks>
+ </manager>
+</uddi>
Added: trunk/distribution/src/main/release/db/juddi/jbossesb_BusinessEntity.xml
===================================================================
--- trunk/distribution/src/main/release/db/juddi/jbossesb_BusinessEntity.xml (rev 0)
+++ trunk/distribution/src/main/release/db/juddi/jbossesb_BusinessEntity.xml 2009-12-15 18:31:02 UTC (rev 389)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+ <!--
+ This file contains the root business entity structure that represents your registry. The key chosen (or generated) for this entity will serve
+ as the node id for all entities published within the registry. The services contained within this business entity reflect the UDDI APIs that
+ you wish to support (adding or subtracting the services here will not enable/disable them, simply add/omit them from being discovered via UDDI).
+
+ The top-level business entity and sub-entities all use keys as unique identifiers. They are left blank by default which means the system will
+ generate a key (generated as root partition with GUID appended). You can choose to create your own, human-readable keys but they must match
+ the root key generator created in the root_tModelKeyGen.xml file. Matching means they must equal the root key generator with the keyword
+ "keygenerator" replaced by your own string.
+
+ Example:
+
+ root_tModelKeyGen.xml key is uddi:www.mycompany.com:registry:keygenerator
+
+ Legal user-defined keys are:
+
+ uddi:www.mycompany.com:registry:ubr-node (for the businessKey)
+ uddi:www.mycompany.com:registry:inquiry-service (for the inquiry service service key)
+ uddi:www.mycompany.com:registry:inquiry-service-wsdlDeployment (for the inquiry service binding template that represents the WSDL)
+
+
+ See below for other fields that you may want to edit...
+ -->
+<businessEntity xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" businessKey="uddi:esb.jboss.org:redhat-jboss">
+ <name xml:lang="en">JBossESB Business</name>
+ <!-- Change the description field to provided a brief description of your registry -->
+ <description xml:lang="en">The business that owns all the services deployed by JBossESB and Riftsaw</description>
+</businessEntity>
+
+
+
+
Added: trunk/distribution/src/main/release/db/juddi/jbossesb_tModels.xml
===================================================================
--- trunk/distribution/src/main/release/db/juddi/jbossesb_tModels.xml (rev 0)
+++ trunk/distribution/src/main/release/db/juddi/jbossesb_tModels.xml 2009-12-15 18:31:02 UTC (rev 389)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+<save_tModel xmlns="urn:uddi-org:api_v3">
+ <tModel tModelKey="uddi:esb.jboss.org:keygenerator" xmlns="urn:uddi-org:api_v3">
+ <name>esb-jboss-org:keyGenerator</name>
+ <description>JBossESB domain key generator</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#keyGen</overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
+ keyValue="keyGenerator" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:jboss.org:esb" xmlns="urn:uddi-org:api_v3">
+ <name>org.jboss.soa.esb.:category</name>
+ <description>JBoss ESB category</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://www.jboss.org/community/wiki/JbossesbJAXR</overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:xml"
+ keyValue="xmlSpec" />
+ </categoryBag>
+ </tModel>
+</save_tModel>
Modified: trunk/distribution/src/main/release/install/build.xml
===================================================================
--- trunk/distribution/src/main/release/install/build.xml 2009-12-15 17:41:39 UTC (rev 388)
+++ trunk/distribution/src/main/release/install/build.xml 2009-12-15 18:31:02 UTC (rev 389)
@@ -87,6 +87,7 @@
<!--install appropriate db driver-->
<antcall target="internal.install.riftsaw.into.jboss.db.${database}" />
+ <antcall target="deploy.esb.uddi.config"/>
<!-- BPM Console -->
<mkdir dir="${deploy.dir}/bpel-console"/>
@@ -111,6 +112,7 @@
<!--uninstall appropriate db driver-->
<antcall target="internal.uninstall.riftsaw.into.jboss.db.${database}" />
+ <antcall target="undeploy.esb.uddi.config"/>
<delete dir="${deploy.dir}/bpel-console" />
<delete file="${server.lib.dir}/gwt-console-server-integration.jar"/>
@@ -229,5 +231,32 @@
<echo> deleting the duplicated juddi service</echo>
<delete dir="${deploy.dir}/juddi-service.sar"/>
</target>
+
+ <target name="check.jbossesb">
+ <condition property="is.jbossesb">
+ <available file="${deploy.dir}/jbossesb.sar" />
+ </condition>
+ </target>
+
+ <target name="deploy.esb.uddi.config" if="is.jbossesb" depends="check.jbossesb">
+ <echo>deploy jUDDI configuration</echo>
+ <move file="${deploy.dir}/jbossesb.sar/esb.juddi.client.xml" tofile="${deploy.dir}/jbossesb.sar/esb.juddi.client.xml.old"/>
+ <copy file="../db/juddi/esb.juddi.client.xml"
+ todir="${deploy.dir}/jbossesb.sar" />
+ <move file="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/jbossesb_tModels.xml"
+ tofile="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/jbossesb_tModels.xml.old"/>
+ <copy file="../db/juddi/jbossesb_tModels.xml"
+ todir="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/" />
+ <copy file="../db/juddi/jbossesb_BusinessEntity.xml"
+ todir="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/" />
+ </target>
+
+ <target name="undeploy.esb.uddi.config" if="is.jbossesb" depends="check.jbossesb">
+ <echo>undeploy jUDDI configuration</echo>
+ <move file="${deploy.dir}/jbossesb.sar/esb.juddi.client.xml.old" tofile="${deploy.dir}/jbossesb.sar/esb.juddi.client.xml"/>
+ <move file="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/jbossesb_tModels.xml.old"
+ tofile="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/jbossesb_tModels.xml"/>
+ <delete file="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/jbossesb_BusinessEntity.xml" />
+ </target>
</project>
Modified: trunk/runtime/engine/pom.xml
===================================================================
--- trunk/runtime/engine/pom.xml 2009-12-15 17:41:39 UTC (rev 388)
+++ trunk/runtime/engine/pom.xml 2009-12-15 18:31:02 UTC (rev 389)
@@ -125,8 +125,14 @@
<artifactId>h2</artifactId>
<scope>provided</scope>
</dependency>
+ <!-- UDDI v3 -->
+ <dependency>
+ <artifactId>juddi-client</artifactId>
+ <groupId>org.apache.juddi</groupId>
+ <version>3.0.0</version>
+ <scope>provided</scope>
+ </dependency>
-
</dependencies>
Added: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/UDDIRegistration.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/UDDIRegistration.java (rev 0)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/UDDIRegistration.java 2009-12-15 18:31:02 UTC (rev 389)
@@ -0,0 +1,272 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.bpel.runtime.engine.ode;
+
+import java.rmi.RemoteException;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.xml.namespace.QName;
+
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.api_v3.AccessPointType;
+import org.apache.juddi.v3.annotations.AnnotationProcessor;
+import org.apache.juddi.v3.client.config.TokenResolver;
+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.ws.EndpointMetaData;
+import org.jboss.soa.bpel.runtime.ws.ServiceEndpointReference;
+import org.jboss.soa.bpel.runtime.ws.WSDLReference;
+import org.uddi.api_v3.AccessPoint;
+import org.uddi.api_v3.BindingTemplate;
+import org.uddi.api_v3.BindingTemplates;
+import org.uddi.api_v3.BusinessService;
+import org.uddi.api_v3.CategoryBag;
+import org.uddi.api_v3.Description;
+import org.uddi.api_v3.Name;
+import org.uddi.api_v3.TModelInstanceDetails;
+import org.uddi.api_v3.TModelInstanceInfo;
+import org.uddi.v3_service.DispositionReportFaultMessage;
+
+/**
+ *
+ * * @author Kurt T Stam <kurt.stam(a)jboss.com>
+ *
+ */
+public class UDDIRegistration extends AnnotationProcessor {
+
+ protected static final Log log = LogFactory.getLog(UDDIRegistration.class);
+ public static final String BPEL_CLERK = "BPELClerk";
+ public static final String DEFAULT_SERVICE_KEY_FORMAT = "uddi:${keyDomain}:bpel-services-";
+ public static final String DEFAULT_BINDING_KEY_FORMAT = "uddi:${keyDomain}:bindings-";
+ //Can be set in the uddi.xml property section
+ public static final String LANG = "lang";
+ public static final String SERVICE_DESCRIPTION = "serviceDescription";
+ public static final String SERVICE_CATEGORY_BAG = "serviceCategoryBag";
+ public static final String BINDING_DESCRIPTION = "bindingDescription";
+ public static final String BINDING_CATEGORY_BAG = "bindingCategoryBag";
+ public static final String BINDING_TMODEL_KEYS = "bindingTModelKeys";
+ public static final String SERVICE_KEY_FORMAT = "serviceKeyFormat";
+ public static final String BINDING_KEY_FORMAT = "bindingKeyFormat";
+
+
+ /**
+ * Registers a BPEL ServiceEndpointReference (EPR) into a UDDI registry using the jUDDI client code.
+ * If the serviceKey does not already exist we register the service along with the EPR.
+ *
+ * @param EPR
+ * @param metaData
+ * @param wsdlRef
+ */
+ public void registerEPR(EndpointMetaData metaData, WSDLReference wsdlRef) {
+ boolean selfRegister = false;
+ try {
+ selfRegister = UDDIClerkManager.getClientConfig().isRegisterOnStartup();
+ if (selfRegister) {
+ Map<String,UDDIClerk> clerks = UDDIClerkManager.getClientConfig().getUDDIClerks();
+ UDDIClerk bpelClerk = clerks.get(BPEL_CLERK);
+ if (bpelClerk!=null) {
+ try {
+ BusinessService service = createBusinessService(bpelClerk, metaData, wsdlRef);
+ bpelClerk.register(service, bpelClerk.getUDDINode().getApiNode());
+ } catch (Exception e) {
+ log.error("Unable to register service " + metaData.getServiceName()
+ + " ." + e.getMessage(),e);
+ } catch (Throwable t) {
+ log.error("Unable to register service " + metaData.getServiceName()
+ + " ." + t.getMessage(),t);
+ }
+ } else {
+ throw new ConfigurationException("Could not find UDDI Clerk named "+ BPEL_CLERK);
+ }
+ }
+ } catch (ConfigurationException ce) {
+ if (selfRegister) {
+ log.error(ce.getMessage(),ce);
+ } else {
+ log.info(ce.getMessage());
+ }
+ }
+ }
+ /**
+ * UnRegisters the binding from the UDDI Registry.
+ * @param EPR
+ * @param metaData
+ * @param wsdlRef
+ */
+ public void unRegisterEPR(QName service, String port) {
+ boolean selfRegister = false;
+ try {
+ selfRegister = UDDIClerkManager.getClientConfig().isRegisterOnStartup();
+ if (selfRegister) {
+ Map<String,UDDIClerk> clerks = UDDIClerkManager.getClientConfig().getUDDIClerks();
+ UDDIClerk bpelClerk = clerks.get(BPEL_CLERK);
+ String bindingName = service.getLocalPart() + "-" + port;
+ if (bpelClerk!=null) {
+ try {
+ Properties properties = bpelClerk.getUDDINode().getProperties();
+ //Constructing the bindingKey
+ String bindingKey = TokenResolver.replaceTokens(DEFAULT_BINDING_KEY_FORMAT + bindingName, properties);
+ if (properties.containsKey(BINDING_KEY_FORMAT)) {
+ bindingKey = TokenResolver.replaceTokens((String)properties.get(BINDING_KEY_FORMAT) + bindingName, properties);
+ }
+ bindingKey = bindingKey.toLowerCase();
+ //Lookup the binding
+ BindingTemplate binding = null;
+ try {
+ binding = bpelClerk.findServiceBinding(bindingKey, bpelClerk.getUDDINode().getApiNode());
+ //TODO Kurt: Just delete this binding -not all bindings- upgrade the jUDDI client to support this.
+ BusinessService businessService = bpelClerk.findService(binding.getServiceKey(), bpelClerk.getUDDINode().getApiNode());
+ bpelClerk.unRegister(businessService, bpelClerk.getUDDINode().getApiNode());
+ } catch (Exception e) {
+ log.warn("Could not find BindingTemplate with key " + bindingKey + " for unRegistration.");
+ }
+ } catch (Exception e) {
+ log.error("Unable to unRegister EPR " + bindingName
+ + " ." + e.getMessage(),e);
+ } catch (Throwable t) {
+ log.error("Unable to unRegister EPR " + bindingName
+ + " ." + t.getMessage(),t);
+ }
+ } else {
+ throw new ConfigurationException("Could not find UDDI Clerk named "+ BPEL_CLERK);
+ }
+ }
+ } catch (ConfigurationException ce) {
+ if (selfRegister) {
+ log.error(ce.getMessage(),ce);
+ } else {
+ log.info(ce.getMessage());
+ }
+ }
+ }
+
+ private BusinessService createBusinessService(UDDIClerk clerk,
+ EndpointMetaData metaData, WSDLReference wsdlRef)
+ throws DispositionReportFaultMessage, RemoteException, ConfigurationException, TransportException {
+ Properties properties = clerk.getUDDINode().getProperties();
+ //Constructing the serviceKey
+ String serviceKey = TokenResolver.replaceTokens(DEFAULT_SERVICE_KEY_FORMAT + metaData.getServiceName().getLocalPart(), properties);
+ if (properties.containsKey(SERVICE_KEY_FORMAT)) {
+ serviceKey = TokenResolver.replaceTokens((String)properties.get(SERVICE_KEY_FORMAT) + metaData.getServiceName(), properties);
+ }
+ BusinessService service = null;
+ try {
+ //Checking if this serviceKey already exist
+ service = clerk.findService(serviceKey, clerk.getUDDINode().getApiNode());
+ log.debug("Service " + metaData.getServiceName() + " already present in the UDDI Registry");
+ } catch (Exception e) {
+ //If it does not exist construct service information
+ log.debug("Constructing Service UDDI Information for " + metaData.getServiceName());
+ service = new BusinessService();
+ service.setBusinessKey(TokenResolver.replaceTokens("uddi:${keyDomain}:${businessKey}", properties));
+ service.setServiceKey(serviceKey);
+ if (properties.containsKey(SERVICE_DESCRIPTION)) {
+ Description description = new Description();
+ String lang = "en";
+ if (properties.containsKey(LANG)) lang = properties.getProperty(LANG);
+ description.setLang(lang);
+ description.setValue(properties.getProperty(SERVICE_DESCRIPTION));
+ Name serviceName = new Name();
+ serviceName.setLang(lang);
+ serviceName.setValue(metaData.getServiceName().getLocalPart());
+ service.getName().add(serviceName);
+ service.getDescription().add(description);
+ }
+ //default categoryBag on the binding
+ if (properties.containsKey(SERVICE_CATEGORY_BAG)) {
+ String defaultCategoryBag = properties.getProperty(SERVICE_CATEGORY_BAG);
+ log.info("Adding categoryBag: " + defaultCategoryBag);
+ CategoryBag categoryBag = parseCategoryBag(defaultCategoryBag);
+ service.setCategoryBag(categoryBag);
+ }
+ }
+ //Construct bindingTemplate
+ BindingTemplate binding = createBindingTemplate(clerk, metaData, wsdlRef);
+ //Add the bindingTemplate on the service
+ if (service.getBindingTemplates()==null) {
+ BindingTemplates bindingTemplates = new BindingTemplates();
+ service.setBindingTemplates(bindingTemplates);
+ }
+ service.getBindingTemplates().getBindingTemplate().add(binding);
+ return service;
+ }
+
+ private BindingTemplate createBindingTemplate(UDDIClerk clerk,
+ EndpointMetaData metaData, WSDLReference wsdlRef) {
+
+ Properties properties = clerk.getUDDINode().getProperties();
+ BindingTemplate bindingTemplate = new BindingTemplate();
+ //Constructing the bindingKey
+ String bindingKey = TokenResolver.replaceTokens(DEFAULT_BINDING_KEY_FORMAT + metaData.getServiceName().getLocalPart() + "-"
+ + metaData.getPortName(), properties);
+ if (properties.containsKey(BINDING_KEY_FORMAT)) {
+ bindingKey = TokenResolver.replaceTokens((String)properties.get(BINDING_KEY_FORMAT) + metaData.getServiceName().getLocalPart() + "-"
+ + metaData.getPortName(), properties);
+ }
+
+ bindingTemplate.setBindingKey(bindingKey);
+
+ String lang = "en";
+ if (properties.containsKey(LANG)) lang = properties.getProperty(LANG);
+ if (properties.containsKey(BINDING_DESCRIPTION)) {
+ Description bindingDescription = new Description();
+ bindingDescription.setLang(lang);
+ bindingDescription.setValue(properties.getProperty(BINDING_DESCRIPTION));
+ bindingTemplate.getDescription().add(bindingDescription);
+ }
+
+ AccessPoint accessPoint = new AccessPoint();
+ accessPoint.setUseType(AccessPointType.WSDL_DEPLOYMENT.toString());
+ accessPoint.setValue(wsdlRef.getWsdlFileURL().toString());
+ bindingTemplate.setAccessPoint(accessPoint);
+
+ //default tModelKeys on the binding
+ String defaultTModelKeys = properties.getProperty("tModelKeys");
+ if (defaultTModelKeys!=null && !"".equals(defaultTModelKeys)) {
+ String[] tModelKeys= defaultTModelKeys.split(",");
+ for (String tModelKey : tModelKeys) {
+ TModelInstanceInfo instanceInfo = new TModelInstanceInfo();
+ instanceInfo.setTModelKey(tModelKey);
+ if (bindingTemplate.getTModelInstanceDetails()==null) {
+ bindingTemplate.setTModelInstanceDetails(new TModelInstanceDetails());
+ }
+ bindingTemplate.getTModelInstanceDetails().getTModelInstanceInfo().add(instanceInfo);
+ }
+ }
+ //default categoryBag on the binding
+ String defaultCategoryBag = properties.getProperty("bindingCategoryBag");
+ if (defaultCategoryBag!=null && !"".equals(defaultCategoryBag)) {
+ log.info("Adding categoryBag: " + defaultCategoryBag);
+ CategoryBag categoryBag = parseCategoryBag(defaultCategoryBag);
+ bindingTemplate.setCategoryBag(categoryBag);
+ }
+
+ return bindingTemplate;
+ }
+
+
+
+}
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2009-12-15 17:41:39 UTC (rev 388)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2009-12-15 18:31:02 UTC (rev 389)
@@ -21,8 +21,11 @@
*/
package org.jboss.soa.bpel.runtime.ws;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.v3.client.config.UDDIClerk;
+import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.ode.bpel.iapi.EndpointReference;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.deployers.client.spi.DeployerClient;
@@ -35,11 +38,13 @@
import org.jboss.kernel.Kernel;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.soa.bpel.runtime.engine.ode.ExecutionEnvironment;
+import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration;
import org.jboss.soa.bpel.runtime.integration.KernelLocator;
import org.jboss.soa.bpel.runtime.integration.ServerConfig;
import org.jboss.soa.bpel.runtime.integration.ServerConfigFactory;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
+import org.uddi.api_v3.BusinessService;
import javax.xml.namespace.QName;
import java.io.File;
@@ -62,16 +67,22 @@
public class EndpointManager
{
protected final Log log = LogFactory.getLog(getClass());
+ // we should consider having our own OdeConfigProperties class if we need more properties
+ private final static String BPEL_UDDI_REGISTRATION = "uddi.registration";
private Map<String, ServiceEndpointReference> endpointMapping = new ConcurrentHashMap<String, ServiceEndpointReference>();
private ServerConfig serverConfig;
private ExecutionEnvironment executionEnvironment;
+ private UDDIRegistration uddiRegistration;
public EndpointManager(ExecutionEnvironment executionEnvironment)
{
this.executionEnvironment = executionEnvironment;
this.serverConfig = ServerConfigFactory.getServerConfig();
+ if (isUDDIRegistration()) {
+ uddiRegistration = new UDDIRegistration();
+ }
}
public EndpointReference createEndpoint(EndpointMetaData metaData, WSDLReference wsdlRef, final ClassLoader classLoader)
@@ -135,6 +146,9 @@
createEndpointKey(metaData.getServiceName(), metaData.getPortName()),
ref
);
+ if (isUDDIRegistration()) {
+ uddiRegistration.registerEPR(metaData, wsdlRef);
+ }
return ref;
}
@@ -214,6 +228,9 @@
{
log.warn(ref.getArchiveLocation() + " cannot be removed (doesn't exist).");
}
+ if (isUDDIRegistration()) {
+ uddiRegistration.unRegisterEPR(service, port);
+ }
}
catch (Exception e)
{
@@ -302,4 +319,9 @@
}
return( path.delete() );
}
+
+ public boolean isUDDIRegistration() {
+ return Boolean.valueOf(executionEnvironment.getOdeConfig().getProperty(BPEL_UDDI_REGISTRATION, "false"));
+ }
+
}
Modified: trunk/runtime/engine-assembly/src/main/resources/bpel.properties
===================================================================
--- trunk/runtime/engine-assembly/src/main/resources/bpel.properties 2009-12-15 17:41:39 UTC (rev 388)
+++ trunk/runtime/engine-assembly/src/main/resources/bpel.properties 2009-12-15 18:31:02 UTC (rev 389)
@@ -87,6 +87,10 @@
bpel.db.mode=EXTERNAL
bpel.db.ext.dataSource=java:BPELDB
+# if set to true will self-register BPEL endpoints upon deployment to a UDDI.
+# this uses the juddi-client-3.0.0 and the uddi client config can be set in the uddi.xml
+# file
+bpel.uddi.registration=true
hibernate.dialect=org.hibernate.dialect.H2Dialect
hibernate.hbm2ddl.auto=update
15 years, 9 months
riftsaw SVN: r388 - in trunk: integration-tests and 1 other directory.
by riftsaw-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-12-15 12:41:39 -0500 (Tue, 15 Dec 2009)
New Revision: 388
Modified:
trunk/integration-tests/build.xml
trunk/integration-tests/pom.xml
trunk/pom.xml
Log:
Update to console 1.3.0
Modified: trunk/integration-tests/build.xml
===================================================================
--- trunk/integration-tests/build.xml 2009-12-15 07:58:30 UTC (rev 387)
+++ trunk/integration-tests/build.xml 2009-12-15 17:41:39 UTC (rev 388)
@@ -86,7 +86,7 @@
<echo>JNP port detected, just waiting for 1 min 30 secs to ensure server started</echo>
- <sleep minutes="1" seconds="30" />
+ <sleep minutes="1" seconds="0" />
<echo>Server has started</echo>
Modified: trunk/integration-tests/pom.xml
===================================================================
--- trunk/integration-tests/pom.xml 2009-12-15 07:58:30 UTC (rev 387)
+++ trunk/integration-tests/pom.xml 2009-12-15 17:41:39 UTC (rev 388)
@@ -277,7 +277,19 @@
<excludes>
<exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELAtmTestCase.java</exclude>
<exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELPurchaseTestCase.java</exclude>
- <exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELTravelAgencyTestCase.java</exclude>
+ <!--exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELTravelAgencyTestCase.java</exclude-->
+ <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java</exclude>
+ <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java</exclude>
+ <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java</exclude>
+ <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java</exclude>
+ <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationTestCase.java</exclude>
+ <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleInvokeTestCase.java</exclude>
+ <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java</exclude>
+ <exclude>org/jboss/soa/bpel/tests/samples/QuickstartESBBPELHelloWorldTestCase.java</exclude>
+ <exclude>org/jboss/soa/bpel/tests/samples/QuickstartESBBPELLoanFaultTestCase.java</exclude>
+ <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java</exclude>
+ <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java</exclude>
+ <exclude>org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java</exclude>
</excludes>
</configuration>
<executions>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-12-15 07:58:30 UTC (rev 387)
+++ trunk/pom.xml 2009-12-15 17:41:39 UTC (rev 388)
@@ -68,7 +68,7 @@
<properties>
<riftsaw.ode.version>2.0-CR1</riftsaw.ode.version>
<riftsaw.engine.version>2.0-CR1</riftsaw.engine.version>
- <bpm.console.version>1.3.0-SNAPSHOT</bpm.console.version>
+ <bpm.console.version>1.3.0</bpm.console.version>
<commons.logging.version>1.1.1</commons.logging.version>
<junit.version>3.8.1</junit.version>
<jboss.version>5.1.0.GA</jboss.version>
15 years, 9 months
riftsaw SVN: r387 - in branches/ODE/ODE-2.0-maven: utils and 1 other directory.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2009-12-15 02:58:30 -0500 (Tue, 15 Dec 2009)
New Revision: 387
Added:
branches/ODE/ODE-2.0-maven/pom.xml
branches/ODE/ODE-2.0-maven/utils/pom.xml
Log:
* add pom file for parent, and utils.
Added: branches/ODE/ODE-2.0-maven/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/pom.xml (rev 0)
+++ branches/ODE/ODE-2.0-maven/pom.xml 2009-12-15 07:58:30 UTC (rev 387)
@@ -0,0 +1,848 @@
+<?xml version="1.0"?>
+<project>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode</artifactId>
+ <name>ODE</name>
+
+ <packaging>pom</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <version>2.0-SNAPSHOT</version>
+ <url>http://ode.apache.org</url>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org</url>
+ </issueManagement>
+ <licenses>
+ <license>
+ <name>Apache Public License 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/ode/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ode/</developerConnection>
+ <url>http://svn.apache.org/repos/asf/ode/</url>
+ </scm>
+
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
+ </organization>
+
+ <prerequisites>
+ <maven>2.0.9</maven>
+ </prerequisites>
+
+ <properties>
+
+ <!--
+ |
+ | Versions of external dependencies used in build
+ | and execution.
+ |
+ -->
+ <activation.version>1.1</activation.version>
+ <annogen.version>0.1.0</annogen.version>
+ <antlr.version>2.7.7</antlr.version>
+ <axiom.version>1.2.7</axiom.version>
+ <axis2.version>1.4.1</axis2.version>
+ <commons.codec.version>1.3</commons.codec.version>
+ <backport.concurrent.version>3.1</backport.concurrent.version>
+ <commons.fileupload.version>1.2</commons.fileupload.version>
+ <commons.collections.version>3.1</commons.collections.version>
+ <commons.httpclient.version>3.1</commons.httpclient.version>
+ <commons.io.version>1.4</commons.io.version>
+ <commons.lang.version>2.1</commons.lang.version>
+ <commons.logging.version>1.1.1</commons.logging.version>
+ <commons.pool.version>1.2</commons.pool.version>
+ <commons.primitives.version>1.0</commons.primitives.version>
+ <httpcomponents.version>4.0-beta1</httpcomponents.version>
+ <jaxb-api.version>2.1</jaxb-api.version>
+ <jaxb.version>2.1.6</jaxb.version>
+ <jaxen.version>1.1.1</jaxen.version>
+ <jettison.version>1.0-RC2</jettison.version>
+ <jibx.version>1.1.5</jibx.version>
+ <neethi.version>2.0.4</neethi.version>
+ <woden.version>1.0M8</woden.version>
+ <wsdl4j.version>1.6.2</wsdl4j.version>
+ <woodstox.version>3.2.4</woodstox.version>
+ <javax.mail.version>1.4</javax.mail.version>
+ <hibernate.version>3.1.2</hibernate.version>
+ <spring.version>2.5.6</spring.version>
+ <geronimo.specs.version>1.0</geronimo.specs.version>
+ <geronimo.version>1.1</geronimo.version>
+ <geronimo.activation.version>1.0.1</geronimo.activation.version>
+ <geronimo.annotation.version>1.1</geronimo.annotation.version>
+ <geronimo.javamail.version>1.2</geronimo.javamail.version>
+ <geronimo.stax-api.version>1.0.1</geronimo.stax-api.version>
+ <jaxen.version>1.1-beta-8</jaxen.version>
+ <jetty.version>6.1.12rc1</jetty.version>
+ <jencks.version>2.1</jencks.version>
+ <jasper.version>4.2.20RC0</jasper.version>
+ <log4j.version>1.2.15</log4j.version>
+ <saxon.version>9.x</saxon.version>
+ <servicemix.version>3.3</servicemix.version>
+ <stax-api.version>1.0</stax-api.version>
+ <stax.version>1.1.2-dev</stax.version>
+ <xapool.version>1.4</xapool.version>
+ <xerces.version>2.8.1</xerces.version>
+ <xmlresolver.version>1.2</xmlresolver.version>
+ <xmlbeans.version>2.3.0</xmlbeans.version>
+ <derby.version>10.1.2.1</derby.version>
+ <xstream.version>1.2</xstream.version>
+ <junit.version>4.3.1</junit.version>
+
+ </properties>
+
+
+ <modules>
+ <module>utils</module>
+ </modules>
+
+ <build>
+ <defaultGoal>package</defaultGoal>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>1.0-alpha-6</version>
+ </extension>
+ </extensions>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-3</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+
+
+ <!--|
+ | This version uses xjavadoc-1.1-j5, which doesn't
+ | complain on Java 5.0 constructs.
+ |
+ -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xdoclet-maven-plugin</artifactId>
+ <version>1.0-alpha-2-j5</version>
+ </plugin>
+ <!--|
+ | This version removes dependency on JSR173,
+ | which is not available in public repositories.
+ |
+ -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xmlbeans-maven-plugin</artifactId>
+ <version>2.0-patched</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-one-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>install-maven-one-repository</goal>
+ <goal>deploy-maven-one-repository</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <remoteRepositoryId>ode</remoteRepositoryId>
+ <remoteRepositoryUrl>scpexe://ode.intalio.org/var/www/public/maven1</remoteRepositoryUrl>
+ </configuration>
+ </plugin>
+ <!-- Allows direct usage of the javadoc:javadoc goal. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <minmemory>128m</minmemory>
+ <maxmemory>512m</maxmemory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+
+
+ <!--|
+ | List of repositories for all the various dependencies,
+ | and Maven plugins.
+ |
+ -->
+ <repositories>
+ <repository>
+ <id>intalio</id>
+ <name>ODE Maven2 repository</name>
+ <url>http://pxe.intalio.org/public/maven2</url>
+ </repository>
+ <repository>
+ <id>central</id>
+ <name>Maven Repository Switchboard</name>
+ <url>http://repo1.maven.org/maven2</url>
+ </repository>
+ <repository>
+ <id>ibiblio</id>
+ <name>ibiblio</name>
+ <url>http://www.ibiblio.org/maven2</url>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>intalio</id>
+ <name>Intalio Maven2 repository</name>
+ <url>http://pxe.intalio.org/public/maven2</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>central</id>
+ <name>Maven Repository Switchboard</name>
+ <url>http://repo1.maven.org/maven2</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>ibiblio</id>
+ <name>ibiblio</name>
+ <url>http://www.ibiblio.org/maven2</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+
+ <!-- |
+ | Repository for distributing new releases.
+ |
+ -->
+ <distributionManagement>
+ <repository>
+ <id>ode-maven2</id>
+ <url>scpexe://ode.intalio.org/var/www/public/maven2</url>
+ </repository>
+
+ <snapshotRepository>
+ <id>ode-maven2-snapshot</id>
+ <name>ODE Development Repository</name>
+ <url>scpexe://ode.intalio.org/var/www/public/maven2</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-runtime</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-ql</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-schemas</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-dao</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-epr</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-api-jca</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-compiler</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-dd</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-el-xpath20</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-obj</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-scripts</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-store</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-connector</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-hibernate</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-hibernate-db-derby</artifactId>
+ <version>${project.version}</version>
+ <type>tar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-memory</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jacob</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jbi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jbi-install</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jbi-examples</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jca-ra</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jca-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jca-rar</artifactId>
+ <version>${project.version}</version>
+ <type>rar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-minerva</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-naming</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-tools</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-scheduler-quartz</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-tools-bin</artifactId>
+ <type>tar</type>
+ <version>${project.version}</version>
+ <classifier>tar</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-examples</artifactId>
+ <type>tar</type>
+ <version>${project.version}</version>
+ <classifier>tar</classifier>
+ </dependency>
+
+ <!-- 3rd party libraries -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>${activation.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>annogen</groupId>
+ <artifactId>annogen</artifactId>
+ <version>${annogen.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>${antlr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>${backport.concurrent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons.codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>${commons.fileupload.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons.collections.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons.httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons.lang.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>${geronimo.activation.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>${geronimo.annotation.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <version>${geronimo.javamail.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <version>${geronimo.stax-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcomponents.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-nio</artifactId>
+ <version>${httpcomponents.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>${jaxen.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>${jettison.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-run</artifactId>
+ <version>${jibx.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-bind</artifactId>
+ <version>${jibx.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <version>${neethi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden-api</artifactId>
+ <version>${woden.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden-impl-dom</artifactId>
+ <version>${woden.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>${woodstox4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>${javax.mail.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${commons.pool.version}</version>
+ <exclusions>
+ <!-- These need to be excluded, we are on JDK5 -->
+ <exclusion>
+ <artifactId>xerces</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>${hibernate.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jta</artifactId>
+ <groupId>javax.transaction</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!--
+ | Jetty is used for the standalone-distro. The
+ | JASPER modules are actually required by Jetty
+ | but the transitive dependencies are not present.
+ -->
+
+ <dependency>
+ <groupId>jetty</groupId>
+ <artifactId>org.mortbay.jetty</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jetty</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>${jasper.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jetty</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>${jasper.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jetty</groupId>
+ <artifactId>org.mortbay.jmx</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ <version>${saxon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-dom</artifactId>
+ <version>${saxon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-xpath</artifactId>
+ <version>${saxon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>${stax-api.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xmlbeans-jsr173-api</artifactId>
+ <groupId>xmlbeans</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>${stax.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xmlbeans-jsr173-api</artifactId>
+ <groupId>xmlbeans</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>jencks</groupId>
+ <artifactId>xapool-without-pool</artifactId>
+ <version>${xapool.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jencks</groupId>
+ <artifactId>jencks</artifactId>
+ <version>${jencks.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ <version>${xmlresolver.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>${xmlbeans.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xmlbeans-jsr173-api</artifactId>
+ <groupId>xmlbeans</groupId>
+ </exclusion>
+ </exclusions>
+
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean_xpath</artifactId>
+ <version>${xmlbeans.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xmlbeans-jsr173-api</artifactId>
+ <groupId>xmlbeans</groupId>
+ </exclusion>
+ </exclusions>
+
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xmlpublic</artifactId>
+ <version>${xmlbeans.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xmlbeans-jsr173-api</artifactId>
+ <groupId>xmlbeans</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>${xstream.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-codegen</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-corba</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-fastinfoset</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxbri</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxws</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-metadata</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mtompolicy</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-saaj</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-saaj-api</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-java2wsdl</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-xmlbeans</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jibx</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+</project>
Property changes on: branches/ODE/ODE-2.0-maven/pom.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/ODE/ODE-2.0-maven/utils/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/utils/pom.xml (rev 0)
+++ branches/ODE/ODE-2.0-maven/utils/pom.xml 2009-12-15 07:58:30 UTC (rev 387)
@@ -0,0 +1,121 @@
+<?xml version="1.0"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<project>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-utils</artifactId>
+ <name>ODE :: Utilities</name>
+ <packaging>jar</packaging>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-codegen</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-java2wsdl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jibx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-saaj</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-xmlbeans</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*TestResources.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
15 years, 9 months