Build failed in Hudson: RiftSaw #335
by jboss-qa-internal＠redhat.com
See <http://hudson.qa.jboss.com/hudson/job/RiftSaw/335/changes>
Changes:
[objectiser] RIFTSAW-339 - renamed top level 'db' folder to 'conf' as contents is now wider than just configuration info for db/drivers/sql etc.
[objectiser] RIFTSAW-339 - renamed top level 'db' folder to 'conf' as contents is now wider than just configuration info for db/drivers/sql etc.
------------------------------------------
Started by an SCM change
Building remotely on dev87
Updating http://anonsvn.jboss.org/repos/riftsaw/trunk
U distribution/src/main/assembly/bin.xml
D distribution/src/main/release/db
A distribution/src/main/release/conf
A distribution/src/main/release/conf/juddi
A distribution/src/main/release/conf/juddi/jbossesb_tModels.xml
A distribution/src/main/release/conf/juddi/jbossesb_BusinessEntity.xml
A distribution/src/main/release/conf/juddi/esb.juddi.client.xml
A distribution/src/main/release/conf/sql
A distribution/src/main/release/conf/sql/mysql.drop.sql
A distribution/src/main/release/conf/sql/oracle.drop.sql
A distribution/src/main/release/conf/sql/postgres.drop.sql
A distribution/src/main/release/conf/sql/sqlserver.drop.sql
A distribution/src/main/release/conf/sql/sybase.drop.sql
A distribution/src/main/release/conf/sql/db2.drop.sql
A distribution/src/main/release/conf/wsstack
A distribution/src/main/release/conf/wsstack/native.properties
A distribution/src/main/release/conf/wsstack/cxf.properties
A distribution/src/main/release/conf/jboss
A distribution/src/main/release/conf/jboss/as5.properties
A distribution/src/main/release/conf/jboss/as6.properties
A distribution/src/main/release/conf/jboss/jboss-beans.xml
A distribution/src/main/release/conf/jdbc
A distribution/src/main/release/conf/jdbc/derby.properties
A distribution/src/main/release/conf/jdbc/mysql.properties
A distribution/src/main/release/conf/jdbc/oracle.properties
A distribution/src/main/release/conf/jdbc/postgres.properties
A distribution/src/main/release/conf/jdbc/sqlserver.properties
A distribution/src/main/release/conf/jdbc/sybase.properties
A distribution/src/main/release/conf/jdbc/db2.properties
A distribution/src/main/release/conf/jdbc/hsql.properties
A distribution/src/main/release/conf/cache
A distribution/src/main/release/conf/cache/default.properties
A distribution/src/main/release/conf/cache/jbosscache.properties
A distribution/src/main/release/conf/migration
A distribution/src/main/release/conf/migration/mysql210-220upgrade.sql
A distribution/src/main/release/conf/migration/oracle210-220upgrade.sql
A distribution/src/main/release/conf/migration/postgres210-220upgrade.sql
A distribution/src/main/release/conf/migration/sqlserver210-220upgrade.sql
A distribution/src/main/release/conf/migration/db2210-220upgrade.sql
A distribution/src/main/release/conf/migration/hsql210-220upgrade.sql
A distribution/src/main/release/conf/datasource
A distribution/src/main/release/conf/datasource/bpel-derby-ds.xml
A distribution/src/main/release/conf/datasource/bpel-mysql-ds.xml
A distribution/src/main/release/conf/datasource/bpel-oracle-ds.xml
A distribution/src/main/release/conf/datasource/bpel-postgres-ds.xml
A distribution/src/main/release/conf/datasource/bpel-sqlserver-ds.xml
A distribution/src/main/release/conf/datasource/bpel-sybase-ds.xml
A distribution/src/main/release/conf/datasource/bpel-db2-ds.xml
A distribution/src/main/release/conf/datasource/bpel-hsql-ds.xml
A distribution/src/main/release/conf/bpel.properties
A distribution/src/main/release/conf/build.xml
U distribution/src/main/release/install/build.xml
U qa/build.xml
U integration-tests/build.xml
U docs/docbook/gettingstartedguide/src/main/en-US/module/installation.xml
At revision 1293
No emails were triggered.
[RiftSaw] $ bash -xe /tmp/hudson8666533711906891812.sh
+ cd riftsaw
+ cd qa
+ chmod a+x hudson-riftsaw-jboss.sh
+ DATABASE=hsql
+ AS_CONFIG=default
+ export AS_CONFIG
+ export DATABASE
+ ./hudson-riftsaw-jboss.sh
ANT_PROPERTIES=-Driftsaw.parent.dir=<http://hudson.qa.jboss.com/hudson/job/RiftSaw/ws/> -Ddatabase=hsql -Dreplace.qa.jdbc=true -Dorg_jboss_as_home=<http://hudson.qa.jboss.com/hudson/job/RiftSaw/ws/riftsaw-2.3.0-SNAPSHOT/j...> -Dorg_jboss_as_config=default -Djbossesb.version=4.9 -Dws.stack=native -Dws.version=3.2.2.GA -Dws.stack.dir=<http://hudson.qa.jboss.com/hudson/job/RiftSaw/ws/downloads> -Dorg_jboss_esb_home=<http://hudson.qa.jboss.com/hudson/job/RiftSaw/ws/riftsaw-2.3.0-SNAPSHOT/j...> -Ddownload.dir=<http://hudson.qa.jboss.com/hudson/job/RiftSaw/ws/downloads> -Dstartup.time=6 -Dtest.delay=40000
Error occurred during initialization of VM
java/lang/NoClassDefFoundError: java/lang/Object
Error occurred during initialization of VM
java/lang/NoClassDefFoundError: java/lang/Object
Error occurred during initialization of VM
java/lang/NoClassDefFoundError: java/lang/Object
Error occurred during initialization of VM
java/lang/NoClassDefFoundError: java/lang/Object
Error occurred during initialization of VM
java/lang/NoClassDefFoundError: java/lang/Object
Recording test results
ERROR: Failed to archive test reports
hudson.util.IOException2: remote file operation failed: <http://hudson.qa.jboss.com/hudson/job/RiftSaw/ws/> at hudson.remoting.Channel@5d510d8c:dev87
at hudson.FilePath.act(FilePath.java:754)
at hudson.FilePath.act(FilePath.java:738)
at hudson.tasks.junit.JUnitParser.parse(JUnitParser.java:83)
at hudson.tasks.junit.JUnitResultArchiver.parse(JUnitResultArchiver.java:123)
at hudson.tasks.junit.JUnitResultArchiver.perform(JUnitResultArchiver.java:135)
at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:19)
at hudson.model.AbstractBuild$AbstractRunner.perform(AbstractBuild.java:603)
at hudson.model.AbstractBuild$AbstractRunner.performAllBuildSteps(AbstractBuild.java:582)
at hudson.model.AbstractBuild$AbstractRunner.performAllBuildSteps(AbstractBuild.java:560)
at hudson.model.Build$RunnerImpl.post2(Build.java:156)
at hudson.model.AbstractBuild$AbstractRunner.post(AbstractBuild.java:529)
at hudson.model.Run.run(Run.java:1389)
at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:46)
at hudson.model.ResourceController.execute(ResourceController.java:88)
at hudson.model.Executor.run(Executor.java:145)
Caused by: java.io.IOException: Remote call on dev87 failed
at hudson.remoting.Channel.call(Channel.java:638)
at hudson.FilePath.act(FilePath.java:745)
... 14 more
Caused by: java.lang.NoClassDefFoundError: java/text/ChoiceFormat
at java.text.MessageFormat.makeFormat(MessageFormat.java:1433)
at java.text.MessageFormat.applyPattern(MessageFormat.java:458)
at java.text.MessageFormat.<init>(MessageFormat.java:350)
at java.text.MessageFormat.format(MessageFormat.java:811)
at org.jvnet.localizer.ResourceBundleHolder.format(ResourceBundleHolder.java:139)
at hudson.Messages.Util_day(Messages.java:21)
at hudson.Util.getTimeSpanString(Util.java:608)
at hudson.tasks.junit.TestResult.parse(TestResult.java:171)
at hudson.tasks.junit.TestResult.<init>(TestResult.java:118)
at hudson.tasks.junit.JUnitParser$ParseResultCallable.invoke(JUnitParser.java:114)
at hudson.tasks.junit.JUnitParser$ParseResultCallable.invoke(JUnitParser.java:87)
at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1927)
at hudson.remoting.UserRequest.perform(UserRequest.java:114)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:270)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
at java.util.concurrent.FutureTask.run(FutureTask.java:138)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
Archiving artifacts
13 years, 10 months
- 1
- 3
Build failed in Hudson: RiftSaw-mysql #219
by jboss-qa-internal＠redhat.com
See <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/219/changes>
Changes:
[objectiser] RIFTSAW-339 - renamed top level 'db' folder to 'conf' as contents is now wider than just configuration info for db/drivers/sql etc.
------------------------------------------
Started by an SCM change
Building remotely on dev89
Updating http://anonsvn.jboss.org/repos/riftsaw/trunk
U distribution/src/main/assembly/bin.xml
D distribution/src/main/release/db
A distribution/src/main/release/conf
A distribution/src/main/release/conf/juddi
A distribution/src/main/release/conf/juddi/jbossesb_tModels.xml
A distribution/src/main/release/conf/juddi/jbossesb_BusinessEntity.xml
A distribution/src/main/release/conf/juddi/esb.juddi.client.xml
A distribution/src/main/release/conf/sql
A distribution/src/main/release/conf/sql/mysql.drop.sql
A distribution/src/main/release/conf/sql/oracle.drop.sql
A distribution/src/main/release/conf/sql/postgres.drop.sql
A distribution/src/main/release/conf/sql/sqlserver.drop.sql
A distribution/src/main/release/conf/sql/sybase.drop.sql
A distribution/src/main/release/conf/sql/db2.drop.sql
A distribution/src/main/release/conf/wsstack
A distribution/src/main/release/conf/wsstack/native.properties
A distribution/src/main/release/conf/wsstack/cxf.properties
A distribution/src/main/release/conf/jboss
A distribution/src/main/release/conf/jboss/as5.properties
A distribution/src/main/release/conf/jboss/as6.properties
A distribution/src/main/release/conf/jboss/jboss-beans.xml
A distribution/src/main/release/conf/jdbc
A distribution/src/main/release/conf/jdbc/derby.properties
A distribution/src/main/release/conf/jdbc/mysql.properties
A distribution/src/main/release/conf/jdbc/oracle.properties
A distribution/src/main/release/conf/jdbc/postgres.properties
A distribution/src/main/release/conf/jdbc/sqlserver.properties
A distribution/src/main/release/conf/jdbc/sybase.properties
A distribution/src/main/release/conf/jdbc/db2.properties
A distribution/src/main/release/conf/jdbc/hsql.properties
A distribution/src/main/release/conf/cache
A distribution/src/main/release/conf/cache/default.properties
A distribution/src/main/release/conf/cache/jbosscache.properties
A distribution/src/main/release/conf/migration
A distribution/src/main/release/conf/migration/mysql210-220upgrade.sql
A distribution/src/main/release/conf/migration/oracle210-220upgrade.sql
A distribution/src/main/release/conf/migration/postgres210-220upgrade.sql
A distribution/src/main/release/conf/migration/sqlserver210-220upgrade.sql
A distribution/src/main/release/conf/migration/db2210-220upgrade.sql
A distribution/src/main/release/conf/migration/hsql210-220upgrade.sql
A distribution/src/main/release/conf/datasource
A distribution/src/main/release/conf/datasource/bpel-derby-ds.xml
A distribution/src/main/release/conf/datasource/bpel-mysql-ds.xml
A distribution/src/main/release/conf/datasource/bpel-oracle-ds.xml
A distribution/src/main/release/conf/datasource/bpel-postgres-ds.xml
A distribution/src/main/release/conf/datasource/bpel-sqlserver-ds.xml
A distribution/src/main/release/conf/datasource/bpel-sybase-ds.xml
A distribution/src/main/release/conf/datasource/bpel-db2-ds.xml
A distribution/src/main/release/conf/datasource/bpel-hsql-ds.xml
A distribution/src/main/release/conf/bpel.properties
A distribution/src/main/release/conf/build.xml
U distribution/src/main/release/install/build.xml
U integration-tests/build.xml
U docs/docbook/gettingstartedguide/src/main/en-US/module/installation.xml
At revision 1292
No emails were triggered.
[RiftSaw-mysql] $ bash -xe /tmp/hudson3664688096023404552.sh
+ cd riftsaw-mysql
+ cd qa
+ chmod a+x hudson-riftsaw-db.sh
+ DATABASE=mysql
+ export DATABASE
+ ./hudson-riftsaw-db.sh
ANT_PROPERTIES=-Driftsaw.parent.dir=<http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/> -Ddatabase=mysql -Dreplace.qa.jdbc=true -Dorg_jboss_as_home=<http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.3.0-SNAP...> -Dorg_jboss_as_config=default -Djbossesb.version=4.9 -Dws.stack=native -Dws.version=3.2.2.GA -Dws.stack.dir=<http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/downloads> -Dorg_jboss_esb_home=<http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/riftsaw-2.3.0-SNAP...> -Ddownload.dir=<http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/downloads> -Dstartup.time=6 -Dtest.delay=40000
Error occurred during initialization of VM
java/lang/NoClassDefFoundError: java/lang/Object
Error occurred during initialization of VM
java/lang/NoClassDefFoundError: java/lang/Object
Error occurred during initialization of VM
java/lang/NoClassDefFoundError: java/lang/Object
Error occurred during initialization of VM
java/lang/NoClassDefFoundError: java/lang/Object
Error occurred during initialization of VM
java/lang/NoClassDefFoundError: java/lang/Object
Error occurred during initialization of VM
java/lang/NoClassDefFoundError: java/lang/Object
Error occurred during initialization of VM
java/lang/NoClassDefFoundError: java/lang/Object
Recording test results
ERROR: Failed to archive test reports
hudson.util.IOException2: remote file operation failed: <http://hudson.qa.jboss.com/hudson/job/RiftSaw-mysql/ws/> at hudson.remoting.Channel@10a721c:dev89
at hudson.FilePath.act(FilePath.java:754)
at hudson.FilePath.act(FilePath.java:738)
at hudson.tasks.junit.JUnitParser.parse(JUnitParser.java:83)
at hudson.tasks.junit.JUnitResultArchiver.parse(JUnitResultArchiver.java:123)
at hudson.tasks.junit.JUnitResultArchiver.perform(JUnitResultArchiver.java:135)
at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:19)
at hudson.model.AbstractBuild$AbstractRunner.perform(AbstractBuild.java:603)
at hudson.model.AbstractBuild$AbstractRunner.performAllBuildSteps(AbstractBuild.java:582)
at hudson.model.AbstractBuild$AbstractRunner.performAllBuildSteps(AbstractBuild.java:560)
at hudson.model.Build$RunnerImpl.post2(Build.java:156)
at hudson.model.AbstractBuild$AbstractRunner.post(AbstractBuild.java:529)
at hudson.model.Run.run(Run.java:1389)
at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:46)
at hudson.model.ResourceController.execute(ResourceController.java:88)
at hudson.model.Executor.run(Executor.java:145)
Caused by: java.io.IOException: Remote call on dev89 failed
at hudson.remoting.Channel.call(Channel.java:638)
at hudson.FilePath.act(FilePath.java:745)
... 14 more
Caused by: java.lang.NoClassDefFoundError: java/text/ChoiceFormat
at java.text.MessageFormat.makeFormat(MessageFormat.java:1433)
at java.text.MessageFormat.applyPattern(MessageFormat.java:458)
at java.text.MessageFormat.<init>(MessageFormat.java:350)
at java.text.MessageFormat.format(MessageFormat.java:811)
at org.jvnet.localizer.ResourceBundleHolder.format(ResourceBundleHolder.java:139)
at hudson.Messages.Util_day(Messages.java:21)
at hudson.Util.getTimeSpanString(Util.java:608)
at hudson.tasks.junit.TestResult.parse(TestResult.java:171)
at hudson.tasks.junit.TestResult.<init>(TestResult.java:118)
at hudson.tasks.junit.JUnitParser$ParseResultCallable.invoke(JUnitParser.java:114)
at hudson.tasks.junit.JUnitParser$ParseResultCallable.invoke(JUnitParser.java:87)
at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1927)
at hudson.remoting.UserRequest.perform(UserRequest.java:114)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:270)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
at java.util.concurrent.FutureTask.run(FutureTask.java:138)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
Archiving artifacts
13 years, 10 months
- 1
- 3
RiftSaw-jbossws-cxf - Build # 134 - Failure!
by jboss-qa-internal＠redhat.com
RiftSaw-jbossws-cxf Build number 134 status: Failure
Details available at http://hudson.jboss.org/hudson/job/RiftSaw-jbossws-cxf/134/
JBoss server log can be found at workspace, http://hudson.qa.jboss.com/hudson/view/RiftSaw/job/RiftSaw/ws/
13 years, 10 months
- 1
- 0
Build failed in Hudson: RiftSaw-jbossws-cxf #134
by jboss-qa-internal＠redhat.com
See <http://hudson.qa.jboss.com/hudson/job/RiftSaw-jbossws-cxf/134/changes>
Changes:
[objectiser] RIFTSAW-333 - deployer now installs but requires further testing.
[objectiser] RIFTSAW-333 - deployer now installs but requires further testing.
[objectiser] RIFTSAW-304 - by default RiftSaw should not persist the BPEL events in the ODE database, as the BPAF log adapter will store them in a different location.
------------------------------------------
[...truncated 4435 lines...]
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:71)
... 17 more
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.026 sec <<< FAILURE!
Running org.jboss.soa.bpel.tests.samples.QuickstartBPELHelloWorldExtendedTimeoutTestCase
java.lang.RuntimeException: Cannot obtain MBeanServerConnection using jndi props: {java.naming.provider.url=localhost:1099, java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory, java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces:org.jnp.interfaces, hostKey=localhost/127.0.0.1:1099}
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:75)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getDeployer(RiftSawTestHelper.java:82)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.deploy(RiftSawTestHelper.java:48)
at org.jboss.soa.bpel.tests.RiftSawTestSetup.setUp(RiftSawTestSetup.java:104)
at junit.extensions.TestSetup$1.protect(TestSetup.java:22)
at junit.framework.TestResult.runProtected(TestResult.java:128)
at junit.extensions.TestSetup.run(TestSetup.java:27)
at org.junit.internal.runners.JUnit38ClassRunner.run(JUnit38ClassRunner.java:83)
at org.apache.maven.surefire.junit4.JUnit4TestSet.execute(JUnit4TestSet.java:62)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127)
at org.apache.maven.surefire.Surefire.run(Surefire.java:177)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:345)
at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:1009)
Caused by: javax.naming.NameNotFoundException: invoker not bound
at org.jnp.server.NamingServer.getBinding(NamingServer.java:771)
at org.jnp.server.NamingServer.getBinding(NamingServer.java:779)
at org.jnp.server.NamingServer.getObject(NamingServer.java:785)
at org.jnp.server.NamingServer.lookup(NamingServer.java:396)
at org.jnp.server.NamingServer.lookup(NamingServer.java:399)
at sun.reflect.GeneratedMethodAccessor607.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:305)
at sun.rmi.transport.Transport$1.run(Transport.java:159)
at java.security.AccessController.doPrivileged(Native Method)
at sun.rmi.transport.Transport.serviceCall(Transport.java:155)
at sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:535)
at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:790)
at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:649)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
at sun.rmi.transport.StreamRemoteCall.exceptionReceivedFromServer(StreamRemoteCall.java:255)
at sun.rmi.transport.StreamRemoteCall.executeCall(StreamRemoteCall.java:233)
at sun.rmi.server.UnicastRef.invoke(UnicastRef.java:142)
at org.jnp.server.NamingServer_Stub.lookup(Unknown Source)
at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:726)
at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:686)
at javax.naming.InitialContext.lookup(InitialContext.java:392)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:71)
... 17 more
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.037 sec <<< FAILURE!
Running org.jboss.soa.bpel.tests.testcases.RiftSaw70TestCase
java.lang.RuntimeException: Cannot obtain MBeanServerConnection using jndi props: {java.naming.provider.url=localhost:1099, java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory, java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces:org.jnp.interfaces, hostKey=localhost/127.0.0.1:1099}
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:75)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getDeployer(RiftSawTestHelper.java:82)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.deploy(RiftSawTestHelper.java:48)
at org.jboss.soa.bpel.tests.RiftSawTestSetup.setUp(RiftSawTestSetup.java:104)
at junit.extensions.TestSetup$1.protect(TestSetup.java:22)
at junit.framework.TestResult.runProtected(TestResult.java:128)
at junit.extensions.TestSetup.run(TestSetup.java:27)
at org.junit.internal.runners.JUnit38ClassRunner.run(JUnit38ClassRunner.java:83)
at org.apache.maven.surefire.junit4.JUnit4TestSet.execute(JUnit4TestSet.java:62)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127)
at org.apache.maven.surefire.Surefire.run(Surefire.java:177)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:345)
at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:1009)
Caused by: javax.naming.NameNotFoundException: invoker not bound
at org.jnp.server.NamingServer.getBinding(NamingServer.java:771)
at org.jnp.server.NamingServer.getBinding(NamingServer.java:779)
at org.jnp.server.NamingServer.getObject(NamingServer.java:785)
at org.jnp.server.NamingServer.lookup(NamingServer.java:396)
at org.jnp.server.NamingServer.lookup(NamingServer.java:399)
at sun.reflect.GeneratedMethodAccessor607.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:305)
at sun.rmi.transport.Transport$1.run(Transport.java:159)
at java.security.AccessController.doPrivileged(Native Method)
at sun.rmi.transport.Transport.serviceCall(Transport.java:155)
at sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:535)
at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:790)
at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:649)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
at sun.rmi.transport.StreamRemoteCall.exceptionReceivedFromServer(StreamRemoteCall.java:255)
at sun.rmi.transport.StreamRemoteCall.executeCall(StreamRemoteCall.java:233)
at sun.rmi.server.UnicastRef.invoke(UnicastRef.java:142)
at org.jnp.server.NamingServer_Stub.lookup(Unknown Source)
at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:726)
at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:686)
at javax.naming.InitialContext.lookup(InitialContext.java:392)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:71)
... 17 more
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.051 sec <<< FAILURE!
Running org.jboss.soa.bpel.tests.samples.QuickstartBPELSecureInvokeTestCase
java.lang.RuntimeException: Cannot obtain MBeanServerConnection using jndi props: {java.naming.provider.url=localhost:1099, java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory, java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces:org.jnp.interfaces, hostKey=localhost/127.0.0.1:1099}
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:75)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getDeployer(RiftSawTestHelper.java:82)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.deploy(RiftSawTestHelper.java:48)
at org.jboss.soa.bpel.tests.RiftSawTestSetup.setUp(RiftSawTestSetup.java:104)
at junit.extensions.TestSetup$1.protect(TestSetup.java:22)
at junit.framework.TestResult.runProtected(TestResult.java:128)
at junit.extensions.TestSetup.run(TestSetup.java:27)
at org.junit.internal.runners.JUnit38ClassRunner.run(JUnit38ClassRunner.java:83)
at org.apache.maven.surefire.junit4.JUnit4TestSet.execute(JUnit4TestSet.java:62)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127)
at org.apache.maven.surefire.Surefire.run(Surefire.java:177)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:345)
at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:1009)
Caused by: javax.naming.NameNotFoundException: invoker not bound
at org.jnp.server.NamingServer.getBinding(NamingServer.java:771)
at org.jnp.server.NamingServer.getBinding(NamingServer.java:779)
at org.jnp.server.NamingServer.getObject(NamingServer.java:785)
at org.jnp.server.NamingServer.lookup(NamingServer.java:396)
at org.jnp.server.NamingServer.lookup(NamingServer.java:399)
at sun.reflect.GeneratedMethodAccessor607.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:305)
at sun.rmi.transport.Transport$1.run(Transport.java:159)
at java.security.AccessController.doPrivileged(Native Method)
at sun.rmi.transport.Transport.serviceCall(Transport.java:155)
at sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:535)
at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:790)
at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:649)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)
at sun.rmi.transport.StreamRemoteCall.exceptionReceivedFromServer(StreamRemoteCall.java:255)
at sun.rmi.transport.StreamRemoteCall.executeCall(StreamRemoteCall.java:233)
at sun.rmi.server.UnicastRef.invoke(UnicastRef.java:142)
at org.jnp.server.NamingServer_Stub.lookup(Unknown Source)
at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:726)
at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:686)
at javax.naming.InitialContext.lookup(InitialContext.java:392)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.getServer(RiftSawTestHelper.java:71)
... 17 more
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.049 sec <<< FAILURE!
Results :
Tests in error:
junit.framework.TestSuite(a)7c2e1f1f(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)217f242c(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)506f9b8e(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)1d329642(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)1e22ab57(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)6c01bde4(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)4ebac9b9(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)3cc262(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)1a50ca0c(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)1b815bfb(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)7eda18ac(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)470b9279(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)17094d48(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)579d75ee(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)8542529(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)326b9c84(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)7f724a9d(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)3e364641(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)6f0ffb38(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)11e7c5cb(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)3ad3c6a3(org.jboss.soa.bpel.tests.RiftSawTestSetup)
testSendHello(org.jboss.soa.bpel.tests.management.RiftSaw238TestCase)
junit.framework.TestSuite(a)7b7a4989(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)6b6d2702(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)7d5718f2(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)1a3a9bba(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)7f4d1d41(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)6aba4211(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)30ff8c74(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)4f2b6c89(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)731d2572(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)1fe903d5(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)688c4a77(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)e5d391d(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)5e2b323e(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)585976c2(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)5d2aea3e(org.jboss.soa.bpel.tests.RiftSawTestSetup)
junit.framework.TestSuite(a)2f60877b(org.jboss.soa.bpel.tests.RiftSawTestSetup)
Tests run: 38, Failures: 0, Errors: 38, Skipped: 0
[ERROR] There are test failures.
Please refer to <http://hudson.qa.jboss.com/hudson/job/RiftSaw-jbossws-cxf/ws/riftsaw/inte...> for the individual test results.
[INFO] [antrun:run {execution: undeploy-riftsaw}]
[INFO] Executing tasks
stop-server:
[echo] Stopping the server
[echo] Server is at <http://hudson.qa.jboss.com/hudson/job/RiftSaw-jbossws-cxf/ws/riftsaw-2.3....>
[java] Exception in thread "main" javax.naming.NameNotFoundException: RMIAdaptor not bound
[java] at org.jnp.server.NamingServer.getBinding(NamingServer.java:771)
[java] at org.jnp.server.NamingServer.getBinding(NamingServer.java:779)
[java] at org.jnp.server.NamingServer.getObject(NamingServer.java:785)
[java] at org.jnp.server.NamingServer.lookup(NamingServer.java:443)
[java] at org.jnp.server.NamingServer.lookup(NamingServer.java:399)
[java] at org.jnp.server.NamingServer.lookup(NamingServer.java:399)
[java] at sun.reflect.GeneratedMethodAccessor607.invoke(Unknown Source)
[java] at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
[java] at java.lang.reflect.Method.invoke(Method.java:597)
[java] at sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:305)
[java] at sun.rmi.transport.Transport$1.run(Transport.java:159)
[java] at java.security.AccessController.doPrivileged(Native Method)
[java] at sun.rmi.transport.Transport.serviceCall(Transport.java:155)
[java] at sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:535)
[java] at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:790)
[java] at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:649)
[java] at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
[java] at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
[java] at java.lang.Thread.run(Thread.java:619)
[java] at sun.rmi.transport.StreamRemoteCall.exceptionReceivedFromServer(StreamRemoteCall.java:255)
[java] at sun.rmi.transport.StreamRemoteCall.executeCall(StreamRemoteCall.java:233)
[java] at sun.rmi.server.UnicastRef.invoke(UnicastRef.java:142)
[java] at org.jnp.server.NamingServer_Stub.lookup(Unknown Source)
[java] at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:726)
[java] at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:686)
[java] at javax.naming.InitialContext.lookup(InitialContext.java:392)
[java] at org.jboss.Shutdown.main(Shutdown.java:219)
[java] Java Result: 1
[echo] Shutdown rc = 1
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD ERROR
[INFO] ------------------------------------------------------------------------
[INFO] An Ant BuildException has occured: The following error occurred while executing this line:
<http://hudson.qa.jboss.com/hudson/job/RiftSaw-jbossws-cxf/ws/riftsaw/inte...>:162: Unable to shut down JBoss (maybe it hasn't fully started yet?).
[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 8 minutes 9 seconds
[INFO] Finished at: Fri Feb 04 10:53:19 EST 2011
[INFO] Final Memory: 117M/661M
[INFO] ------------------------------------------------------------------------
Recording test results
Archiving artifacts
13 years, 10 months
- 1
- 0
riftsaw SVN: r1300 - in trunk/distribution/src/main: release/modules/riftsaw-as5.deployer/META-INF and 1 other directories.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2011-02-04 07:11:53 -0500 (Fri, 04 Feb 2011)
New Revision: 1300
Modified:
trunk/distribution/src/main/assembly/bin.xml
trunk/distribution/src/main/release/modules/riftsaw-as5.deployer/META-INF/riftsaw-deployers-jboss-beans.xml
trunk/distribution/src/main/release/modules/riftsaw-as6.deployer/META-INF/riftsaw-deployers-jboss-beans.xml
Log:
RIFTSAW-333 - deployer now installs but requires further testing.
Modified: trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- trunk/distribution/src/main/assembly/bin.xml 2011-02-04 12:10:39 UTC (rev 1299)
+++ trunk/distribution/src/main/assembly/bin.xml 2011-02-04 12:11:53 UTC (rev 1300)
@@ -56,11 +56,27 @@
<directory>../runtime/deployer/target</directory>
<outputDirectory>/modules/riftsaw-as5.deployer</outputDirectory>
<includes>
+ <include>jboss-riftsaw-deployer.jar</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../runtime/deployer-as5/target</directory>
+ <outputDirectory>/modules/riftsaw-as5.deployer</outputDirectory>
+ <includes>
<include>jboss-riftsaw-deployer-as5.jar</include>
</includes>
</fileSet>
<fileSet>
+ <directory>../runtime/deployer/target</directory>
+ <outputDirectory>/modules/riftsaw-as6.deployer</outputDirectory>
+ <includes>
+ <include>jboss-riftsaw-deployer.jar</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
<directory>../runtime/deployer-as6/target</directory>
<outputDirectory>/modules/riftsaw-as6.deployer</outputDirectory>
<includes>
Modified: trunk/distribution/src/main/release/modules/riftsaw-as5.deployer/META-INF/riftsaw-deployers-jboss-beans.xml
===================================================================
--- trunk/distribution/src/main/release/modules/riftsaw-as5.deployer/META-INF/riftsaw-deployers-jboss-beans.xml 2011-02-04 12:10:39 UTC (rev 1299)
+++ trunk/distribution/src/main/release/modules/riftsaw-as5.deployer/META-INF/riftsaw-deployers-jboss-beans.xml 2011-02-04 12:11:53 UTC (rev 1300)
@@ -2,13 +2,10 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="BPELStructureDeployer" class="org.jboss.soa.bpel.deployer.BPELStructureDeployer">
+ <bean name="BPELStructureDeployer" class="org.jboss.soa.bpel.deployer.as5.BPELStructureDeployer">
</bean>
- <bean name="BPELDeployer" class="org.jboss.soa.bpel.deployer.BPELDeployer">
- <property name="jndiName" >
- <value>bpel/Deployer</value>
- </property>
+ <bean name="BPELDeployer" class="org.jboss.soa.bpel.deployer.as5.AS5BPELDeployer">
</bean>
</deployment>
Modified: trunk/distribution/src/main/release/modules/riftsaw-as6.deployer/META-INF/riftsaw-deployers-jboss-beans.xml
===================================================================
--- trunk/distribution/src/main/release/modules/riftsaw-as6.deployer/META-INF/riftsaw-deployers-jboss-beans.xml 2011-02-04 12:10:39 UTC (rev 1299)
+++ trunk/distribution/src/main/release/modules/riftsaw-as6.deployer/META-INF/riftsaw-deployers-jboss-beans.xml 2011-02-04 12:11:53 UTC (rev 1300)
@@ -2,13 +2,10 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="BPELStructureDeployer" class="org.jboss.soa.bpel.deployer.BPELStructureDeployer">
+ <bean name="BPELStructureDeployer" class="org.jboss.soa.bpel.deployer.as6.BPELStructureDeployer">
</bean>
- <bean name="BPELDeployer" class="org.jboss.soa.bpel.deployer.BPELDeployer">
- <property name="jndiName" >
- <value>bpel/Deployer</value>
- </property>
+ <bean name="BPELDeployer" class="org.jboss.soa.bpel.deployer.as6.AS6BPELDeployer">
</bean>
</deployment>
13 years, 10 months
- 1
- 0
riftsaw SVN: r1299 - in trunk/runtime: deployer and 15 other directories.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2011-02-04 07:10:39 -0500 (Fri, 04 Feb 2011)
New Revision: 1299
Added:
trunk/runtime/deployer-as5/
trunk/runtime/deployer-as5/pom.xml
trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/as5/
trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/as5/AS5BPELDeployer.java
trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/as5/BPELStructureDeployer.java
trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/as6/
trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/as6/AS6BPELDeployer.java
trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/as6/BPELStructureDeployer.java
trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployerFactory.java
Removed:
trunk/runtime/deployer-as5/pom.xml
trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java
trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentListener.java
trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentUnit.java
trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java
trunk/runtime/deployer-as5/src/test/java/org/jboss/soa/bpel/deployer/
trunk/runtime/deployer-as5/src/test/java/org/jboss/soa/bpel/runtime/
trunk/runtime/deployer-as5/src/test/resources/testdata/test_module_1.esb/
trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java
trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentListener.java
trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentUnit.java
trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java
trunk/runtime/deployer-as6/src/test/java/org/jboss/soa/bpel/deployer/
trunk/runtime/deployer-as6/src/test/java/org/jboss/soa/bpel/runtime/
trunk/runtime/deployer-as6/src/test/resources/testdata/test_module_1.esb/
trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java
trunk/runtime/deployer/src/test/java/org/jboss/soa/bpel/runtime/
trunk/runtime/deployer/src/test/resources/testdata/test_module_1.esb/
Modified:
trunk/runtime/deployer-as6/pom.xml
trunk/runtime/deployer/pom.xml
trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java
trunk/runtime/engine/pom.xml
trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java
trunk/runtime/pom.xml
Log:
RIFTSAW-333 - deployer now installs but requires further testing.
Modified: trunk/runtime/deployer/pom.xml
===================================================================
--- trunk/runtime/deployer/pom.xml 2011-02-03 12:47:54 UTC (rev 1298)
+++ trunk/runtime/deployer/pom.xml 2011-02-04 12:10:39 UTC (rev 1299)
@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.bpel.runtime</groupId>
- <artifactId>deployer-as5</artifactId>
+ <artifactId>deployer</artifactId>
<packaging>jar</packaging>
<version>2.3.0-SNAPSHOT</version>
- <name>RiftSaw::Runtime::Deployer-AS5</name>
+ <name>RiftSaw::Runtime::Deployer</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
@@ -16,54 +16,6 @@
<dependencies>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>2.2.14.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- <version>2.0.7.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- <version>2.0.7.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- <version>2.0.7.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- <version>2.0.7.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <version>2.0.7.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>2.1.2.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- <version>2.0.2.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
<version>2.1.0.GA</version>
@@ -82,7 +34,7 @@
</dependency>
</dependencies>
<build>
- <finalName>jboss-riftsaw-deployer-as5</finalName>
+ <finalName>jboss-riftsaw-deployer</finalName>
<!-- This section defines the default plugin settings inherited by child projects. -->
<pluginManagement>
Modified: trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java
===================================================================
--- trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java 2011-02-03 12:47:54 UTC (rev 1298)
+++ trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java 2011-02-04 12:10:39 UTC (rev 1299)
@@ -17,224 +17,21 @@
*/
package org.jboss.soa.bpel.deployer;
-import javax.naming.InitialContext;
-import javax.naming.Name;
-import javax.naming.NamingException;
-
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-
-import org.jboss.logging.Logger;
-import org.jboss.util.naming.NonSerializableFactory;
-import org.jboss.virtual.VFSUtils;
-import org.jboss.virtual.VirtualFile;
-
/**
- * This is the deployer for deploying BPEL (and associated artifacts) into
- * the runtime.
+ * This class represents the BPEL deployer, responsible for
+ * deploying BPEL processes into the server.
*
* @author gbrown
*
*/
-public class BPELDeployer extends AbstractDeployer {
-
- public static final String BPELDeployerService="bpel/Deployer";
-
- public void deploy(DeploymentUnit du) throws DeploymentException {
-
- if (du instanceof VFSDeploymentUnit &&
- (du.getSimpleName().equals(BPELDeploymentUnit.DEPLOY_XML) ||
- du.getSimpleName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML))) {
- DeploymentUnit top=du;
-
- if (top.isTopLevel() == false) {
- top = du.getTopLevel();
- }
-
- logger.info("Deploy: "+top.getSimpleName()+" relativePath="+
- du.getRelativePath());
-
- VirtualFile root=((VFSDeploymentUnit)du).getRoot();
-
- logger.debug("Deployment descriptor file="+root);
-
- try {
- VirtualFile parent=((VFSDeploymentUnit)du).getRoot().getParent();
-
- logger.debug("Deployment unit dir="+parent);
-
- VirtualFile tmp=VFSUtils.explode(parent);
-
- java.net.URL url=VFSUtils.getCompatibleURL(tmp);
-
- logger.debug("Deployment exploded to dir="+tmp+" URL="+url);
-
- long lastModTime=0;
-
- if (top instanceof VFSDeploymentUnit) {
- lastModTime = ((VFSDeploymentUnit)top).getRoot().getLastModified();
- } else {
- logger.warn("Unable to determine last modified time for: "+top);
- }
-
- // TODO: Need to be a more unique name, as it is possible that more
- // than one deployment descriptor may exist in the same AS archive
- BPELDeploymentUnit unit=new BPELDeploymentUnit(top.getSimpleName(), lastModTime);
-
- java.io.File ddfile=new java.io.File(url.getFile(), du.getSimpleName()); //BPELDeploymentUnit.BPEL_DEPLOY_XML);
-
- if (ddfile.exists() == false) {
- logger.error("Failed to deploy '"+ddfile+
- "', unable to locate deployment descriptor file");
- } else {
- unit.setDeploymentDescriptor(ddfile);
-
- synchronized(m_deploymentUnits) {
- m_deploymentUnits.put(unit.getName(), unit);
-
- if (m_listener != null) {
- m_listener.deploy(unit);
- }
- }
- }
-
- } catch (Exception e) {
- throw new DeploymentException("Failed to explode deployment unit '"+root+"'", e);
- }
- }
- }
+public interface BPELDeployer {
- @Override
- public void undeploy(DeploymentUnit du) {
-
- if (du instanceof VFSDeploymentUnit &&
- (du.getSimpleName().equals(BPELDeploymentUnit.DEPLOY_XML) ||
- du.getSimpleName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML))) {
- DeploymentUnit top=du;
-
- if (top.isTopLevel() == false) {
- top = du.getTopLevel();
- }
-
- logger.info("Undeploy: "+top.getSimpleName()+" relativePath="+
- du.getRelativePath());
-
- try {
- BPELDeploymentUnit prev=m_deploymentUnits.get(top.getSimpleName());
-
- // Undeploy if deployment unit no longer exists on the filesystem, OR
- // the last modified time of the cached deployment unit is older than
- // the last modified time of the current deployment unit, signifying
- // it has been updated and therefore must be undeployed first
- if (top instanceof VFSDeploymentUnit &&
- (((VFSDeploymentUnit)top).getRoot().exists() == false ||
- (prev != null && prev.getLastModified() <
- ((VFSDeploymentUnit)top).getRoot().getLastModified()))) {
-
- // TODO: Unique name - see deploy
- BPELDeploymentUnit unit=new BPELDeploymentUnit(top.getSimpleName(), 0);
-
- // NOTE: File required to provide path for use in ODE
- // process store impl. When this is replaced, this information
- // will not be required.
- java.io.File ddfile=new java.io.File(((VFSDeploymentUnit)du).getRoot().toURL().getFile());
-
- unit.setDeploymentDescriptor(ddfile);
-
- synchronized(m_deploymentUnits) {
- m_deploymentUnits.remove(unit.getName());
-
- if (m_listener != null) {
- m_listener.undeploy(unit);
- }
- }
- } else {
- logger.info("Not undeploying BPEL: "+top.getSimpleName()+" relativePath="+
- du.getRelativePath());
- }
- } catch(Exception e) {
- logger.error("Failed to undeploy '"+du+"'", e);
- }
- }
- }
-
/**
* This method sets the deployment listener that will be
* informed when BPEL deployment units are detected.
*
* @param l The BPEL deployment listener
*/
- public void setDeploymentListener(BPELDeploymentListener l) {
-
- logger.debug("Set deployment listener: "+l);
-
- synchronized(m_deploymentUnits) {
- m_listener = l;
-
- // Notify listener of the currently deployed units
- java.util.Iterator<BPELDeploymentUnit> iter=m_deploymentUnits.values().iterator();
- while (iter.hasNext()) {
- l.deploy(iter.next());
- }
- }
- }
+ public void setDeploymentListener(BPELDeploymentListener l);
- /**
- * This method returns the JNDI name for the BPEL deployer.
- *
- * @return The JNDI name
- */
- public String getJndiName() {
- return m_jndiName;
- }
-
- /**
- * This method sets the JNDI name for the BPEL deployer.
- *
- * @param jndiName The JNDI name
- * @throws NamingException Failed to update JNDI with the supplied
- * name binding
- */
- public void setJndiName(String jndiName)throws NamingException {
- String oldName = m_jndiName;
- m_jndiName = jndiName;
-
- if (oldName != null) {
- unbind(oldName);
- }
-
- try {
- rebind();
- } catch(Exception e) {
- NamingException ne = new NamingException("Failed to update jndiName");
- ne.setRootCause(e);
- throw ne;
- }
- }
-
- private void rebind() throws NamingException {
- InitialContext rootCtx = new InitialContext();
- Name fullName = rootCtx.getNameParser("").parse(m_jndiName);
- log.debug("Binding BPEL deployer to name="+fullName);
- NonSerializableFactory.rebind(fullName, this, true);
- }
-
- private void unbind(String jndiName) {
- try {
- InitialContext rootCtx = new InitialContext();
- rootCtx.unbind(jndiName);
- NonSerializableFactory.unbind(jndiName);
- } catch(NamingException e) {
- log.error("Failed to unbind map", e);
- }
- }
-
- private final static Logger logger = Logger.getLogger(BPELDeployer.class);
-
- private String m_jndiName=null;
- private BPELDeploymentListener m_listener=null;
- private java.util.Map<String, BPELDeploymentUnit> m_deploymentUnits=
- new java.util.HashMap<String, BPELDeploymentUnit>();
}
Added: trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployerFactory.java
===================================================================
--- trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployerFactory.java (rev 0)
+++ trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployerFactory.java 2011-02-04 12:10:39 UTC (rev 1299)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, 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 WITHOUT A
+ * 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,
+ * 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.
+ */
+package org.jboss.soa.bpel.deployer;
+
+/**
+ * This class represents the BPEL deployer factory, responsible for
+ * managing a deployer singleton.
+ *
+ * @author gbrown
+ *
+ */
+public class BPELDeployerFactory {
+
+ private static BPELDeployer m_instance=null;
+
+ /**
+ * This method returns the BPEL deployer singleton.
+ *
+ * @return The deployer singleton
+ */
+ public static BPELDeployer getInstance() {
+ return(m_instance);
+ }
+
+ /**
+ * This method sets the singleton.
+ *
+ * @param deployer The deployer
+ */
+ public static void setInstance(BPELDeployer deployer) {
+ m_instance = deployer;
+ }
+
+}
Deleted: trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java
===================================================================
--- trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java 2011-02-03 12:47:54 UTC (rev 1298)
+++ trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java 2011-02-04 12:10:39 UTC (rev 1299)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, 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 WITHOUT A
- * 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,
- * 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.
- */
-package org.jboss.soa.bpel.deployer;
-
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.annotations.AnnotationEnvironment;
-import org.jboss.deployers.vfs.spi.structure.StructureContext;
-import org.jboss.deployers.vfs.spi.structure.helpers.AbstractStructureDeployer;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * Implementation of the BPEL Structure Deployer, used to locate the
- * BPEL deployment descriptor and create a context for the BPEL
- * deployment unit.
- *
- * @author gbrown
- *
- */
-public class BPELStructureDeployer extends AbstractStructureDeployer {
-
- @Override
- protected AnnotationEnvironment createAnnotationEnvironment(VirtualFile arg0) {
- return null;
- }
-
- public boolean determineStructure(StructureContext sc)
- throws DeploymentException {
- boolean ret=false;
-
- try {
- // Must look for the deployment descriptor, as opposed to the container
- // that contains the descriptor, because in the case of a Jar with the descriptor
- // at the top level, the deployer will not get called with the Jar top level
- // node, as this is handled by a Jar deployer.
- if (sc.getName().equals(BPELDeploymentUnit.DEPLOY_XML) ||
- sc.getName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML)) {
- ret = true;
-
- // Create the context for the deployment associated with
- // the deployment descriptor's parent container
- createContext(sc);
- }
- } catch (Exception e) {
- throw new DeploymentException(e);
- }
-
- return(ret);
- }
-
-}
Copied: trunk/runtime/deployer-as5 (from rev 1272, trunk/runtime/deployer)
Deleted: trunk/runtime/deployer-as5/pom.xml
===================================================================
--- trunk/runtime/deployer/pom.xml 2011-01-25 14:01:32 UTC (rev 1272)
+++ trunk/runtime/deployer-as5/pom.xml 2011-02-04 12:10:39 UTC (rev 1299)
@@ -1,170 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.soa.bpel.runtime</groupId>
- <artifactId>deployer</artifactId>
- <packaging>jar</packaging>
- <version>2.3.0-SNAPSHOT</version>
- <name>RiftSaw::Runtime::Deployer</name>
-
- <parent>
- <groupId>org.jboss.soa.bpel</groupId>
- <artifactId>runtime</artifactId>
- <version>2.3.0-SNAPSHOT</version>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>2.2.14.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- <version>2.0.7.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- <version>2.0.7.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- <version>2.0.7.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- <version>2.0.7.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <version>2.0.7.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>2.1.2.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- <version>2.0.2.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>2.1.0.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.0</version>
- </dependency>
- </dependencies>
- <build>
- <finalName>jboss-riftsaw-deployer</finalName>
-
- <!-- This section defines the default plugin settings inherited by child projects. -->
- <pluginManagement>
- <plugins>
- <!-- Fixes how test resources of a project can be used in projects dependent on it -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-packaging-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- <extensions>true</extensions>
- <configuration>
- <excludes>
- <exclude>jboss:jboss-common</exclude>
- <exclude>jboss:jboss-system</exclude>
- <exclude>jboss:jboss-jmx</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <!-- Specify the compiler options and settings -->
- <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>
- <showDeprecation>false</showDeprecation>
- <showWarnings>false</showWarnings>
- </configuration>
- </plugin>
-
- <!-- Produce source jars during the 'verify' phase -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*TestCase.java</include>
- <include>**/*Test.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
-</project>
Copied: trunk/runtime/deployer-as5/pom.xml (from rev 1273, trunk/runtime/deployer/pom.xml)
===================================================================
--- trunk/runtime/deployer-as5/pom.xml (rev 0)
+++ trunk/runtime/deployer-as5/pom.xml 2011-02-04 12:10:39 UTC (rev 1299)
@@ -0,0 +1,176 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.soa.bpel.runtime</groupId>
+ <artifactId>deployer-as5</artifactId>
+ <packaging>jar</packaging>
+ <version>2.3.0-SNAPSHOT</version>
+ <name>RiftSaw::Runtime::Deployer-AS5</name>
+
+ <parent>
+ <groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>runtime</artifactId>
+ <version>2.3.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.soa.bpel.runtime</groupId>
+ <artifactId>deployer</artifactId>
+ <version>${riftsaw.engine.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>2.2.14.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
+ <version>2.0.7.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <version>2.0.7.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ <version>2.0.7.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ <version>2.0.7.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <version>2.0.7.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>2.1.2.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <version>2.0.2.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>2.1.0.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.0</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>jboss-riftsaw-deployer-as5</finalName>
+
+ <!-- This section defines the default plugin settings inherited by child projects. -->
+ <pluginManagement>
+ <plugins>
+ <!-- Fixes how test resources of a project can be used in projects dependent on it -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-packaging-maven-plugin</artifactId>
+ <version>2.0-beta-1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <excludes>
+ <exclude>jboss:jboss-common</exclude>
+ <exclude>jboss:jboss-system</exclude>
+ <exclude>jboss:jboss-jmx</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <!-- Specify the compiler options and settings -->
+ <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>
+ <showDeprecation>false</showDeprecation>
+ <showWarnings>false</showWarnings>
+ </configuration>
+ </plugin>
+
+ <!-- Produce source jars during the 'verify' phase -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*TestCase.java</include>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
Deleted: trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java
===================================================================
--- trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java 2011-01-25 14:01:32 UTC (rev 1272)
+++ trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java 2011-02-04 12:10:39 UTC (rev 1299)
@@ -1,240 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, 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 WITHOUT A
- * 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,
- * 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.
- */
-package org.jboss.soa.bpel.deployer;
-
-import javax.naming.InitialContext;
-import javax.naming.Name;
-import javax.naming.NamingException;
-
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-
-import org.jboss.logging.Logger;
-import org.jboss.util.naming.NonSerializableFactory;
-import org.jboss.virtual.VFSUtils;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * This is the deployer for deploying BPEL (and associated artifacts) into
- * the runtime.
- *
- * @author gbrown
- *
- */
-public class BPELDeployer extends AbstractDeployer {
-
- public static final String BPELDeployerService="bpel/Deployer";
-
- public void deploy(DeploymentUnit du) throws DeploymentException {
-
- if (du instanceof VFSDeploymentUnit &&
- (du.getSimpleName().equals(BPELDeploymentUnit.DEPLOY_XML) ||
- du.getSimpleName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML))) {
- DeploymentUnit top=du;
-
- if (top.isTopLevel() == false) {
- top = du.getTopLevel();
- }
-
- logger.info("Deploy: "+top.getSimpleName()+" relativePath="+
- du.getRelativePath());
-
- VirtualFile root=((VFSDeploymentUnit)du).getRoot();
-
- logger.debug("Deployment descriptor file="+root);
-
- try {
- VirtualFile parent=((VFSDeploymentUnit)du).getRoot().getParent();
-
- logger.debug("Deployment unit dir="+parent);
-
- VirtualFile tmp=VFSUtils.explode(parent);
-
- java.net.URL url=VFSUtils.getCompatibleURL(tmp);
-
- logger.debug("Deployment exploded to dir="+tmp+" URL="+url);
-
- long lastModTime=0;
-
- if (top instanceof VFSDeploymentUnit) {
- lastModTime = ((VFSDeploymentUnit)top).getRoot().getLastModified();
- } else {
- logger.warn("Unable to determine last modified time for: "+top);
- }
-
- // TODO: Need to be a more unique name, as it is possible that more
- // than one deployment descriptor may exist in the same AS archive
- BPELDeploymentUnit unit=new BPELDeploymentUnit(top.getSimpleName(), lastModTime);
-
- java.io.File ddfile=new java.io.File(url.getFile(), du.getSimpleName()); //BPELDeploymentUnit.BPEL_DEPLOY_XML);
-
- if (ddfile.exists() == false) {
- logger.error("Failed to deploy '"+ddfile+
- "', unable to locate deployment descriptor file");
- } else {
- unit.setDeploymentDescriptor(ddfile);
-
- synchronized(m_deploymentUnits) {
- m_deploymentUnits.put(unit.getName(), unit);
-
- if (m_listener != null) {
- m_listener.deploy(unit);
- }
- }
- }
-
- } catch (Exception e) {
- throw new DeploymentException("Failed to explode deployment unit '"+root+"'", e);
- }
- }
- }
-
- @Override
- public void undeploy(DeploymentUnit du) {
-
- if (du instanceof VFSDeploymentUnit &&
- (du.getSimpleName().equals(BPELDeploymentUnit.DEPLOY_XML) ||
- du.getSimpleName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML))) {
- DeploymentUnit top=du;
-
- if (top.isTopLevel() == false) {
- top = du.getTopLevel();
- }
-
- logger.info("Undeploy: "+top.getSimpleName()+" relativePath="+
- du.getRelativePath());
-
- try {
- BPELDeploymentUnit prev=m_deploymentUnits.get(top.getSimpleName());
-
- // Undeploy if deployment unit no longer exists on the filesystem, OR
- // the last modified time of the cached deployment unit is older than
- // the last modified time of the current deployment unit, signifying
- // it has been updated and therefore must be undeployed first
- if (top instanceof VFSDeploymentUnit &&
- (((VFSDeploymentUnit)top).getRoot().exists() == false ||
- (prev != null && prev.getLastModified() <
- ((VFSDeploymentUnit)top).getRoot().getLastModified()))) {
-
- // TODO: Unique name - see deploy
- BPELDeploymentUnit unit=new BPELDeploymentUnit(top.getSimpleName(), 0);
-
- // NOTE: File required to provide path for use in ODE
- // process store impl. When this is replaced, this information
- // will not be required.
- java.io.File ddfile=new java.io.File(((VFSDeploymentUnit)du).getRoot().toURL().getFile());
-
- unit.setDeploymentDescriptor(ddfile);
-
- synchronized(m_deploymentUnits) {
- m_deploymentUnits.remove(unit.getName());
-
- if (m_listener != null) {
- m_listener.undeploy(unit);
- }
- }
- } else {
- logger.info("Not undeploying BPEL: "+top.getSimpleName()+" relativePath="+
- du.getRelativePath());
- }
- } catch(Exception e) {
- logger.error("Failed to undeploy '"+du+"'", e);
- }
- }
- }
-
- /**
- * This method sets the deployment listener that will be
- * informed when BPEL deployment units are detected.
- *
- * @param l The BPEL deployment listener
- */
- public void setDeploymentListener(BPELDeploymentListener l) {
-
- logger.debug("Set deployment listener: "+l);
-
- synchronized(m_deploymentUnits) {
- m_listener = l;
-
- // Notify listener of the currently deployed units
- java.util.Iterator<BPELDeploymentUnit> iter=m_deploymentUnits.values().iterator();
- while (iter.hasNext()) {
- l.deploy(iter.next());
- }
- }
- }
-
- /**
- * This method returns the JNDI name for the BPEL deployer.
- *
- * @return The JNDI name
- */
- public String getJndiName() {
- return m_jndiName;
- }
-
- /**
- * This method sets the JNDI name for the BPEL deployer.
- *
- * @param jndiName The JNDI name
- * @throws NamingException Failed to update JNDI with the supplied
- * name binding
- */
- public void setJndiName(String jndiName)throws NamingException {
- String oldName = m_jndiName;
- m_jndiName = jndiName;
-
- if (oldName != null) {
- unbind(oldName);
- }
-
- try {
- rebind();
- } catch(Exception e) {
- NamingException ne = new NamingException("Failed to update jndiName");
- ne.setRootCause(e);
- throw ne;
- }
- }
-
- private void rebind() throws NamingException {
- InitialContext rootCtx = new InitialContext();
- Name fullName = rootCtx.getNameParser("").parse(m_jndiName);
- log.debug("Binding BPEL deployer to name="+fullName);
- NonSerializableFactory.rebind(fullName, this, true);
- }
-
- private void unbind(String jndiName) {
- try {
- InitialContext rootCtx = new InitialContext();
- rootCtx.unbind(jndiName);
- NonSerializableFactory.unbind(jndiName);
- } catch(NamingException e) {
- log.error("Failed to unbind map", e);
- }
- }
-
- private final static Logger logger = Logger.getLogger(BPELDeployer.class);
-
- private String m_jndiName=null;
- private BPELDeploymentListener m_listener=null;
- private java.util.Map<String, BPELDeploymentUnit> m_deploymentUnits=
- new java.util.HashMap<String, BPELDeploymentUnit>();
-}
Deleted: trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentListener.java
===================================================================
--- trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentListener.java 2011-01-25 14:01:32 UTC (rev 1272)
+++ trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentListener.java 2011-02-04 12:10:39 UTC (rev 1299)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, 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 WITHOUT A
- * 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,
- * 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.
- */
-package org.jboss.soa.bpel.deployer;
-
-/**
- * This interface represents a component interested in deploying BPEL deployment units.
- *
- * @author gbrown
- *
- */
-public interface BPELDeploymentListener {
-
- /**
- * This method is invoked to deploy a BPEL deployment unit.
- *
- * @param bdu The BPEL deployment unit
- */
- public void deploy(BPELDeploymentUnit bdu);
-
- /**
- * This method is invoked to undeploy a BPEL deployment unit.
- *
- * @param bdu The BPEL deployment unit
- */
- public void undeploy(BPELDeploymentUnit bdu);
-
-}
Deleted: trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentUnit.java
===================================================================
--- trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentUnit.java 2011-01-25 14:01:32 UTC (rev 1272)
+++ trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentUnit.java 2011-02-04 12:10:39 UTC (rev 1299)
@@ -1,93 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, 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 WITHOUT A
- * 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,
- * 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.
- */
-package org.jboss.soa.bpel.deployer;
-
-/**
- * This class represents the BPEL deployment unit.
- *
- * @author gbrown
- *
- */
-public class BPELDeploymentUnit {
-
- public static final String BPEL_DEPLOY_XML = "bpel-deploy.xml";
- public static final String DEPLOY_XML = "deploy.xml";
-
- /**
- * The constructor for the deployment unit.
- *
- * @param name The unique name for the deployment unit
- * @param lastModified When the deployment unit was last modified
- */
- public BPELDeploymentUnit(String name, long lastModified) {
- m_name = name;
- m_lastModified = lastModified;
-
- // Remove any .jar suffix
- if (m_name != null && m_name.endsWith(".jar")) {
- m_name = m_name.substring(0, m_name.length()-4);
- }
- }
-
- /**
- * This method returns the name of the deployment unit.
- *
- * @return The name
- */
- public String getName() {
- return(m_name);
- }
-
- /**
- * This method returns the last modified time associated with
- * the deployment unit.
- *
- * @return The last modified time
- */
- public long getLastModified() {
- return(m_lastModified);
- }
-
- /**
- * This method returns the deployment descriptor.
- *
- * @return The deployment descriptor
- */
- public java.io.File getDeploymentDescriptor() {
- return(m_deploymentDescriptor);
- }
-
- /**
- * This method sets the deployment descriptor for the BPEL module
- * being deployed.
- *
- * @param file The BPEL deployment descriptor
- */
- public void setDeploymentDescriptor(java.io.File file) {
- m_deploymentDescriptor = file;
- }
-
- public String toString() {
- return("BPELDeploymentUnit[name="+m_name+",lastModified="+m_lastModified+",descriptor="+
- m_deploymentDescriptor+"]");
- }
-
- private String m_name=null;
- private long m_lastModified=0;
- private java.io.File m_deploymentDescriptor=null;
-}
Deleted: trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java
===================================================================
--- trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java 2011-01-25 14:01:32 UTC (rev 1272)
+++ trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java 2011-02-04 12:10:39 UTC (rev 1299)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, 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 WITHOUT A
- * 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,
- * 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.
- */
-package org.jboss.soa.bpel.deployer;
-
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.annotations.AnnotationEnvironment;
-import org.jboss.deployers.vfs.spi.structure.StructureContext;
-import org.jboss.deployers.vfs.spi.structure.helpers.AbstractStructureDeployer;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * Implementation of the BPEL Structure Deployer, used to locate the
- * BPEL deployment descriptor and create a context for the BPEL
- * deployment unit.
- *
- * @author gbrown
- *
- */
-public class BPELStructureDeployer extends AbstractStructureDeployer {
-
- @Override
- protected AnnotationEnvironment createAnnotationEnvironment(VirtualFile arg0) {
- return null;
- }
-
- public boolean determineStructure(StructureContext sc)
- throws DeploymentException {
- boolean ret=false;
-
- try {
- // Must look for the deployment descriptor, as opposed to the container
- // that contains the descriptor, because in the case of a Jar with the descriptor
- // at the top level, the deployer will not get called with the Jar top level
- // node, as this is handled by a Jar deployer.
- if (sc.getName().equals(BPELDeploymentUnit.DEPLOY_XML) ||
- sc.getName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML)) {
- ret = true;
-
- // Create the context for the deployment associated with
- // the deployment descriptor's parent container
- createContext(sc);
- }
- } catch (Exception e) {
- throw new DeploymentException(e);
- }
-
- return(ret);
- }
-
-}
Copied: trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/as5/AS5BPELDeployer.java (from rev 1272, trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java)
===================================================================
--- trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/as5/AS5BPELDeployer.java (rev 0)
+++ trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/as5/AS5BPELDeployer.java 2011-02-04 12:10:39 UTC (rev 1299)
@@ -0,0 +1,190 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, 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 WITHOUT A
+ * 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,
+ * 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.
+ */
+package org.jboss.soa.bpel.deployer.as5;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+
+import org.jboss.logging.Logger;
+import org.jboss.soa.bpel.deployer.BPELDeployer;
+import org.jboss.soa.bpel.deployer.BPELDeployerFactory;
+import org.jboss.soa.bpel.deployer.BPELDeploymentListener;
+import org.jboss.soa.bpel.deployer.BPELDeploymentUnit;
+import org.jboss.virtual.VFSUtils;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * This is the deployer for deploying BPEL (and associated artifacts) into
+ * the runtime.
+ *
+ * @author gbrown
+ *
+ */
+public class AS5BPELDeployer extends AbstractDeployer implements BPELDeployer {
+
+ private final static Logger logger = Logger.getLogger(AS5BPELDeployer.class);
+
+ private BPELDeploymentListener m_listener=null;
+ private java.util.Map<String, BPELDeploymentUnit> m_deploymentUnits=
+ new java.util.HashMap<String, BPELDeploymentUnit>();
+
+ public AS5BPELDeployer() {
+ BPELDeployerFactory.setInstance(this);
+ }
+
+ public void deploy(DeploymentUnit du) throws DeploymentException {
+
+ if (du instanceof VFSDeploymentUnit &&
+ (du.getSimpleName().equals(BPELDeploymentUnit.DEPLOY_XML) ||
+ du.getSimpleName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML))) {
+ DeploymentUnit top=du;
+
+ if (top.isTopLevel() == false) {
+ top = du.getTopLevel();
+ }
+
+ logger.info("Deploy: "+top.getSimpleName()+" relativePath="+
+ du.getRelativePath());
+
+ VirtualFile root=((VFSDeploymentUnit)du).getRoot();
+
+ logger.debug("Deployment descriptor file="+root);
+
+ try {
+ VirtualFile parent=((VFSDeploymentUnit)du).getRoot().getParent();
+
+ logger.debug("Deployment unit dir="+parent);
+
+ VirtualFile tmp=VFSUtils.explode(parent);
+
+ java.net.URL url=VFSUtils.getCompatibleURL(tmp);
+
+ logger.debug("Deployment exploded to dir="+tmp+" URL="+url);
+
+ long lastModTime=0;
+
+ if (top instanceof VFSDeploymentUnit) {
+ lastModTime = ((VFSDeploymentUnit)top).getRoot().getLastModified();
+ } else {
+ logger.warn("Unable to determine last modified time for: "+top);
+ }
+
+ // TODO: Need to be a more unique name, as it is possible that more
+ // than one deployment descriptor may exist in the same AS archive
+ BPELDeploymentUnit unit=new BPELDeploymentUnit(top.getSimpleName(), lastModTime);
+
+ java.io.File ddfile=new java.io.File(url.getFile(), du.getSimpleName()); //BPELDeploymentUnit.BPEL_DEPLOY_XML);
+
+ if (ddfile.exists() == false) {
+ logger.error("Failed to deploy '"+ddfile+
+ "', unable to locate deployment descriptor file");
+ } else {
+ unit.setDeploymentDescriptor(ddfile);
+
+ synchronized(m_deploymentUnits) {
+ m_deploymentUnits.put(unit.getName(), unit);
+
+ if (m_listener != null) {
+ m_listener.deploy(unit);
+ }
+ }
+ }
+
+ } catch (Exception e) {
+ throw new DeploymentException("Failed to explode deployment unit '"+root+"'", e);
+ }
+ }
+ }
+
+ @Override
+ public void undeploy(DeploymentUnit du) {
+
+ if (du instanceof VFSDeploymentUnit &&
+ (du.getSimpleName().equals(BPELDeploymentUnit.DEPLOY_XML) ||
+ du.getSimpleName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML))) {
+ DeploymentUnit top=du;
+
+ if (top.isTopLevel() == false) {
+ top = du.getTopLevel();
+ }
+
+ logger.info("Undeploy: "+top.getSimpleName()+" relativePath="+
+ du.getRelativePath());
+
+ try {
+ BPELDeploymentUnit prev=m_deploymentUnits.get(top.getSimpleName());
+
+ // Undeploy if deployment unit no longer exists on the filesystem, OR
+ // the last modified time of the cached deployment unit is older than
+ // the last modified time of the current deployment unit, signifying
+ // it has been updated and therefore must be undeployed first
+ if (top instanceof VFSDeploymentUnit &&
+ (((VFSDeploymentUnit)top).getRoot().exists() == false ||
+ (prev != null && prev.getLastModified() <
+ ((VFSDeploymentUnit)top).getRoot().getLastModified()))) {
+
+ // TODO: Unique name - see deploy
+ BPELDeploymentUnit unit=new BPELDeploymentUnit(top.getSimpleName(), 0);
+
+ // NOTE: File required to provide path for use in ODE
+ // process store impl. When this is replaced, this information
+ // will not be required.
+ java.io.File ddfile=new java.io.File(((VFSDeploymentUnit)du).getRoot().toURL().getFile());
+
+ unit.setDeploymentDescriptor(ddfile);
+
+ synchronized(m_deploymentUnits) {
+ m_deploymentUnits.remove(unit.getName());
+
+ if (m_listener != null) {
+ m_listener.undeploy(unit);
+ }
+ }
+ } else {
+ logger.info("Not undeploying BPEL: "+top.getSimpleName()+" relativePath="+
+ du.getRelativePath());
+ }
+ } catch(Exception e) {
+ logger.error("Failed to undeploy '"+du+"'", e);
+ }
+ }
+ }
+
+ /**
+ * This method sets the deployment listener that will be
+ * informed when BPEL deployment units are detected.
+ *
+ * @param l The BPEL deployment listener
+ */
+ public void setDeploymentListener(BPELDeploymentListener l) {
+
+ logger.debug("Set deployment listener: "+l);
+
+ synchronized(m_deploymentUnits) {
+ m_listener = l;
+
+ // Notify listener of the currently deployed units
+ java.util.Iterator<BPELDeploymentUnit> iter=m_deploymentUnits.values().iterator();
+ while (iter.hasNext()) {
+ l.deploy(iter.next());
+ }
+ }
+ }
+}
Copied: trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/as5/BPELStructureDeployer.java (from rev 1272, trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java)
===================================================================
--- trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/as5/BPELStructureDeployer.java (rev 0)
+++ trunk/runtime/deployer-as5/src/main/java/org/jboss/soa/bpel/deployer/as5/BPELStructureDeployer.java 2011-02-04 12:10:39 UTC (rev 1299)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, 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 WITHOUT A
+ * 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,
+ * 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.
+ */
+package org.jboss.soa.bpel.deployer.as5;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.annotations.AnnotationEnvironment;
+import org.jboss.deployers.vfs.spi.structure.StructureContext;
+import org.jboss.deployers.vfs.spi.structure.helpers.AbstractStructureDeployer;
+import org.jboss.soa.bpel.deployer.BPELDeploymentUnit;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * Implementation of the BPEL Structure Deployer, used to locate the
+ * BPEL deployment descriptor and create a context for the BPEL
+ * deployment unit.
+ *
+ * @author gbrown
+ *
+ */
+public class BPELStructureDeployer extends AbstractStructureDeployer {
+
+ @Override
+ protected AnnotationEnvironment createAnnotationEnvironment(VirtualFile arg0) {
+ return null;
+ }
+
+ public boolean determineStructure(StructureContext sc)
+ throws DeploymentException {
+ boolean ret=false;
+
+ try {
+ // Must look for the deployment descriptor, as opposed to the container
+ // that contains the descriptor, because in the case of a Jar with the descriptor
+ // at the top level, the deployer will not get called with the Jar top level
+ // node, as this is handled by a Jar deployer.
+ if (sc.getName().equals(BPELDeploymentUnit.DEPLOY_XML) ||
+ sc.getName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML)) {
+ ret = true;
+
+ // Create the context for the deployment associated with
+ // the deployment descriptor's parent container
+ createContext(sc);
+ }
+ } catch (Exception e) {
+ throw new DeploymentException(e);
+ }
+
+ return(ret);
+ }
+
+}
Modified: trunk/runtime/deployer-as6/pom.xml
===================================================================
--- trunk/runtime/deployer-as6/pom.xml 2011-02-03 12:47:54 UTC (rev 1298)
+++ trunk/runtime/deployer-as6/pom.xml 2011-02-04 12:10:39 UTC (rev 1299)
@@ -16,6 +16,12 @@
<dependencies>
<dependency>
+ <groupId>org.jboss.soa.bpel.runtime</groupId>
+ <artifactId>deployer</artifactId>
+ <version>${riftsaw.engine.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
<version>2.2.14.GA</version>
Deleted: trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java
===================================================================
--- trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java 2011-02-03 12:47:54 UTC (rev 1298)
+++ trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java 2011-02-04 12:10:39 UTC (rev 1299)
@@ -1,241 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, 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 WITHOUT A
- * 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,
- * 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.
- */
-package org.jboss.soa.bpel.deployer;
-
-import javax.naming.InitialContext;
-import javax.naming.Name;
-import javax.naming.NamingException;
-
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-
-import org.jboss.logging.Logger;
-import org.jboss.util.naming.NonSerializableFactory;
-import org.jboss.vfs.VFSUtils;
-import org.jboss.vfs.VirtualFile;
-
-/**
- * This is the deployer for deploying BPEL (and associated artifacts) into
- * the runtime.
- *
- * @author gbrown
- *
- */
-public class BPELDeployer extends AbstractDeployer {
-
- public static final String BPELDeployerService="bpel/Deployer";
-
- public void deploy(DeploymentUnit du) throws DeploymentException {
-
- if (du instanceof VFSDeploymentUnit &&
- (du.getSimpleName().equals(BPELDeploymentUnit.DEPLOY_XML) ||
- du.getSimpleName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML))) {
- DeploymentUnit top=du;
-
- if (top.isTopLevel() == false) {
- top = du.getTopLevel();
- }
-
- logger.info("Deploy: "+top.getSimpleName()+" relativePath="+
- du.getRelativePath());
-
- VirtualFile root=((VFSDeploymentUnit)du).getRoot();
-
- logger.debug("Deployment descriptor file="+root);
-
- try {
- VirtualFile parent=((VFSDeploymentUnit)du).getRoot().getParent();
-
- logger.debug("Deployment unit dir="+parent);
-
- //VirtualFile tmp=VFSUtils.explode(parent);
-
- //java.net.URL url=VFSUtils.getCompatibleURL(tmp);
- java.net.URL url=VFSUtils.getPhysicalURL(root);
-
- logger.debug("Deployment exploded to dir="+root+" URL="+url);
-
- long lastModTime=0;
-
- if (top instanceof VFSDeploymentUnit) {
- lastModTime = ((VFSDeploymentUnit)top).getRoot().getLastModified();
- } else {
- logger.warn("Unable to determine last modified time for: "+top);
- }
-
- // TODO: Need to be a more unique name, as it is possible that more
- // than one deployment descriptor may exist in the same AS archive
- BPELDeploymentUnit unit=new BPELDeploymentUnit(top.getSimpleName(), lastModTime);
-
- java.io.File ddfile=new java.io.File(url.getFile(), du.getSimpleName()); //BPELDeploymentUnit.BPEL_DEPLOY_XML);
-
- if (ddfile.exists() == false) {
- logger.error("Failed to deploy '"+ddfile+
- "', unable to locate deployment descriptor file");
- } else {
- unit.setDeploymentDescriptor(ddfile);
-
- synchronized(m_deploymentUnits) {
- m_deploymentUnits.put(unit.getName(), unit);
-
- if (m_listener != null) {
- m_listener.deploy(unit);
- }
- }
- }
-
- } catch (Exception e) {
- throw new DeploymentException("Failed to explode deployment unit '"+root+"'", e);
- }
- }
- }
-
- @Override
- public void undeploy(DeploymentUnit du) {
-
- if (du instanceof VFSDeploymentUnit &&
- (du.getSimpleName().equals(BPELDeploymentUnit.DEPLOY_XML) ||
- du.getSimpleName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML))) {
- DeploymentUnit top=du;
-
- if (top.isTopLevel() == false) {
- top = du.getTopLevel();
- }
-
- logger.info("Undeploy: "+top.getSimpleName()+" relativePath="+
- du.getRelativePath());
-
- try {
- BPELDeploymentUnit prev=m_deploymentUnits.get(top.getSimpleName());
-
- // Undeploy if deployment unit no longer exists on the filesystem, OR
- // the last modified time of the cached deployment unit is older than
- // the last modified time of the current deployment unit, signifying
- // it has been updated and therefore must be undeployed first
- if (top instanceof VFSDeploymentUnit &&
- (((VFSDeploymentUnit)top).getRoot().exists() == false ||
- (prev != null && prev.getLastModified() <
- ((VFSDeploymentUnit)top).getRoot().getLastModified()))) {
-
- // TODO: Unique name - see deploy
- BPELDeploymentUnit unit=new BPELDeploymentUnit(top.getSimpleName(), 0);
-
- // NOTE: File required to provide path for use in ODE
- // process store impl. When this is replaced, this information
- // will not be required.
- java.io.File ddfile=new java.io.File(((VFSDeploymentUnit)du).getRoot().toURL().getFile());
-
- unit.setDeploymentDescriptor(ddfile);
-
- synchronized(m_deploymentUnits) {
- m_deploymentUnits.remove(unit.getName());
-
- if (m_listener != null) {
- m_listener.undeploy(unit);
- }
- }
- } else {
- logger.info("Not undeploying BPEL: "+top.getSimpleName()+" relativePath="+
- du.getRelativePath());
- }
- } catch(Exception e) {
- logger.error("Failed to undeploy '"+du+"'", e);
- }
- }
- }
-
- /**
- * This method sets the deployment listener that will be
- * informed when BPEL deployment units are detected.
- *
- * @param l The BPEL deployment listener
- */
- public void setDeploymentListener(BPELDeploymentListener l) {
-
- logger.debug("Set deployment listener: "+l);
-
- synchronized(m_deploymentUnits) {
- m_listener = l;
-
- // Notify listener of the currently deployed units
- java.util.Iterator<BPELDeploymentUnit> iter=m_deploymentUnits.values().iterator();
- while (iter.hasNext()) {
- l.deploy(iter.next());
- }
- }
- }
-
- /**
- * This method returns the JNDI name for the BPEL deployer.
- *
- * @return The JNDI name
- */
- public String getJndiName() {
- return m_jndiName;
- }
-
- /**
- * This method sets the JNDI name for the BPEL deployer.
- *
- * @param jndiName The JNDI name
- * @throws NamingException Failed to update JNDI with the supplied
- * name binding
- */
- public void setJndiName(String jndiName)throws NamingException {
- String oldName = m_jndiName;
- m_jndiName = jndiName;
-
- if (oldName != null) {
- unbind(oldName);
- }
-
- try {
- rebind();
- } catch(Exception e) {
- NamingException ne = new NamingException("Failed to update jndiName");
- ne.setRootCause(e);
- throw ne;
- }
- }
-
- private void rebind() throws NamingException {
- InitialContext rootCtx = new InitialContext();
- Name fullName = rootCtx.getNameParser("").parse(m_jndiName);
- log.debug("Binding BPEL deployer to name="+fullName);
- NonSerializableFactory.bind(fullName.toString(), this);
- }
-
- private void unbind(String jndiName) {
- try {
- InitialContext rootCtx = new InitialContext();
- rootCtx.unbind(jndiName);
- NonSerializableFactory.unbind(jndiName);
- } catch(NamingException e) {
- log.error("Failed to unbind map", e);
- }
- }
-
- private final static Logger logger = Logger.getLogger(BPELDeployer.class);
-
- private String m_jndiName=null;
- private BPELDeploymentListener m_listener=null;
- private java.util.Map<String, BPELDeploymentUnit> m_deploymentUnits=
- new java.util.HashMap<String, BPELDeploymentUnit>();
-}
Deleted: trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentListener.java
===================================================================
--- trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentListener.java 2011-02-03 12:47:54 UTC (rev 1298)
+++ trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentListener.java 2011-02-04 12:10:39 UTC (rev 1299)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, 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 WITHOUT A
- * 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,
- * 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.
- */
-package org.jboss.soa.bpel.deployer;
-
-/**
- * This interface represents a component interested in deploying BPEL deployment units.
- *
- * @author gbrown
- *
- */
-public interface BPELDeploymentListener {
-
- /**
- * This method is invoked to deploy a BPEL deployment unit.
- *
- * @param bdu The BPEL deployment unit
- */
- public void deploy(BPELDeploymentUnit bdu);
-
- /**
- * This method is invoked to undeploy a BPEL deployment unit.
- *
- * @param bdu The BPEL deployment unit
- */
- public void undeploy(BPELDeploymentUnit bdu);
-
-}
Deleted: trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentUnit.java
===================================================================
--- trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentUnit.java 2011-02-03 12:47:54 UTC (rev 1298)
+++ trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeploymentUnit.java 2011-02-04 12:10:39 UTC (rev 1299)
@@ -1,93 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, 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 WITHOUT A
- * 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,
- * 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.
- */
-package org.jboss.soa.bpel.deployer;
-
-/**
- * This class represents the BPEL deployment unit.
- *
- * @author gbrown
- *
- */
-public class BPELDeploymentUnit {
-
- public static final String BPEL_DEPLOY_XML = "bpel-deploy.xml";
- public static final String DEPLOY_XML = "deploy.xml";
-
- /**
- * The constructor for the deployment unit.
- *
- * @param name The unique name for the deployment unit
- * @param lastModified When the deployment unit was last modified
- */
- public BPELDeploymentUnit(String name, long lastModified) {
- m_name = name;
- m_lastModified = lastModified;
-
- // Remove any .jar suffix
- if (m_name != null && m_name.endsWith(".jar")) {
- m_name = m_name.substring(0, m_name.length()-4);
- }
- }
-
- /**
- * This method returns the name of the deployment unit.
- *
- * @return The name
- */
- public String getName() {
- return(m_name);
- }
-
- /**
- * This method returns the last modified time associated with
- * the deployment unit.
- *
- * @return The last modified time
- */
- public long getLastModified() {
- return(m_lastModified);
- }
-
- /**
- * This method returns the deployment descriptor.
- *
- * @return The deployment descriptor
- */
- public java.io.File getDeploymentDescriptor() {
- return(m_deploymentDescriptor);
- }
-
- /**
- * This method sets the deployment descriptor for the BPEL module
- * being deployed.
- *
- * @param file The BPEL deployment descriptor
- */
- public void setDeploymentDescriptor(java.io.File file) {
- m_deploymentDescriptor = file;
- }
-
- public String toString() {
- return("BPELDeploymentUnit[name="+m_name+",lastModified="+m_lastModified+",descriptor="+
- m_deploymentDescriptor+"]");
- }
-
- private String m_name=null;
- private long m_lastModified=0;
- private java.io.File m_deploymentDescriptor=null;
-}
Deleted: trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java
===================================================================
--- trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java 2011-02-03 12:47:54 UTC (rev 1298)
+++ trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java 2011-02-04 12:10:39 UTC (rev 1299)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, 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 WITHOUT A
- * 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,
- * 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.
- */
-package org.jboss.soa.bpel.deployer;
-
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.vfs.spi.structure.StructureContext;
-import org.jboss.deployers.vfs.spi.structure.helpers.AbstractStructureDeployer;
-import org.jboss.scanning.annotations.spi.AnnotationRepository;
-
-/**
- * Implementation of the BPEL Structure Deployer, used to locate the
- * BPEL deployment descriptor and create a context for the BPEL
- * deployment unit.
- *
- * @author gbrown
- *
- */
-public class BPELStructureDeployer extends AbstractStructureDeployer {
-
- public boolean determineStructure(StructureContext sc)
- throws DeploymentException {
- boolean ret=false;
-
- try {
- // Must look for the deployment descriptor, as opposed to the container
- // that contains the descriptor, because in the case of a Jar with the descriptor
- // at the top level, the deployer will not get called with the Jar top level
- // node, as this is handled by a Jar deployer.
- if (sc.getName().equals(BPELDeploymentUnit.DEPLOY_XML) ||
- sc.getName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML)) {
- ret = true;
-
- // Create the context for the deployment associated with
- // the deployment descriptor's parent container
- createContext(sc);
- }
- } catch (Exception e) {
- throw new DeploymentException(e);
- }
-
- return(ret);
- }
-
- @Override
- protected AnnotationRepository createAnnotationRepository(
- org.jboss.vfs.VirtualFile arg0) {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
Copied: trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/as6/AS6BPELDeployer.java (from rev 1273, trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java)
===================================================================
--- trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/as6/AS6BPELDeployer.java (rev 0)
+++ trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/as6/AS6BPELDeployer.java 2011-02-04 12:10:39 UTC (rev 1299)
@@ -0,0 +1,191 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, 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 WITHOUT A
+ * 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,
+ * 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.
+ */
+package org.jboss.soa.bpel.deployer.as6;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+
+import org.jboss.logging.Logger;
+import org.jboss.soa.bpel.deployer.BPELDeployer;
+import org.jboss.soa.bpel.deployer.BPELDeployerFactory;
+import org.jboss.soa.bpel.deployer.BPELDeploymentListener;
+import org.jboss.soa.bpel.deployer.BPELDeploymentUnit;
+import org.jboss.vfs.VFSUtils;
+import org.jboss.vfs.VirtualFile;
+
+/**
+ * This is the deployer for deploying BPEL (and associated artifacts) into
+ * the runtime.
+ *
+ * @author gbrown
+ *
+ */
+public class AS6BPELDeployer extends AbstractDeployer implements BPELDeployer {
+
+ private final static Logger logger = Logger.getLogger(AS6BPELDeployer.class);
+
+ private BPELDeploymentListener m_listener=null;
+ private java.util.Map<String, BPELDeploymentUnit> m_deploymentUnits=
+ new java.util.HashMap<String, BPELDeploymentUnit>();
+
+ public AS6BPELDeployer() {
+ BPELDeployerFactory.setInstance(this);
+ }
+
+ public void deploy(DeploymentUnit du) throws DeploymentException {
+
+ if (du instanceof VFSDeploymentUnit &&
+ (du.getSimpleName().equals(BPELDeploymentUnit.DEPLOY_XML) ||
+ du.getSimpleName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML))) {
+ DeploymentUnit top=du;
+
+ if (top.isTopLevel() == false) {
+ top = du.getTopLevel();
+ }
+
+ logger.info("Deploy: "+top.getSimpleName()+" relativePath="+
+ du.getRelativePath());
+
+ VirtualFile root=((VFSDeploymentUnit)du).getRoot();
+
+ logger.debug("Deployment descriptor file="+root);
+
+ try {
+ VirtualFile parent=((VFSDeploymentUnit)du).getRoot().getParent();
+
+ logger.debug("Deployment unit dir="+parent);
+
+ //VirtualFile tmp=VFSUtils.explode(parent);
+
+ //java.net.URL url=VFSUtils.getCompatibleURL(tmp);
+ java.net.URL url=VFSUtils.getPhysicalURL(root);
+
+ logger.debug("Deployment exploded to dir="+root+" URL="+url);
+
+ long lastModTime=0;
+
+ if (top instanceof VFSDeploymentUnit) {
+ lastModTime = ((VFSDeploymentUnit)top).getRoot().getLastModified();
+ } else {
+ logger.warn("Unable to determine last modified time for: "+top);
+ }
+
+ // TODO: Need to be a more unique name, as it is possible that more
+ // than one deployment descriptor may exist in the same AS archive
+ BPELDeploymentUnit unit=new BPELDeploymentUnit(top.getSimpleName(), lastModTime);
+
+ java.io.File ddfile=new java.io.File(url.getFile(), du.getSimpleName()); //BPELDeploymentUnit.BPEL_DEPLOY_XML);
+
+ if (ddfile.exists() == false) {
+ logger.error("Failed to deploy '"+ddfile+
+ "', unable to locate deployment descriptor file");
+ } else {
+ unit.setDeploymentDescriptor(ddfile);
+
+ synchronized(m_deploymentUnits) {
+ m_deploymentUnits.put(unit.getName(), unit);
+
+ if (m_listener != null) {
+ m_listener.deploy(unit);
+ }
+ }
+ }
+
+ } catch (Exception e) {
+ throw new DeploymentException("Failed to explode deployment unit '"+root+"'", e);
+ }
+ }
+ }
+
+ @Override
+ public void undeploy(DeploymentUnit du) {
+
+ if (du instanceof VFSDeploymentUnit &&
+ (du.getSimpleName().equals(BPELDeploymentUnit.DEPLOY_XML) ||
+ du.getSimpleName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML))) {
+ DeploymentUnit top=du;
+
+ if (top.isTopLevel() == false) {
+ top = du.getTopLevel();
+ }
+
+ logger.info("Undeploy: "+top.getSimpleName()+" relativePath="+
+ du.getRelativePath());
+
+ try {
+ BPELDeploymentUnit prev=m_deploymentUnits.get(top.getSimpleName());
+
+ // Undeploy if deployment unit no longer exists on the filesystem, OR
+ // the last modified time of the cached deployment unit is older than
+ // the last modified time of the current deployment unit, signifying
+ // it has been updated and therefore must be undeployed first
+ if (top instanceof VFSDeploymentUnit &&
+ (((VFSDeploymentUnit)top).getRoot().exists() == false ||
+ (prev != null && prev.getLastModified() <
+ ((VFSDeploymentUnit)top).getRoot().getLastModified()))) {
+
+ // TODO: Unique name - see deploy
+ BPELDeploymentUnit unit=new BPELDeploymentUnit(top.getSimpleName(), 0);
+
+ // NOTE: File required to provide path for use in ODE
+ // process store impl. When this is replaced, this information
+ // will not be required.
+ java.io.File ddfile=new java.io.File(((VFSDeploymentUnit)du).getRoot().toURL().getFile());
+
+ unit.setDeploymentDescriptor(ddfile);
+
+ synchronized(m_deploymentUnits) {
+ m_deploymentUnits.remove(unit.getName());
+
+ if (m_listener != null) {
+ m_listener.undeploy(unit);
+ }
+ }
+ } else {
+ logger.info("Not undeploying BPEL: "+top.getSimpleName()+" relativePath="+
+ du.getRelativePath());
+ }
+ } catch(Exception e) {
+ logger.error("Failed to undeploy '"+du+"'", e);
+ }
+ }
+ }
+
+ /**
+ * This method sets the deployment listener that will be
+ * informed when BPEL deployment units are detected.
+ *
+ * @param l The BPEL deployment listener
+ */
+ public void setDeploymentListener(BPELDeploymentListener l) {
+
+ logger.debug("Set deployment listener: "+l);
+
+ synchronized(m_deploymentUnits) {
+ m_listener = l;
+
+ // Notify listener of the currently deployed units
+ java.util.Iterator<BPELDeploymentUnit> iter=m_deploymentUnits.values().iterator();
+ while (iter.hasNext()) {
+ l.deploy(iter.next());
+ }
+ }
+ }
+}
Copied: trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/as6/BPELStructureDeployer.java (from rev 1273, trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/BPELStructureDeployer.java)
===================================================================
--- trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/as6/BPELStructureDeployer.java (rev 0)
+++ trunk/runtime/deployer-as6/src/main/java/org/jboss/soa/bpel/deployer/as6/BPELStructureDeployer.java 2011-02-04 12:10:39 UTC (rev 1299)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, 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 WITHOUT A
+ * 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,
+ * 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.
+ */
+package org.jboss.soa.bpel.deployer.as6;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.vfs.spi.structure.StructureContext;
+import org.jboss.deployers.vfs.spi.structure.helpers.AbstractStructureDeployer;
+import org.jboss.scanning.annotations.spi.AnnotationRepository;
+import org.jboss.soa.bpel.deployer.BPELDeploymentUnit;
+
+/**
+ * Implementation of the BPEL Structure Deployer, used to locate the
+ * BPEL deployment descriptor and create a context for the BPEL
+ * deployment unit.
+ *
+ * @author gbrown
+ *
+ */
+public class BPELStructureDeployer extends AbstractStructureDeployer {
+
+ public boolean determineStructure(StructureContext sc)
+ throws DeploymentException {
+ boolean ret=false;
+
+ try {
+ // Must look for the deployment descriptor, as opposed to the container
+ // that contains the descriptor, because in the case of a Jar with the descriptor
+ // at the top level, the deployer will not get called with the Jar top level
+ // node, as this is handled by a Jar deployer.
+ if (sc.getName().equals(BPELDeploymentUnit.DEPLOY_XML) ||
+ sc.getName().equals(BPELDeploymentUnit.BPEL_DEPLOY_XML)) {
+ ret = true;
+
+ // Create the context for the deployment associated with
+ // the deployment descriptor's parent container
+ createContext(sc);
+ }
+ } catch (Exception e) {
+ throw new DeploymentException(e);
+ }
+
+ return(ret);
+ }
+
+ @Override
+ protected AnnotationRepository createAnnotationRepository(
+ org.jboss.vfs.VirtualFile arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
Modified: trunk/runtime/engine/pom.xml
===================================================================
--- trunk/runtime/engine/pom.xml 2011-02-03 12:47:54 UTC (rev 1298)
+++ trunk/runtime/engine/pom.xml 2011-02-04 12:10:39 UTC (rev 1299)
@@ -79,16 +79,10 @@
</dependency>
<dependency>
<groupId>org.jboss.soa.bpel.runtime</groupId>
- <artifactId>deployer-as5</artifactId>
- <version>${pom.version}</version>
+ <artifactId>deployer</artifactId>
+ <version>${riftsaw.engine.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.soa.bpel.runtime</groupId>
- <artifactId>deployer-as6</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java 2011-02-03 12:47:54 UTC (rev 1298)
+++ trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java 2011-02-04 12:10:39 UTC (rev 1299)
@@ -37,6 +37,7 @@
import org.apache.ode.dao.store.ConfStoreDAOConnectionFactory;
import org.apache.ode.dao.store.DeploymentUnitDAO;
import org.jboss.soa.bpel.deployer.BPELDeployer;
+import org.jboss.soa.bpel.deployer.BPELDeployerFactory;
import org.jboss.soa.bpel.deployer.BPELDeploymentUnit;
public class RiftSawProcessStore extends ProcessStoreImpl
@@ -53,18 +54,10 @@
public void loadAll() {
// Register listener with BPEL deployer
- try {
- InitialContext context=new InitialContext();
-
- BPELDeployer deployer=(BPELDeployer)context.lookup(BPELDeployer.BPELDeployerService);
-
- if (deployer != null) {
- deployer.setDeploymentListener(this);
- } else {
- __log.error("Deploy not found in JNDI with name '"+BPELDeployer.BPELDeployerService+"'");
- }
- } catch(Exception e) {
- __log.error("Failed to obtain BPEL deployer", e);
+ if (BPELDeployerFactory.getInstance() == null) {
+ __log.error("BPEL deployer has not been registered - cannot listen for deployments!");
+ } else {
+ BPELDeployerFactory.getInstance().setDeploymentListener(this);
}
}
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2011-02-03 12:47:54 UTC (rev 1298)
+++ trunk/runtime/pom.xml 2011-02-04 12:10:39 UTC (rev 1299)
@@ -17,6 +17,7 @@
<modules>
<module>deployer</module>
+ <module>deployer-as5</module>
<module>deployer-as6</module>
<module>engine</module>
<module>uddi</module>
13 years, 10 months
- 1
- 0
riftsaw SVN: r1298 - trunk/distribution/src/main/release/conf.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2011-02-03 07:47:54 -0500 (Thu, 03 Feb 2011)
New Revision: 1298
Modified:
trunk/distribution/src/main/release/conf/bpel.properties
Log:
RIFTSAW-304 - by default RiftSaw should not persist the BPEL events in the ODE database, as the BPAF log adapter will store them in a different location.
Modified: trunk/distribution/src/main/release/conf/bpel.properties
===================================================================
--- trunk/distribution/src/main/release/conf/bpel.properties 2011-02-03 12:42:18 UTC (rev 1297)
+++ trunk/distribution/src/main/release/conf/bpel.properties 2011-02-03 12:47:54 UTC (rev 1298)
@@ -143,6 +143,11 @@
ode.persistence=hibernate
#
-# BPAF History
+# Comma separated list of BPEL event listeners.
+# BPAFLogAdapter is used to store BPEL events for historic analysis.
#
bpel.event.listeners=org.jboss.soa.bpel.console.bpaf.BPAFLogAdapter
+
+# Property used to configure whether ODE should store the BPEL events in its default location
+# (Set to false, as RiftSaw uses the BPEL events stored by the BPAFLogAdapter)
+persist.bpel.events = false
13 years, 10 months
- 1
- 0
riftsaw SVN: r1297 - branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2011-02-03 07:42:18 -0500 (Thu, 03 Feb 2011)
New Revision: 1297
Modified:
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
Log:
RIFTSAW-304 - make persistence of the bpel events configurable, so if an event listener is registered that processes the event in a different way (i.e. BPAF), then we don't get additional redundant persisted information.
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java 2011-02-03 11:15:05 UTC (rev 1296)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java 2011-02-03 12:42:18 UTC (rev 1297)
@@ -136,6 +136,9 @@
private ExternalVariableConf _extVarConf;
private ExternalVariableManager _evm;
+
+ /** Determine if BPEL events should be persisted, as well as distributed to event listeners */
+ private boolean _persistBpelEvents=true;
public static final QName PROP_PATH = new QName("PATH");
public static final QName PROP_SVG = new QName("SVG");
@@ -582,6 +585,11 @@
}
return endpoints;
}
+
+ public void setPersistBpelEvents(boolean persist) {
+ _persistBpelEvents = persist;
+ __log.debug("Should persist BPEL events? "+persist);
+ }
void activate(BpelEngineImpl engine) {
_engine = engine;
@@ -710,10 +718,13 @@
// notify the listeners
_engine.fireEvent(event);
- if (instanceDao != null)
- instanceDao.insertBpelEvent(event);
- else
+ if (instanceDao != null) {
+ if (_persistBpelEvents) {
+ instanceDao.insertBpelEvent(event);
+ }
+ } else {
__log.debug("Couldn't find instance to save event, no event generated!");
+ }
}
}
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java 2011-02-03 11:15:05 UTC (rev 1296)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java 2011-02-03 12:42:18 UTC (rev 1297)
@@ -95,6 +95,8 @@
private static boolean DEFERRED_PROCESS_INSTANCE_CLEANUP_DISABLED =
Boolean.getBoolean(DEFERRED_PROCESS_INSTANCE_CLEANUP_DISABLED_NAME);
+ public final static String PERSIST_BPEL_EVENTS="persist.bpel.events";
+
/**
* Set of processes that are registered with the server. Includes hydrated and dehydrated processes.
* Guarded by _mngmtLock.writeLock().
@@ -318,6 +320,9 @@
BpelProcess process = createBpelProcess(conf);
process._classLoader = Thread.currentThread().getContextClassLoader();
+ process.setPersistBpelEvents(_configProperties.getProperty(PERSIST_BPEL_EVENTS,
+ Boolean.TRUE.toString()).equalsIgnoreCase(Boolean.TRUE.toString()));
+
_engine.registerProcess(process);
_registeredProcesses.add(process);
if (!isLazyHydratable(process)) {
13 years, 10 months
- 1
- 0
riftsaw SVN: r1296 - in branches/ODE/RiftSaw-ODE-trunk/dao-jpa: src/main/riftsaw and 1 other directory.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2011-02-03 06:15:05 -0500 (Thu, 03 Feb 2011)
New Revision: 1296
Added:
branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-ode-store.xml
Modified:
branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml
branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-orm.xml
branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-persistence.xml
Log:
*RIFTSAW-334, separate the orm.xml into two files to avoid jpa2 strict validation.
Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml 2011-02-03 07:54:48 UTC (rev 1295)
+++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml 2011-02-03 11:15:05 UTC (rev 1296)
@@ -141,7 +141,9 @@
<configuration>
<tasks>
<copy file="src/main/riftsaw/riftsaw-orm.xml"
- tofile="target/classes/META-INF/riftsaw-orm.xml" overwrite="true" />
+ tofile="target/classes/META-INF/riftsaw-orm.xml" overwrite="true" />
+ <copy file="src/main/riftsaw/riftsaw-ode-store.xml"
+ tofile="target/classes/META-INF/riftsaw-ode-store.xml" overwrite="true" />
<copy file="src/main/riftsaw/riftsaw-persistence.xml"
tofile="target/classes/META-INF/persistence.xml" overwrite="true" />
</tasks>
Added: branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-ode-store.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-ode-store.xml (rev 0)
+++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-ode-store.xml 2011-02-03 11:15:05 UTC (rev 1296)
@@ -0,0 +1,28 @@
+<entity-mappings
+ xmlns="http://java.sun.com/xml/ns/persistence/orm"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
+ version="1.0">
+
+ <sequence-generator name="bpel_sequence" sequence-name="bpel_sequence"/>
+
+<!-- ode-store persistence unit -->
+<entity class="org.apache.ode.dao.jpa.store.ProcessConfPropertyDaoImpl">
+ <attributes>
+ <id name="_id">
+ <column name="ID"/>
+ <generated-value generator="bpel_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+</entity>
+
+<entity class="org.apache.ode.dao.jpa.store.VersionTrackerDAOImpl">
+ <attributes>
+ <id name="_id">
+ <column name="ID"/>
+ <generated-value generator="bpel_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+</entity>
+
+</entity-mappings>
\ No newline at end of file
Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-orm.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-orm.xml 2011-02-03 07:54:48 UTC (rev 1295)
+++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-orm.xml 2011-02-03 11:15:05 UTC (rev 1296)
@@ -150,7 +150,7 @@
</id>
</attributes>
</entity>
-
+
<entity class="org.jboss.bpm.monitor.model.bpaf.Tuple">
<attributes>
<id name="id">
@@ -160,23 +160,4 @@
</attributes>
</entity>
- <!-- ode-store persistence unit -->
- <entity class="org.apache.ode.dao.jpa.store.ProcessConfPropertyDaoImpl">
- <attributes>
- <id name="_id">
- <column name="ID"/>
- <generated-value generator="bpel_sequence" strategy="AUTO"/>
- </id>
- </attributes>
- </entity>
-
- <entity class="org.apache.ode.dao.jpa.store.VersionTrackerDAOImpl">
- <attributes>
- <id name="_id">
- <column name="ID"/>
- <generated-value generator="bpel_sequence" strategy="AUTO"/>
- </id>
- </attributes>
- </entity>
-
</entity-mappings>
Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-persistence.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-persistence.xml 2011-02-03 07:54:48 UTC (rev 1295)
+++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-persistence.xml 2011-02-03 11:15:05 UTC (rev 1296)
@@ -43,16 +43,15 @@
<class>org.jboss.bpm.monitor.model.bpaf.Tuple</class>
</persistence-unit>
<persistence-unit name="ode-store" transaction-type="JTA">
- <mapping-file>META-INF/riftsaw-orm.xml</mapping-file>
+ <mapping-file>META-INF/riftsaw-ode-store.xml</mapping-file>
<class>org.apache.ode.dao.jpa.store.ProcessConfDaoImpl</class>
<class>org.apache.ode.dao.jpa.store.ProcessConfPropertyDaoImpl</class>
<class>org.apache.ode.dao.jpa.store.DeploymentUnitDaoImpl</class>
<class>org.apache.ode.dao.jpa.store.VersionTrackerDAOImpl</class>
</persistence-unit>
<persistence-unit name="ode-scheduler" transaction-type="JTA">
- <mapping-file>META-INF/riftsaw-orm.xml</mapping-file>
<class>org.apache.ode.dao.jpa.scheduler.JobDAOImpl</class>
</persistence-unit>
-</persistence>
\ No newline at end of file
+</persistence>
13 years, 10 months
- 1
- 0
riftsaw SVN: r1295 - workspace/jeffyu/ODE-AS6/dao-jpa/src/main/riftsaw.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2011-02-03 02:54:48 -0500 (Thu, 03 Feb 2011)
New Revision: 1295
Modified:
workspace/jeffyu/ODE-AS6/dao-jpa/src/main/riftsaw/riftsaw-orm.xml
Log:
*RIFTSAW-334, added these two entities back, removed them in my previous commit.
Modified: workspace/jeffyu/ODE-AS6/dao-jpa/src/main/riftsaw/riftsaw-orm.xml
===================================================================
--- workspace/jeffyu/ODE-AS6/dao-jpa/src/main/riftsaw/riftsaw-orm.xml 2011-02-03 07:20:21 UTC (rev 1294)
+++ workspace/jeffyu/ODE-AS6/dao-jpa/src/main/riftsaw/riftsaw-orm.xml 2011-02-03 07:54:48 UTC (rev 1295)
@@ -141,5 +141,23 @@
</id>
</attributes>
</entity>
+
+ <entity class="org.jboss.bpm.monitor.model.bpaf.Event">
+ <attributes>
+ <id name="eventID">
+ <column name="EID"/>
+ <generated-value generator="bpel_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.jboss.bpm.monitor.model.bpaf.Tuple">
+ <attributes>
+ <id name="id">
+ <column name="TID"/>
+ <generated-value generator="bpel_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
</entity-mappings>
13 years, 10 months
- 1
- 0