[jboss-svn-commits] JBL Code SVN: r25766 - in labs/jbossesb/workspace/dbevenius/jbossas5/product: install and 28 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Mar 20 11:23:58 EDT 2009
Author: beve
Date: 2009-03-20 11:23:58 -0400 (Fri, 20 Mar 2009)
New Revision: 25766
Added:
labs/jbossesb/workspace/dbevenius/jbossas5/product/install/esb-deployers-jboss-beans.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/install/jboss-service-jbossas5.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParser.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployer.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployment.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeploymentMBean.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbExtensionProvider.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbMetaData.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbStructure.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParserUnitTest.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParserUnitTest.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/TestUtil.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/test_esb_archives/
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/test_esb_archives/esb-archive.esb
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/test_esb_archives/exploded-esb-archive.esb/
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/test_esb_archives/exploded-esb-archive.esb/META-INF/
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/test_esb_archives/exploded-esb-archive.esb/META-INF/jboss-esb.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soap/src/main/resources/META-INF/jboss-structure.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/resources/META-INF/jboss-service-as5.xml
Modified:
labs/jbossesb/workspace/dbevenius/jbossas5/product/.classpath
labs/jbossesb/workspace/dbevenius/jbossas5/product/.project
labs/jbossesb/workspace/dbevenius/jbossas5/product/install/build.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/install/jboss-service.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/ivy.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/aop/resources/META-INF/jboss-aop.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/build.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/H2Database.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/H2DatabaseMBean.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIServiceMBean.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyServiceMBean.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResourceManager.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployerMBean.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/jca/JBoss42ActivationBridge.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/ManagedLifecycleController.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/build.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/conf/base-build.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/helloworld/jboss-esb.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/base-project-build.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbossesb/src/main/resources/jbossesb-service.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbpm/src/main/resources/jbpm-ds.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbpm/src/main/resources/jbpm-service.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/build.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBean.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/resources/META-INF/jboss-service.xml
Log:
Initial work for integration with JBoss AS 5.0.1.GA
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/.classpath
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/.classpath 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/.classpath 2009-03-20 15:23:58 UTC (rev 25766)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="lib" path="build/jbossesb/lib/jbossesb-config-model-1.1.0.jar"/>
+ <classpathentry kind="lib" path="build/lib/jbossxb-2.0.0.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-kernel-2.0.4.GA.jar" sourcepath="/opt/jboss/microcontainer/2.0.4.GA"/>
+ <classpathentry kind="lib" path="etc/test/resources/log4j/dev"/>
+ <classpathentry excluding="**/.svn/" kind="src" path="rosetta/tests/src"/>
+ <classpathentry kind="src" path="rosetta/tests/resources/etc"/>
<classpathentry excluding="**/.svn/" kind="src" path="rosetta/src"/>
- <classpathentry kind="src" path="rosetta/tests/resources"/>
- <classpathentry excluding="**/.svn/" kind="src" path="rosetta/tests/src"/>
- <classpathentry kind="src" path="services/soap/src/main/java"/>
- <classpathentry kind="src" path="services/soap/src/test/java"/>
- <classpathentry kind="src" path="services/soapui-client/src/main/java"/>
- <classpathentry kind="lib" path="etc/test/resources/log4j/dev"/>
+ <classpathentry kind="lib" path="build/jbossesb/lib/jbossesb-config-model-1.0.1.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb/lib/jbossesb-rosetta.jar" sourcepath="rosetta"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="build/lib/activation-1.1.jar"/>
<classpathentry kind="lib" path="build/lib/antlr-2.7.7.jar"/>
@@ -23,13 +23,12 @@
<classpathentry kind="lib" path="build/lib/commons-dbcp-1.2.1.jar"/>
<classpathentry kind="lib" path="build/lib/commons-digester-1.7.jar"/>
<classpathentry kind="lib" path="build/lib/commons-discovery-0.2.jar"/>
- <classpathentry kind="lib" path="build/lib/commons-httpclient-3.0.1.jar"/>
+ <classpathentry kind="lib" path="build/lib/commons-httpclient-3.0.1.jar" sourcepath="/opt/java/httpclient/commons-httpclient-3.0.1/src"/>
<classpathentry kind="lib" path="build/lib/commons-io-1.3.jar"/>
<classpathentry kind="lib" path="build/lib/commons-lang-2.1.jar"/>
<classpathentry kind="lib" path="build/lib/commons-logging-1.1.jar"/>
<classpathentry kind="lib" path="build/lib/commons-pool-1.2.jar"/>
<classpathentry kind="lib" path="build/lib/dom4j-1.6.1.jar"/>
- <classpathentry kind="lib" path="build/lib/groovy-all-1.0.jar"/>
<classpathentry kind="lib" path="build/lib/h2-1.0.68.jar"/>
<classpathentry kind="lib" path="build/lib/hibernate3-3.2.4.SP1.jar"/>
<classpathentry kind="lib" path="build/lib/javassist-3.6.0.GA.jar"/>
@@ -52,14 +51,10 @@
<classpathentry kind="lib" path="build/lib/jsch-0.1.38.jar"/>
<classpathentry kind="lib" path="build/lib/juddi-2.0rc5.jar"/>
<classpathentry kind="lib" path="build/lib/juddi-client-2.0rc5.jar"/>
- <classpathentry kind="lib" path="build/lib/junit-3.8.1.jar"/>
<classpathentry kind="lib" path="build/lib/jzlib-1.0.7.jar"/>
<classpathentry kind="lib" path="build/lib/log4j-1.2.14.jar"/>
<classpathentry kind="lib" path="build/lib/logkit-1.0.1.jar"/>
<classpathentry kind="lib" path="build/lib/mail-1.4.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-commons-1.0.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-smooks-core-1.0.1.jar"/>
- <classpathentry kind="lib" path="build/lib/milyn-smooks-javabean-1.0.1.jar"/>
<classpathentry kind="lib" path="build/lib/mvel-1.3.3-java1.5.jar"/>
<classpathentry kind="lib" path="build/lib/ognl-2.6.9.jar"/>
<classpathentry kind="lib" path="build/lib/quartz-1.5.2.jar"/>
@@ -78,109 +73,114 @@
<classpathentry kind="lib" path="build/lib/xom-1.1.jar"/>
<classpathentry kind="lib" path="build/lib/xpp3_min-1.1.3.4.O.jar"/>
<classpathentry kind="lib" path="build/lib/xstream-1.2.2.jar"/>
- <classpathentry kind="lib" path="build/jbossesb/lib/jbossesb.sar/lib/jbossesb-config-model-1.0.1.jar"/>
- <classpathentry kind="lib" path="build/jbossesb/lib/jbossesb.sar/lib/jbossesb-rosetta.jar"/>
<classpathentry kind="lib" path="build/jbossesb/lib/ext/jbossts-common.jar"/>
<classpathentry kind="lib" path="build/jbossesb/lib/jbossesb.esb/c3p0-0.9.1-pre9.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/javassist.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jaxb-api.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jaxb-xjc.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jaxws-rt.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jaxws-tools.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jboss-aop-jdk50-client.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jboss-aspect-jdk50-client.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jboss-client.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jboss-common-client.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jboss-deployment.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jboss-iiop-client.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jboss-j2ee.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jboss-jaxrpc.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jboss-jaxws.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jboss-jsr77-client.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jboss-messaging-client.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jboss-remoting.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jboss-saaj.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jboss-serialization.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jboss-srp-client.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jboss-system-client.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jboss-transaction-client.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jboss-xml-binding.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jbossall-client.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jbosscx-client.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jbossha-client.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jbossjmx-ant.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jbossmq-client.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jbosssx-client.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jbossws-client.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jbossws-common.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jbossws-framework.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jbossws-jboss42.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jbossws-spi.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jmx-client.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jmx-invoker-adaptor-client.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/jnp-client.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/log4j.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/policy.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/stax-ex.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/streambuffer.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/trove.jar"/>
- <classpathentry kind="lib" path="build/jbossesb-server-4.4.GA/client/wsdl4j.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jaxb-api.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jaxb-impl.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jaxb-xjc.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jaxws-rt.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jaxws-tools.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jboss-aop-jdk50-client.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jboss-aspect-jdk50-client.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jboss-client.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jboss-common-client.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jboss-deployment.jar" sourcepath="/opt/jboss/microcontainer/deployers/2.0.5.GA"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jboss-iiop-client.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jboss-j2ee.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jboss-jaxrpc.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jboss-jaxws.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jboss-jsr77-client.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jboss-messaging-client.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jboss-remoting.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jboss-saaj.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jboss-serialization.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jboss-srp-client.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jboss-system-client.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jboss-transaction-client.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jboss-xml-binding.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jbossall-client.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jbosscx-client.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jbossha-client.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jbossjmx-ant.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jbossmq-client.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jbosssx-client.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jbossws-client.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jbossws-common.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jbossws-framework.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jbossws-jboss42.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jbossws-spi.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jmx-client.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jmx-invoker-adaptor-client.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/jnp-client.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/log4j.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/policy.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/stax-ex.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/streambuffer.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/trove.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb-server-4.5.GA/client/wsdl4j.jar"/>
<classpathentry kind="lib" path="lib/ext/commons-net-2.0.0-652071.jar"/>
<classpathentry kind="lib" path="lib/ext/commons-ssl-0.3.4.jar"/>
<classpathentry kind="lib" path="lib/ext/jboss-jaxws.jar"/>
<classpathentry kind="lib" path="lib/ext/jbossws-core.jar"/>
<classpathentry kind="lib" path="lib/ext/jbossws-spi.jar"/>
- <classpathentry kind="lib" path="/opt/jboss/esb/JBESB_4_4_GA_CP/testlib/emma.jar"/>
- <classpathentry kind="lib" path="/opt/jboss/esb/JBESB_4_4_GA_CP/testlib/emma_ant.jar"/>
- <classpathentry kind="lib" path="/opt/jboss/esb/JBESB_4_4_GA_CP/testlib/hsqldb.jar"/>
- <classpathentry kind="lib" path="/opt/jboss/esb/JBESB_4_4_GA_CP/testlib/jakarta-oro-2.0.8.jar"/>
- <classpathentry kind="lib" path="/opt/jboss/esb/JBESB_4_4_GA_CP/testlib/jboss-jaxb-intros.jar"/>
- <classpathentry kind="lib" path="/opt/jboss/esb/JBESB_4_4_GA_CP/testlib/jboss-remoting.jar"/>
- <classpathentry kind="lib" path="/opt/jboss/esb/JBESB_4_4_GA_CP/testlib/jbossweb.jar"/>
- <classpathentry kind="lib" path="/opt/jboss/esb/JBESB_4_4_GA_CP/testlib/junit-4.1.jar"/>
- <classpathentry kind="lib" path="/opt/jboss/esb/JBESB_4_4_GA_CP/testlib/mockejb.jar"/>
- <classpathentry kind="lib" path="/opt/jboss/esb/JBESB_4_4_GA_CP/testlib/opencsv-1.6.jar"/>
- <classpathentry kind="lib" path="/opt/jboss/esb/JBESB_4_4_GA_CP/testlib/properties-plugin.jar"/>
- <classpathentry kind="lib" path="/opt/jboss/esb/JBESB_4_4_GA_CP/testlib/wsdl4j-1.6.2.jar"/>
- <classpathentry kind="lib" path="/opt/jboss/esb/JBESB_4_4_GA_CP/testlib/xalan-2.7.0.jar"/>
+ <classpathentry kind="lib" path="/opt/jboss/esb/trunk/testlib/emma.jar"/>
+ <classpathentry kind="lib" path="/opt/jboss/esb/trunk/testlib/emma_ant.jar"/>
+ <classpathentry kind="lib" path="/opt/jboss/esb/trunk/testlib/hsqldb.jar"/>
+ <classpathentry kind="lib" path="/opt/jboss/esb/trunk/testlib/jakarta-oro-2.0.8.jar"/>
+ <classpathentry kind="lib" path="/opt/jboss/esb/trunk/testlib/jboss-jaxb-intros.jar"/>
+ <classpathentry kind="lib" path="/opt/jboss/esb/trunk/testlib/jboss-remoting.jar"/>
+ <classpathentry kind="lib" path="/opt/jboss/esb/trunk/testlib/junit-4.1.jar"/>
+ <classpathentry kind="lib" path="/opt/jboss/esb/trunk/testlib/mockejb.jar"/>
+ <classpathentry kind="lib" path="/opt/jboss/esb/trunk/testlib/opencsv-1.6.jar"/>
+ <classpathentry kind="lib" path="/opt/jboss/esb/trunk/testlib/properties-plugin.jar"/>
+ <classpathentry kind="lib" path="/opt/jboss/esb/trunk/testlib/wsdl4j-1.6.2.jar"/>
+ <classpathentry kind="lib" path="/opt/jboss/esb/trunk/testlib/xalan-2.7.0.jar"/>
<classpathentry kind="lib" path="ftp/lib/ftplet-api-1.0-incubator-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="ftp/lib/ftpserver-admin-gui-1.0-incubator-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="ftp/lib/ftpserver-core-1.0-incubator-SNAPSHOT.jar"/>
- <classpathentry kind="lib" path="ftp/lib/mina-core-1.0.2.jar"/>
- <classpathentry kind="lib" path="ftp/lib/mina-filter-ssl-1.0.2.jar"/>
- <classpathentry kind="lib" path="ftp/lib/slf4j-api-1.3.0.jar"/>
- <classpathentry kind="lib" path="ftp/lib/slf4j-log4j12-1.3.0.jar"/>
- <classpathentry kind="lib" path="services/jbpm/lib/ext/asm.jar"/>
- <classpathentry kind="lib" path="services/jbpm/lib/ext/dom4j.jar"/>
- <classpathentry kind="lib" path="services/jbpm/lib/ext/jbpm-identity.jar"/>
- <classpathentry kind="lib" path="services/jbpm/lib/ext/jbpm-jpdl.jar"/>
- <classpathentry kind="lib" path="lib/ext/jgroups-all.jar"/>
- <classpathentry kind="lib" path="lib/ext/cache.jar"/>
- <classpathentry kind="lib" path="lib/ext/standalone/c3p0-0.9.1-pre9.jar"/>
- <classpathentry kind="lib" path="lib/ext/antlr-3.0b7.jar"/>
- <classpathentry kind="lib" path="lib/ext/asm.jar"/>
- <classpathentry kind="lib" path="lib/ext/cglib-2.1_3.jar"/>
- <classpathentry kind="lib" path="lib/ext/commons-httpclient.jar"/>
- <classpathentry kind="lib" path="lib/ext/commons-logging-1.0.4.jar"/>
- <classpathentry kind="lib" path="lib/ext/hibernate3.jar"/>
- <classpathentry kind="lib" path="lib/ext/javassist.jar"/>
- <classpathentry kind="lib" path="lib/ext/jboss-aop-jdk50.jar"/>
- <classpathentry kind="lib" path="lib/ext/jboss-messaging-client.jar"/>
- <classpathentry kind="lib" path="lib/ext/jboss-remoting.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-4.2.2.GA.jar"/>
+ <classpathentry kind="lib" path="build/jbossesb/lib/jbossesb-config-model-1.1.0.jar"/>
+ <classpathentry kind="lib" path="build/lib/mina-core-1.1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/mina-filter-ssl-1.1.7.jar"/>
+ <classpathentry kind="lib" path="build/lib/slf4j-api-1.4.3.jar"/>
+ <classpathentry kind="lib" path="build/lib/slf4j-log4j12-1.4.3.jar"/>
+ <classpathentry kind="lib" path="/opt/jboss/esb/trunk/testlib/xmlunit-1.2.jar"/>
+ <classpathentry kind="lib" path="build/lib/groovy-all-1.5.0.jar"/>
+ <classpathentry kind="lib" path="build/lib/milyn-commons-1.1.1.jar"/>
+ <classpathentry kind="lib" path="build/lib/milyn-smooks-core-1.1.1.jar"/>
+ <classpathentry kind="lib" path="build/lib/milyn-smooks-javabean-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/ext/jbossweb.jar"/>
- <classpathentry kind="lib" path="lib/ext/stringtemplate-3.0.jar"/>
- <classpathentry kind="lib" path="lib/ext/trove.jar"/>
- <classpathentry kind="lib" path="lib/ext/jakarta-oro-2.0.8.jar"/>
- <classpathentry kind="lib" path="lib/ext/commons-ssl-0.3.4.jar"/>
- <classpathentry kind="lib" path="services/jbrules/lib/ext/antlr-runtime-3.0.jar"/>
- <classpathentry kind="lib" path="lib/ext/mvel14-1.2rc4rv908.jar"/>
- <classpathentry kind="lib" path="lib/ext/quartz-1.5.2.jar"/>
- <classpathentry kind="lib" path="lib/ext/jaxr-api-1.0rc1.jar"/>
- <classpathentry kind="lib" path="lib/ext/jboss-jaxb-intros.jar"/>
- <classpathentry kind="lib" path="lib/ext/scout-1.0rc1.jar"/>
- <classpathentry kind="lib" path="lib/ext/jbossweb.jar"/>
- <classpathentry kind="lib" path="lib/ext/jbossweb-service.jar"/>
- <classpathentry kind="lib" path="services/soap/lib/ext/wise-core.jar"/>
+ <classpathentry kind="lib" path="lib/ext/jbossweb-service.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-deployers-vfs-spi-2.0.5.GA.jar" sourcepath="/opt/jboss/microcontainer/deployers/2.0.5.GA"/>
+ <classpathentry kind="lib" path="build/lib/jboss-dependency-2.0.4.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-deployers-core-spi-2.0.5.GA.jar" sourcepath="/opt/jboss/microcontainer/deployers/2.0.5.GA"/>
+ <classpathentry kind="lib" path="build/lib/jboss-deployers-structure-spi-2.0.5.GA.jar" sourcepath="/opt/jboss/microcontainer/deployers/2.0.5.GA"/>
+ <classpathentry kind="lib" path="build/lib/jboss-deployers-spi-2.0.5.GA.jar" sourcepath="/opt/jboss/microcontainer/deployers/2.0.5.GA"/>
+ <classpathentry kind="lib" path="build/lib/jboss-deployers-client-2.0.5.GA.jar" sourcepath="/opt/jboss/microcontainer/deployers/2.0.5.GA"/>
+ <classpathentry kind="lib" path="build/lib/jboss-deployers-client-spi-2.0.5.GA.jar" sourcepath="/opt/jboss/microcontainer/deployers/2.0.5.GA"/>
+ <classpathentry kind="lib" path="build/lib/jboss-deployers-core-2.0.5.GA.jar" sourcepath="/opt/jboss/microcontainer/deployers/2.0.5.GA"/>
+ <classpathentry kind="lib" path="build/lib/jboss-deployers-impl-2.0.5.GA.jar" sourcepath="/opt/jboss/microcontainer/deployers/2.0.5.GA"/>
+ <classpathentry kind="lib" path="build/lib/jboss-deployers-vfs-2.0.5.GA.jar" sourcepath="/opt/jboss/microcontainer/deployers/2.0.5.GA"/>
+ <classpathentry kind="lib" path="build/lib/jboss-as-j2se-5.0.1.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-as-system-jmx-5.0.1.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-common-core-2.2.11.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-ejb-api-3.0.0.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-logging-spi-2.0.5.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-vfs-2.1.0.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-test-1.1.3.GA.jar" sourcepath="/opt/jboss/microcontainer/test1.1.3.GA"/>
+ <classpathentry kind="lib" path="build/lib/jboss-as-bootstrap-5.0.1.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-as-jmx-5.0.1.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-as-main-5.0.1.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-as-mbeans-5.0.1.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-as-system-5.0.1.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-classloader-2.0.4.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-classloading-2.0.4.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-classloading-spi-5.0.3.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-classloading-vfs-2.0.4.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-managed-2.0.0.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-mdr-2.0.1.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-metatype-2.0.0.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-reflect-2.0.1.GA.jar"/>
+ <classpathentry kind="lib" path="build/lib/jboss-metadata-1.0.0.Beta6.jar" sourcepath="/opt/jboss/microcontainer/metadata/1.0.0.Beta6"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/.project
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/.project 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/.project 2009-03-20 15:23:58 UTC (rev 25766)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>JBossESB-CP4.4_NEW</name>
+ <name>JBossESB-AS5</name>
<comment></comment>
<projects>
</projects>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/install/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/install/build.xml 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/install/build.xml 2009-03-20 15:23:58 UTC (rev 25766)
@@ -7,6 +7,8 @@
<!-- Load Build Properties File -->
<property file="${org.jboss.esb.deployment.properties}"/>
+
+
<property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
<property name="client.dir" value="${org.jboss.esb.server.home}/client"/>
<property name="conf.dir" value="${server.dir}/conf"/>
@@ -31,6 +33,19 @@
<isset property="hierarchy.jbossesb"/>
</or>
</condition>
+
+ <!-- Check for JBossAS5 -->
+ <condition property="jbossas5">
+ <available file="${server.dir}/deployers"/>
+ </condition>
+
+ <!-- Check for JBossAS4.x -->
+ <condition property="jbossas4">
+ <not>
+ <available file="${server.dir}/deployers"/>
+ </not>
+ </condition>
+
<fail unless="hierarchy.recognised" message="Cannot determine build hierarchy"/>
@@ -51,7 +66,7 @@
<target name="dependencies" depends="dependencies.source, dependencies.jbossesb"/>
- <target name="deploy" depends="internal.deploy, deploy.bindings" description="Wrapper for internal.deploy"/>
+ <target name="deploy" depends="internal.deploy, internal.deploy.jbossas5, deploy.bindings" description="Wrapper for internal.deploy"/>
<target name="check.tomcat.props">
<fail unless="org.jboss.esb.tomcat.home" message="Cannot determine target deployment, please check deployment.properties"/>
@@ -66,6 +81,7 @@
file="${deploy.dir}/jboss-messaging.sar"/>
<available property="jbmq.present"
file="${deploy.dir}/jms/jbossmq-service.xml"/>
+ <available property="jbm.present" file="${deploy.dir}/messaging"/>
<available property="jbmq.present"
file="${hadeploy.dir}/jms/jbossmq-service.xml"/>
<fail message="Could not determine JMS provider">
@@ -101,98 +117,228 @@
<fail unless="esb.server.configured" message="Cannot determine target deployment, please check deployment.properties"/>
</target>
- <target name="internal.deploy" depends="check.deploy.props, dependencies, jms.config" description="Deploys Internal Services to the server">
- <!-- jbossesb.sar -->
- <copy todir="${deploy.dir}/jbossesb.sar">
+ <target name="internal.deploy" if="jbossas4" depends="check.deploy.props, dependencies, jms.config" description="Deploys Internal Services to the server">
+
+ <!-- jbossesb.sar -->
+ <copy todir="${deploy.dir}/jbossesb.sar">
<fileset dir="${org.jboss.esb.dist.lib}/jbossesb.sar"/>
- </copy>
+ </copy>
- <!-- jbossesb.esb -->
- <copy todir="${deploy.dir}/jbossesb.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.esb"
- excludes="${messaging.excludes}"/>
- </copy>
+ <!-- jbossesb.esb -->
+ <copy todir="${deploy.dir}/jbossesb.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.esb" excludes="${messaging.excludes}"/>
+ </copy>
- <!-- jbpm.esb -->
- <copy todir="${deploy.dir}/jbpm.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/jbpm.esb"
- excludes="${messaging.excludes}"/>
- </copy>
+ <!-- jbpm.esb -->
+ <copy todir="${deploy.dir}/jbpm.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/jbpm.esb" excludes="${messaging.excludes}"/>
+ </copy>
- <!-- jbrules.esb -->
- <copy todir="${deploy.dir}/jbrules.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/jbrules.esb"
- excludes="${messaging.excludes}"/>
- </copy>
+ <!-- jbrules.esb -->
+ <copy todir="${deploy.dir}/jbrules.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/jbrules.esb" excludes="${messaging.excludes}"/>
+ </copy>
- <!-- smooks.esb -->
- <copy todir="${deploy.dir}/smooks.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/smooks.esb"
- excludes="${messaging.excludes}"/>
- </copy>
+ <!-- smooks.esb -->
+ <copy todir="${deploy.dir}/smooks.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/smooks.esb" excludes="${messaging.excludes}"/>
+ </copy>
- <!-- spring.esb -->
- <copy todir="${deploy.dir}/spring.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/spring.esb"
- excludes="${messaging.excludes}"/>
- </copy>
+ <!-- spring.esb -->
+ <copy todir="${deploy.dir}/spring.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/spring.esb" excludes="${messaging.excludes}"/>
+ </copy>
- <!-- soap.esb -->
- <copy todir="${deploy.dir}/soap.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/soap.esb"
- excludes="${messaging.excludes}"/>
- <!-- hack for wise import -->
- <fileset dir="${client.dir}"
- includes="jboss-jaxws.jar jaxb-api.jar jaxb-impl.jar"/>
- </copy>
+ <!-- soap.esb -->
+ <copy todir="${deploy.dir}/soap.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/soap.esb" excludes="${messaging.excludes}, META-INF/jboss-structure.xml"/>
+ <fileset dir="${client.dir}" includes="jboss-jaxws.jar jaxb-api.jar jaxb-impl.jar"/>
+ </copy>
- <!-- slsb.esb -->
- <copy todir="${deploy.dir}/slsb.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/slsb.esb"
- excludes="${messaging.excludes}"/>
- </copy>
+ <!-- slsb.esb -->
+ <copy todir="${deploy.dir}/slsb.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/slsb.esb" excludes="${messaging.excludes}"/>
+ </copy>
- <!-- soapui-client.sar -->
- <copy todir="${deploy.dir}/soapui-client.sar">
- <fileset dir="${org.jboss.esb.dist.lib}/soapui-client.sar" excludes="${messaging.excludes}"/>
- </copy>
+ <!-- soapui-client.sar -->
+ <copy todir="${deploy.dir}/soapui-client.sar">
+ <fileset dir="${org.jboss.esb.dist.lib}/soapui-client.sar" excludes="${messaging.excludes}, META-INF/jbossesb-service-as5.xml"/>
+ </copy>
- <!-- contracts app -->
- <copy file="${org.jboss.esb.dist}/tools/console/console/jboss-esb-console.ear/contract.war" todir="${deploy.dir}" />
+ <!-- contracts app -->
+ <copy file="${org.jboss.esb.dist}/tools/console/console/jboss-esb-console.ear/contract.war" todir="${deploy.dir}" />
- <!-- install h2 jar -->
- <copy file="${org.jboss.esb.dist.lib}/h2-1.0.68.jar" todir="${server.lib.dir}"/>
+ <!-- install h2 jar -->
+ <copy file="${org.jboss.esb.dist.lib}/h2-1.0.68.jar" todir="${server.lib.dir}"/>
- <!-- embedded jopr console -->
- <ant dir="embedded-console" target="replace">
- <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
- <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
- </ant>
+ <!-- embedded jopr console -->
+ <ant dir="embedded-console" target="replace">
+ <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
+ <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
+ </ant>
+ <ant dir="jbpm-patch" target="replace">
+ <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
+ <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
+ </ant>
+ <ant dir="${product.dir}/tools/console/management-esb" target="deploy">
+ <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
+ <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
+ </ant>
- <ant dir="jbpm-patch" target="replace">
- <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
- <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
- </ant>
- <ant dir="${product.dir}/tools/console/management-esb" target="deploy">
- <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
- <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
- </ant>
+ </target>
+
+ <target name="internal.deploy.jbossas5" if="jbossas5" depends="check.deploy.props, dependencies, jms.config" description="Deploys Internal Services to the JBossAS5">
+ <echo message="Deploy to JBossAS5"/>
+
+ <!-- jbossesb deployer -->
+ <property name="deployers.dir" value="${server.dir}/deployers"/>
+ <mkdir dir="${deployers.dir}/esb.deployer"/>
+
+ <copy todir="${deployers.dir}/esb.deployer" overwrite="true">
+ <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.sar/lib">
+ <include name="jbossesb-rosetta.jar"/>
+ <include name="jbossesb-config-model-1.0.1.jar"/>
+ <include name="jbossesb-config-model-1.1.0.jar"/>
+ <include name="commons-lang-2.1.jar"/>
+ <include name="commons-net-2.0.0-652071.jar"/>
+ <include name="commons-ssl-0.3.4.jar"/>
+ <include name="commons-io-1.3.jar"/>
+ <include name="groovy-all-1.5.0.jar"/>
+ <include name="jbossts-common.jar"/>
+ <include name="jsch-0.1.38.jar"/>
+ <include name="juddi-2.0rc5.aop.jar"/>
+ <include name="juddi-client-2.0rc5.jar"/>
+ <include name="mina-core-1.1.7.jar"/>
+ <include name="mina-filter-ssl-1.1.7.jar"/>
+ <include name="mvel-1.3.3-java1.5.jar"/>
+ <include name="scout-1.0rc2.aop.jar"/>
+ <include name="slf4j-api-1.4.3.jar"/>
+ <include name="slf4j-log4j12-1.4.3.jar"/>
+ <include name="stax-api-1.0.1.jar"/>
+ <include name="wstx-asl-3.2.0.jar"/>
+ <include name="xbean-2.2.0.jar"/>
+ <include name="xstream-1.2.2.jar"/>
+ </fileset>
+ <fileset dir="${org.jboss.esb.dist.lib}">
+ <include name="commons-codec-1.3.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${deployers.dir}/esb.deployer/META-INF" file="${basedir}/esb-deployers-jboss-beans.xml" overwrite="true"/>
+
+ <!-- jbossesb.sar -->
+ <copy todir="${deploy.dir}/jbossesb.sar" includeemptydirs="false" overwrite="true">
+ <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.sar">
+ <exclude name="lib/jbossesb-rosetta.jar"/>
+ <exclude name="lib/jbossesb-config-model-1.0.1.jar"/>
+ <exclude name="lib/jbossesb-config-model-1.1.0.jar"/>
+ <exclude name="lib/commons-lang-2.1.jar"/>
+ <exclude name="lib/commons-net-2.0.0-652071.jar"/>
+ <exclude name="lib/commons-ssl-0.3.4.jar"/>
+ <exclude name="lib/commons-io-1.3.jar"/>
+ <exclude name="lib/groovy-all-1.5.0.jar"/>
+ <exclude name="lib/jbossts-common.jar"/>
+ <exclude name="lib/jsch-0.1.38.jar"/>
+ <exclude name="lib/juddi-2.0rc5.aop.jar"/>
+ <exclude name="lib/juddi-client-2.0rc5.jar"/>
+ <exclude name="lib/mina-core-1.1.7.jar"/>
+ <exclude name="lib/mina-filter-ssl-1.1.7.jar"/>
+ <exclude name="lib/mvel-1.3.3-java1.5.jar"/>
+ <exclude name="lib/scout-1.0rc2.aop.jar"/>
+ <exclude name="lib/slf4j-api-1.4.3.jar"/>
+ <exclude name="lib/slf4j-log4j12-1.4.3.jar"/>
+ <exclude name="lib/stax-api-1.0.1.jar"/>
+ <exclude name="lib/wstx-asl-3.2.0.jar"/>
+ <exclude name="lib/xbean-2.2.0.jar"/>
+ <exclude name="lib/xstream-1.2.2.jar"/>
+ <exclude name="META-INF/jboss-service.xml"/>
+ </fileset>
+ </copy>
+ <copy tofile="${deploy.dir}/jbossesb.sar/META-INF/jboss-service.xml" file="${basedir}/jboss-service-jbossas5.xml" overwrite="true"/>
+ <!-- jbossesb.esb -->
+ <copy todir="${deploy.dir}/jbossesb.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.esb" excludes="${messaging.excludes}"/>
+ </copy>
+
+ <!-- jbpm.esb -->
+ <copy todir="${deploy.dir}/jbpm.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/jbpm.esb" excludes="${messaging.excludes}"/>
+ </copy>
+
+ <!-- jbrules.esb -->
+ <copy todir="${deploy.dir}/jbrules.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/jbrules.esb" excludes="${messaging.excludes}"/>
+ </copy>
+
+ <!-- smooks.esb -->
+ <copy todir="${deploy.dir}/smooks.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/smooks.esb" excludes="${messaging.excludes}"/>
+ </copy>
+
+ <!-- spring.esb -->
+ <copy todir="${deploy.dir}/spring.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/spring.esb" excludes="${messaging.excludes}"/>
+ </copy>
+
+ <!-- soap.esb -->
+ <copy todir="${deploy.dir}/soap.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/soap.esb" excludes="${messaging.excludes}"/>
+ <fileset dir="${client.dir}" includes="jboss-jaxws.jar jaxb-api.jar jaxb-impl.jar"/>
+ </copy>
+
+ <!-- slsb.esb -->
+ <copy todir="${deploy.dir}/slsb.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/slsb.esb" excludes="${messaging.excludes}"/>
+ </copy>
+
+ <!-- soapui-client.sar -->
+ <copy todir="${deploy.dir}/soapui-client.sar">
+ <fileset dir="${org.jboss.esb.dist.lib}/soapui-client.sar" excludes="${messaging.excludes}, META-INF/jbossesb-service-as5.xml"/>
+ </copy>
+ <copy tofile="${deploy.dir}/soapui-client.sar/META-INF/jboss-service.xml" file="${org.jboss.esb.dist.lib}/soapui-client.sar/META-INF/jboss-service-as5.xml" overwrite="true"/>
+
+ <!-- contracts app -->
+ <copy file="${org.jboss.esb.dist}/tools/console/console/jboss-esb-console.ear/contract.war" todir="${deploy.dir}" />
+
+ <!-- install h2 jar -->
+ <copy file="${org.jboss.esb.dist.lib}/h2-1.0.68.jar" todir="${server.lib.dir}"/>
+
+ <!-- embedded jopr console -->
+ <ant dir="embedded-console" target="replace">
+ <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
+ <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
+ </ant>
+
+ <ant dir="jbpm-patch" target="replace">
+ <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
+ <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
+ </ant>
+
+ <!-- -->
+ <ant dir="${product.dir}/tools/console/management-esb" target="deploy">
+ <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
+ <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
+ </ant>
</target>
<target name="undeploy" depends="check.deploy.props, undeploy.bindings" description="Undeploy ESB components.">
- <delete dir="${deploy.dir}/jbossesb.sar" />
- <delete dir="${deploy.dir}/jbossesb.esb" />
- <delete dir="${deploy.dir}/jbpm.esb" />
- <delete dir="${deploy.dir}/jbrules.esb" />
- <delete dir="${deploy.dir}/smooks.esb" />
- <delete dir="${deploy.dir}/spring.esb" />
- <delete dir="${deploy.dir}/soap.esb" />
- <delete dir="${deploy.dir}/soapui-client.sar" />
- <delete dir="${deploy.dir}/contract.war" />
- <delete dir="${conf.dir}/action-templates.xml" />
+ <delete dir="${deploy.dir}/jbossesb.sar" quiet="true"/>
+ <delete dir="${deploy.dir}/jbossesb.esb" quiet="true"/>
+ <delete dir="${deploy.dir}/jbpm.esb" quiet="true"/>
+ <delete dir="${deploy.dir}/jbrules.esb" quiet="true"/>
+ <delete dir="${deploy.dir}/smooks.esb" quiet="true"/>
+ <delete dir="${deploy.dir}/spring.esb" quiet="true"/>
+ <delete dir="${deploy.dir}/soap.esb" quiet="true"/>
+ <delete dir="${deploy.dir}/soapui-client.sar" quiet="true"/>
+ <delete dir="${deploy.dir}/contract.war" quiet="true"/>
+ <delete dir="${conf.dir}/action-templates.xml" quiet="true"/>
+ <!--antcall target="undeploy.jbossas5"/-->
</target>
+
+ <target name="undeploy.jbossas5" if="jbossas5" >
+ <delete dir="${server.dir}/deployers" quiet="true"/>
+ </target>
<property name="org.jboss.esb.tomcat.55lib"
location="${org.jboss.esb.tomcat.home}/common/lib"/>
@@ -287,8 +433,14 @@
</target>
<target name="init.bindings.props" depends="check.deploy.props, dependencies">
- <property name="bindings.dir" location="${org.jboss.esb.server.home}/docs/examples/binding-manager"/>
- <property name="bindings.location" location="${bindings.dir}/sample-bindings.xml"/>
+ <condition property="bindings.dir" value="${org.jboss.esb.server.home}/docs/examples/binding-manager" else="${conf.dir}">
+ <available file="${org.jboss.esb.server.home}/docs/examples/binding-manager"/>
+ </condition>
+
+ <condition property="bindings.location" value="${bindings.dir}/sample-bindings.xml" else="${bindings.dir}/bootstrap/bindings.xml">
+ <available file="${org.jboss.esb.server.home}/docs/examples/binding-manager"/>
+ </condition>
+
<property name="bindings.tmp.location" location="${bindings.location}.tmp"/>
<property name="bindings.backup.location" location="${bindings.location}.bak"/>
<available property="bindings.exist" file="${bindings.backup.location}" type="file"/>
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/install/esb-deployers-jboss-beans.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/install/esb-deployers-jboss-beans.xml (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/install/esb-deployers-jboss-beans.xml 2009-03-20 15:23:58 UTC (rev 25766)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- JBoss ESB + JBossAS5 integration -->
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Make MC aware of .esb suffixes -->
+ <bean name="EsbExtensionProvider" class="org.jboss.soa.esb.listeners.deployers.mc.EsbExtensionProvider"/>
+ <bean name="EsbStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
+ <incallback method="addJarExtension">
+ <parameter><inject bean="EsbExtensionProvider"/></parameter>
+ </incallback>
+ </bean>
+
+ <!-- Will pickup and parse jboss-esb.xml configuration files from esb archives. -->
+ <bean name="EsbConfigParser" class="org.jboss.soa.esb.listeners.deployers.mc.EsbConfigParser"/>
+
+ <!-- Will create the BeanMetaData that describes a esb deployment -->
+ <bean name="EsbDeployer" class="org.jboss.soa.esb.listeners.deployers.mc.EsbDeployer"/>
+
+</deployment>
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/install/jboss-service-jbossas5.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/install/jboss-service-jbossas5.xml (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/install/jboss-service-jbossas5.xml 2009-03-20 15:23:58 UTC (rev 25766)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+
+ <mbean code="org.jboss.soa.esb.common.JBossESBPropertyService" name="jboss.esb:service=PropertyService">
+ <attribute name="PropertyFile">jbossesb-properties.xml</attribute>
+ <attribute name="ServerDataDir">${jboss.server.data.dir}</attribute>
+ <depends>jboss:service=TransactionManager</depends>
+ </mbean>
+
+ <mbean code="org.jboss.internal.soa.esb.services.registry.RegistryService" name="jboss.esb:service=ESBRegistry">
+ <depends>jboss.esb:service=PropertyService</depends>
+ </mbean>
+
+ <mbean code="org.jboss.internal.soa.esb.dependencies.JuddiRMIService" name="jboss.esb:service=JuddiRMI"
+ description="Juddi RMI Service">
+ <attribute name="PropertiesResourceFile">esb.juddi.xml</attribute>
+ <attribute name="ServerDataDir">${jboss.server.data.dir}</attribute>
+ <depends>jboss.jca:service=DataSourceBinding,name=juddiDB</depends>
+ <depends>jboss.esb:service=PropertyService</depends>
+ </mbean>
+
+ <mbean code="org.jboss.soa.esb.listeners.message.MessageCounter" name="jboss.esb:service=MessageCounter"/>
+
+</server>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/install/jboss-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/install/jboss-service.xml 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/install/jboss-service.xml 2009-03-20 15:23:58 UTC (rev 25766)
@@ -1,27 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <mbean code="org.jboss.soa.esb.common.JBossESBPropertyService"
- name="jboss.esb:service=PropertyService">
+
+ <classpath codebase="deploy/jbossesb.sar/lib" archives="*.jar"/>
+
+ <mbean code="org.jboss.soa.esb.common.JBossESBPropertyService" name="jboss.esb:service=PropertyService">
<attribute name="PropertyFile">jbossesb-properties.xml</attribute>
+ <attribute name="ServerDataDir">${jboss.server.data.dir}</attribute>
+ <depends>jboss:service=TransactionManager</depends>
</mbean>
- <mbean code="org.jboss.internal.soa.esb.services.registry.RegistryService"
- name="jboss.esb:service=ESBRegistry">
+
+ <mbean code="org.jboss.internal.soa.esb.services.registry.RegistryService" name="jboss.esb:service=ESBRegistry">
<depends>jboss.esb:service=PropertyService</depends>
</mbean>
- <mbean code="org.jboss.internal.soa.esb.dependencies.JuddiRMIService"
- name="jboss.esb:service=JuddiRMI"
+
+ <mbean code="org.jboss.internal.soa.esb.dependencies.JuddiRMIService" name="jboss.esb:service=JuddiRMI"
description="Juddi RMI Service">
<attribute name="PropertiesResourceFile">esb.juddi.xml</attribute>
+ <attribute name="ServerDataDir">${jboss.server.data.dir}</attribute>
<depends>jboss.jca:service=DataSourceBinding,name=juddiDB</depends>
<depends>jboss.esb:service=PropertyService</depends>
</mbean>
- <mbean code="org.jboss.soa.esb.listeners.config.JBoss4ESBDeployer"
- name="jboss.esb:service=ESBDeployer">
- <depends>jboss.esb:service=ESBRegistry</depends>
+
+ <mbean code="org.jboss.soa.esb.listeners.config.JBoss4ESBDeployer" name="jboss.esb:service=ESBDeployer">
+ <attribute name="ServerTempDir">${jboss.server.temp.dir}</attribute>
+ <depends>jboss.esb:service=ESBRegistry</depends>
<depends>jboss.esb:service=JuddiRMI</depends>
</mbean>
- <mbean code="org.jboss.soa.esb.listeners.message.MessageCounter"
- name="jboss.esb:service=MessageCounter">
+
+ <mbean code="org.jboss.soa.esb.listeners.message.MessageCounter" name="jboss.esb:service=MessageCounter">
</mbean>
</server>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/ivy.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/ivy.xml 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/ivy.xml 2009-03-20 15:23:58 UTC (rev 25766)
@@ -78,5 +78,55 @@
<dependency org="sun-jaxws" name="jaxws-tools" rev="2.1.1"/>
<dependency org="sun-jaxws" name="jaxws-rt" rev="2.1.1"/>
<dependency org="sun-jaxb" name="jaxb-xjc" rev="2.1.4"/>
+
+ <!-- JBoss Microcontainer dependencies -->
+ <dependency org="org.jboss.deployers" name="jboss-deployers-vfs-spi" rev="2.0.5.GA">
+ <exclude org="jboss" module="jboss-vfs"/>
+ </dependency>
+ <dependency org="org.jboss.deployers" name="jboss-deployers-vfs" rev="2.0.5.GA"/>
+ <dependency org="org.jboss.deployers" name="jboss-deployers-spi" rev="2.0.5.GA"/>
+ <dependency org="org.jboss.deployers" name="jboss-deployers-core-spi" rev="2.0.5.GA"/>
+ <dependency org="org.jboss.deployers" name="jboss-deployers-core" rev="2.0.5.GA"/>
+ <dependency org="org.jboss.deployers" name="jboss-deployers-impl" rev="2.0.5.GA"/>
+ <dependency org="org.jboss.deployers" name="jboss-deployers-structure-spi" rev="2.0.5.GA"/>
+ <dependency org="org.jboss.deployers" name="jboss-deployers-client" rev="2.0.5.GA"/>
+ <dependency org="org.jboss.deployers" name="jboss-deployers-client-spi" rev="2.0.5.GA"/>
+ <dependency org="org.jboss.deployers" name="jboss-deployers-client-spi" rev="2.0.5.GA"/>
+
+ <dependency org="org.jboss.microcontainer" name="jboss-dependency" rev="2.0.4.GA"/>
+ <dependency org="org.jboss.microcontainer" name="jboss-kernel" rev="2.0.4.GA"/>
+
+ <dependency org="org.jboss.cl" name="jboss-classloader" rev="2.0.4.GA"/>
+ <dependency org="org.jboss.cl" name="jboss-classloading" rev="2.0.4.GA"/>
+ <dependency org="org.jboss.cl" name="jboss-classloading-vfs" rev="2.0.4.GA"/>
+
+ <dependency org="org.jboss.man" name="jboss-managed" rev="2.0.0.GA"/>
+ <dependency org="org.jboss.man" name="jboss-metatype" rev="2.0.0.GA"/>
+
+ <dependency org="org.jboss.integration" name="jboss-classloading-spi" rev="5.0.3.GA"/>
+
+ <dependency org="org.jboss" name="jboss-vfs" rev="2.1.0.GA"/>
+ <dependency org="org.jboss" name="jboss-common-core" rev="2.2.11.GA"/>
+ <dependency org="org.jboss" name="jboss-mdr" rev="2.0.1.GA"/>
+ <dependency org="org.jboss" name="jboss-reflect" rev="2.0.1.GA"/>
+ <dependency org="org.jboss" name="jbossxb" rev="2.0.0.GA"/>
+
+ <!-- Note that jboss-metadata is still in beta -->
+ <dependency org="org.jboss" name="jboss-metadata" rev="1.0.0.Beta6"/>
+
+ <dependency org="org.jboss.jbossas" name="jboss-as-bootstrap" rev="5.0.1.GA"/>
+ <dependency org="org.jboss.jbossas" name="jboss-as-j2se" rev="5.0.1.GA"/>
+ <dependency org="org.jboss.jbossas" name="jboss-as-jmx" rev="5.0.1.GA"/>
+ <dependency org="org.jboss.jbossas" name="jboss-as-main" rev="5.0.1.GA"/>
+ <dependency org="org.jboss.jbossas" name="jboss-as-mbeans" rev="5.0.1.GA"/>
+ <dependency org="org.jboss.jbossas" name="jboss-as-system" rev="5.0.1.GA"/>
+ <dependency org="org.jboss.jbossas" name="jboss-as-system-jmx" rev="5.0.1.GA"/>
+
+ <dependency org="org.jboss.logging" name="jboss-logging-spi" rev="2.0.5.GA"/>
+ <dependency org="org.jboss.javaee" name="jboss-ejb-api" rev="3.0.0.GA"/>
+ <dependency org="org.jboss.test" name="jboss-test" rev="1.1.3.GA"/>
+
+ <dependency org="javax.xml.bind" name="jaxb-api" rev="2.1"/>
+
</dependencies>
</ivy-module>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/aop/resources/META-INF/jboss-aop.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/aop/resources/META-INF/jboss-aop.xml 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/aop/resources/META-INF/jboss-aop.xml 2009-03-20 15:23:58 UTC (rev 25766)
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE aop PUBLIC
- "-//JBoss//DTD JBOSS AOP 1.0//EN"
- "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
+<aop xmlns="urn:jboss:aop-beans:1.0">
-<aop>
<aspect class="org.jboss.internal.soa.esb.services.registry.aspect.ScoutAspect" scope="PER_VM"/>
<aspect class="org.jboss.internal.soa.esb.services.registry.aspect.JUDDIAspect" scope="PER_VM"/>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/build.xml 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/build.xml 2009-03-20 15:23:58 UTC (rev 25766)
@@ -183,6 +183,7 @@
</target>
<path id="xbeans-classpath">
+ <fileset dir="${org.jboss.esb.lib.dir}" includes="xbeans.jar"/>
<fileset dir="${org.jboss.esb.lib.dir}" includes="*.jar"/>
<fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
</path>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/H2Database.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/H2Database.java 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/H2Database.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -29,8 +29,10 @@
import java.sql.Statement;
import org.h2.tools.Server;
+import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfigLocator;
+import org.jboss.system.server.ServerConfig;
+import org.jboss.system.server.ServerConfigImplMBean;
/**
* Integration with H2.
@@ -121,6 +123,8 @@
/** Server thread delay for remote H2. */
private long delay = DEFAULT_DELAY ;
+ private String datadir;
+
// Attributes ----------------------------------------------------
/**
@@ -573,7 +577,17 @@
File getDataDir()
{
- return ServerConfigLocator.locate().getServerDataDir();
+ if (datadir == null)
+ {
+ final ServerConfig serverConfig = (ServerConfig) MBeanProxyExt.create(ServerConfig.class, ServerConfigImplMBean.OBJECT_NAME);
+ return serverConfig.getServerDataDir();
+ }
+ return new File(datadir);
}
+ public void setDataDir(String datadir)
+ {
+ this.datadir = datadir;
+ }
+
}
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/H2DatabaseMBean.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/H2DatabaseMBean.java 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/H2DatabaseMBean.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -84,4 +84,7 @@
/** The binding address, default is '0.0.0.0' */
String getBindAddress();
void setBindAddress(String address);
+
+ /** Set the dir that will be used by the database. */
+ void setDataDir(final String datadir);
}
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -37,9 +37,10 @@
import org.apache.log4j.Logger;
import org.jboss.internal.soa.esb.util.PropertiesHelper;
import org.jboss.internal.soa.esb.util.XMLHelper;
+import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.system.server.ServerConfig;
-import org.jboss.system.server.ServerConfigLocator;
+import org.jboss.system.server.ServerConfigImplMBean;
public class JuddiRMIService extends ServiceMBeanSupport implements JuddiRMIServiceMBean
{
@@ -53,6 +54,7 @@
private static final String JUDDI_PROPERTY_FILE_COMMENTS = "Auto generated property file, do not edit" ;
private String propertiesResourceFile ;
+ private String serverDataDir;
public String getPropertiesResourceFile()
{
@@ -98,8 +100,14 @@
xmlPropertyIS.close() ;
}
- final ServerConfig serverConfig = ServerConfigLocator.locate() ;
- final File dataDir = serverConfig.getServerDataDir() ;
+ File dataDir;
+ if (serverDataDir != null) {
+ dataDir = new File(serverDataDir);
+ }
+ else {
+ final ServerConfig serverConfig = (ServerConfig) MBeanProxyExt.create(ServerConfig.class, ServerConfigImplMBean.OBJECT_NAME);
+ dataDir = serverConfig.getServerDataDir() ;
+ }
final File juddiPropertyFile = new File(dataDir, JUDDI_PROPERTIES_RESOURCE_FILE) ;
final ByteArrayInputStream bais = new ByteArrayInputStream(propertyFileContents) ;
@@ -137,4 +145,9 @@
ic.unbind(JNDIRegistration.INQUIRY_SERVICE) ;
ic.unbind(JNDIRegistration.PUBLISH_SERVICE) ;
}
+
+ public void setServerDataDir(final String directory)
+ {
+ this.serverDataDir = directory;
+ }
}
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIServiceMBean.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIServiceMBean.java 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIServiceMBean.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -27,9 +27,9 @@
public interface JuddiRMIServiceMBean extends ServiceMBean
{
- String getPropertiesResourceFile()
- ;
+ String getPropertiesResourceFile() ;
- void setPropertiesResourceFile(String propertiesResourceFile)
- ;
+ void setPropertiesResourceFile(String propertiesResourceFile) ;
+
+ void setServerDataDir(final String directory);
}
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -24,7 +24,9 @@
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
+import java.net.InetAddress;
import java.net.URL;
+import java.net.UnknownHostException;
import javax.transaction.Status;
import javax.transaction.Synchronization;
@@ -34,10 +36,10 @@
import org.apache.log4j.Logger;
import org.jboss.internal.soa.esb.util.XMLHelper;
+import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.system.server.ServerConfig;
-import org.jboss.system.server.ServerConfigLocator;
-import org.jboss.system.server.ServerConfigUtil;
+import org.jboss.system.server.ServerConfigImplMBean;
import org.jboss.tm.TransactionManagerLocator;
/**
@@ -55,6 +57,8 @@
* The current property file name.
*/
private String propertyFile ;
+
+ private String serverDataDir;
/**
* Get the property file.
@@ -74,6 +78,20 @@
this.propertyFile = propertyFile ;
}
+ private static String fixRemoteAddress(final String address)
+ {
+ try
+ {
+ if (address == null || "0.0.0.0".equals(address))
+ return InetAddress.getLocalHost().getHostName();
+ }
+ catch (UnknownHostException ignored)
+ {
+ }
+
+ return address;
+ }
+
/**
* Create the property service.
*/
@@ -85,7 +103,7 @@
if (bindHost == null)
{
final String bindAddress = System.getProperty(ServerConfig.SERVER_BIND_ADDRESS) ;
- final String esbBindAddress = ServerConfigUtil.fixRemoteAddress(bindAddress) ;
+ final String esbBindAddress = JBossESBPropertyService.fixRemoteAddress(bindAddress) ;
System.setProperty(Environment.ESB_BIND_ADDRESS, esbBindAddress) ;
}
@@ -101,8 +119,14 @@
}
try {
- final ServerConfig serverConfig = ServerConfigLocator.locate() ;
- final File dataDir = serverConfig.getServerDataDir() ;
+ File dataDir;
+ if (serverDataDir != null) {
+ dataDir = new File(serverDataDir);
+ }
+ else {
+ final ServerConfig serverConfig = (ServerConfig) MBeanProxyExt.create(ServerConfig.class, ServerConfigImplMBean.OBJECT_NAME);
+ dataDir = serverConfig.getServerDataDir() ;
+ }
final File esbPropertyFile = new File(dataDir, ESB_PROPERTY_FILE) ;
final FileOutputStream esbPropertyOS = new FileOutputStream(esbPropertyFile) ;
@@ -331,4 +355,9 @@
return "JTATransactionStrategy";
}
}
+
+ public void setServerDataDir(String directory)
+ {
+ this.serverDataDir = directory;
+ }
}
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyServiceMBean.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyServiceMBean.java 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyServiceMBean.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -38,4 +38,6 @@
* @param propertyFile The name of the property file being used.
*/
public void setPropertyFile(final String propertyFile) ;
+
+ public void setServerDataDir(final String directory);
}
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResourceManager.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResourceManager.java 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/lifecycle/LifecycleResourceManager.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -62,7 +62,9 @@
static
{
// Initialise the shutdown hook in case we are not in an ESB.
- Runtime.getRuntime().addShutdownHook(cleanupHook) ;
+ // Causes a deadlock when running in JBossAS5
+ // TODO: can we get around the deadlock somehow?
+ //Runtime.getRuntime().addShutdownHook(cleanupHook) ;
}
/**
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -68,7 +68,7 @@
import org.jboss.soa.esb.util.ClassUtil;
import org.jboss.system.ServiceControllerMBean;
import org.jboss.system.server.ServerConfig;
-import org.jboss.system.server.ServerConfigLocator;
+import org.jboss.system.server.ServerConfigImplMBean;
import org.jboss.web.AbstractWebContainer;
import org.w3c.dom.Element;
@@ -85,7 +85,7 @@
private ServiceControllerMBean serviceController;
private Properties actionArtifactProperties;
- private final File esbWarFiles ;
+ private File esbWarFiles ;
private final Set<String> esbNames = new HashSet<String>() ;
private static final String PREFIX_CANONICAL_NAME = "jboss.esb:deployment=" ;
@@ -105,6 +105,8 @@
private final String WSADDR_CONTEXT_NAME = "WSAddressing Context Handler" ;
private final String WSADDR_CONTEXT_HANDLER = AddressingHandler.class.getName() ;
+
+ private String serverTmpDir;
/**
* Default CTOR used to set default values to the Suffixes and RelativeOrder
@@ -115,9 +117,6 @@
{
setSuffixes(new String[]{".esb"});
setRelativeOrder(1000); // before old EJB 2.1 deployer
- final ServerConfig config = ServerConfigLocator.locate();
- esbWarFiles = new File(config.getServerTempDeployDir(), "esbwarfiles") ;
- esbWarFiles.mkdirs() ;
}
public static boolean hasFile(DeploymentInfo di, String filePath)
@@ -168,6 +167,7 @@
*/
protected void startService() throws Exception
{
+ log.info("starting JBossESBDeployer service");
final InputStream actionArtifactIS = ClassUtil.getResourceAsStream("/actionArtifactMap.properties", getClass()) ;
if (actionArtifactIS == null)
{
@@ -187,6 +187,7 @@
mainDeployer.addDeployer(this);
LifecycleResourceManager.deactivateHook() ;
+ log.info("done starting JBossESBDeployer service");
}
@Override
@@ -209,6 +210,20 @@
public void init(DeploymentInfo di) throws DeploymentException
{
+ File tmpDir;
+ if (serverTmpDir != null)
+ {
+ tmpDir = new File(serverTmpDir);
+ }
+ else
+ {
+ final ServerConfig config = (ServerConfig) MBeanProxyExt.create(ServerConfig.class, ServerConfigImplMBean.OBJECT_NAME);
+ tmpDir = config.getServerTempDeployDir();
+
+ }
+ esbWarFiles = new File(tmpDir, "esbwarfiles") ;
+ esbWarFiles.mkdirs() ;
+
try
{
if (di.url.getProtocol().equalsIgnoreCase("file"))
@@ -709,4 +724,9 @@
}
return result ;
}
+
+ public void setServerTempDir(final String tmpDir)
+ {
+ this.serverTmpDir = tmpDir;
+ }
}
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployerMBean.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployerMBean.java 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployerMBean.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -31,4 +31,5 @@
*/
public interface JBoss4ESBDeployerMBean extends SubDeployerMBean
{
+ public void setServerTempDir(final String tmpDir);
}
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParser.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParser.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParser.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -0,0 +1,141 @@
+/*
+ * JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware
+ * LLC, and individual contributors by the @authors tag. See the copyright.txt
+ * in the distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+package org.jboss.soa.esb.listeners.deployers.mc;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.jboss.deployers.spi.deployer.DeploymentStages;
+import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployment.DeploymentException;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.virtual.VirtualFileFilter;
+
+/**
+ * EsbConfigParser is a Microcontainer deployer that picks up jboss-esb.xml files, parses the content
+ * and produces an {@link EsbMetaData} instance.
+ * <p/>
+ *
+ * Sample configuration:
+ * <pre>{@code
+ * <bean name="EsbConfigParser" class="org.jboss.soa.esb.listeners.deployers.mc.EsbConfigParser"/>
+ * }</pre>
+ *
+ * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
+ */
+public class EsbConfigParser extends AbstractVFSParsingDeployer<EsbMetaData>
+{
+ /**
+ * Logger.
+ */
+ private Logger log = Logger.getLogger(EsbConfigParser.class);
+
+ /**
+ * The default suffix of JBossESB configuration files that should be picked up.
+ */
+ private static final String ESB_FILE_SUFFIX = "-esb.xml";
+
+ /**
+ * The default suffix of JBossESB archives that should be accepted.
+ */
+ private static final String ESB_ARCHIVE_SUFFIX = ".esb";
+
+ /**
+ * No args constructor.
+ */
+ public EsbConfigParser()
+ {
+ super(EsbMetaData.class);
+ setSuffix(ESB_FILE_SUFFIX);
+ setJarExtension(ESB_ARCHIVE_SUFFIX);
+ setStage(DeploymentStages.PARSE);
+ }
+
+ @Override
+ protected EsbMetaData parse(final VFSDeploymentUnit deploymentUnit, final VirtualFile file, final EsbMetaData metadata) throws Exception
+ {
+ log.info("Parsing ESB configuration'" + file.getPathName() + "'");
+
+ final VirtualFile esbConfigFile = findEsbConfigFile(file);
+ return new EsbMetaData(esbConfigFile, file.getPathName());
+ }
+
+ /**
+ * Tries to rescursively find a file that ends with "-esb.xml".
+ *
+ * @param file The virtual file. Can point to a file or a directory which will be searched.
+ * @return VirtualFile VirtualFile representing a found configuration file.
+ * @throws DeploymentException If not configuration file could be found, or more than one was found.
+ */
+ private VirtualFile findEsbConfigFile(final VirtualFile file) throws DeploymentException
+ {
+ if (file.getName().endsWith(ESB_FILE_SUFFIX))
+ {
+ return file;
+ }
+
+ List<VirtualFile> esbConfigFiles;
+ try
+ {
+ esbConfigFiles = file.getChildrenRecursively(new EsbConfigFileFilter());
+ }
+ catch (final IOException e)
+ {
+ throw new DeploymentException(e.getMessage(), e);
+ }
+
+ final int esbConfigFilesFound = esbConfigFiles.size();
+
+ if (esbConfigFilesFound == 0)
+ {
+ throw new DeploymentException("No JBossESB configuration could be located the archive '" + file + "'");
+ }
+ else if (esbConfigFilesFound > 1)
+ {
+ throw new DeploymentException("Only one JBossESB configuration can exist in an archive. Please check '" + file + "'");
+ }
+ else
+ {
+ return esbConfigFiles.get(0);
+ }
+ }
+
+ /**
+ * Filter for filtering out ESB configuration files.
+ *
+ */
+ private static class EsbConfigFileFilter implements VirtualFileFilter
+ {
+ /**
+ * Accepts only files ending with the ESB_FILE_SUFFIX.
+ *
+ * @param file The file to filter.
+ * @return true If the file name ends with "-esb.xml".
+ */
+ public boolean accepts(final VirtualFile file)
+ {
+ return file.getName().endsWith(ESB_FILE_SUFFIX);
+ }
+ }
+
+}
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployer.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployer.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployer.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -0,0 +1,205 @@
+/*
+ * JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware
+ * LLC, and individual contributors by the @authors tag. See the copyright.txt
+ * in the distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+package org.jboss.soa.esb.listeners.deployers.mc;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+import org.apache.log4j.Logger;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployment.DeploymentException;
+import org.jboss.metadata.MetaData;
+import org.jboss.metadata.XmlFileLoader;
+import org.jboss.soa.esb.listeners.config.JBoss4ESBDeployment;
+import org.jboss.virtual.VirtualFile;
+import org.w3c.dom.Element;
+
+/**
+ * EsbRuntimeDeployer takes care of the deployment of an {@link BeanMetaData} instance.
+ * This deployer actually only creates a BeanMetaData object describing a {@link EsbDeployment}.
+ * The MicroContainer will take care of the actual creation and starting of the deployment
+ * using it's lifecycle callbacks.
+ * <p/>
+ *
+ * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
+ */
+public class EsbDeployer extends AbstractSimpleRealDeployer<EsbMetaData>
+{
+ /**
+ * Logger.
+ */
+ private Logger log = Logger.getLogger(EsbDeployer.class);
+
+ /**
+ * Prefix used for the BeanMetaData and for the managenment bean name.
+ */
+ private static final String BEAN_PREFIX = "jboss.esb";
+
+ /**
+ * No args constructor.
+ */
+ public EsbDeployer()
+ {
+ super(EsbMetaData.class);
+
+ // Tell the MicroContainer that we are producing BeanMetaData.
+ setOutput(BeanMetaData.class);
+ setRelativeOrder(1000);
+
+ log.info("Created EsbDeployer with a relative deployment order of " + getRelativeOrder());
+ }
+
+ /**
+ * Creates an {@link BeanMetaData} instance that describes the JBossESB
+ * deployment.
+ * The BeanMetaData is created using the information from the
+ * EsbMetaData object, such as the jboss-esb.xml and the archive name.
+ *
+ * The BeanMeatData is then attached to the Microcontainers deployment unit
+ * and will be picked up by the BeanMetaDataDeployer.
+ *
+ * @param deploymentUnit The deployment unit to deploy.
+ * @param esbMetaData The ESB MetaData that is associated with the deployment unit.
+ */
+ @Override
+ public final void deploy(final DeploymentUnit deploymentUnit, final EsbMetaData esbMetaData)
+ {
+ final BeanMetaData beanMetaData = createBeanMetaData(deploymentUnit, esbMetaData);
+ deploymentUnit.addAttachment(BeanMetaData.class, beanMetaData);
+
+ log.debug("Created beanMetaData : " + beanMetaData);
+ }
+
+ /**
+ * Creates a {@link BeanMetaData} that describes the {@link JBoss4ESBDeployment} class.
+ *
+ * @param deploymentUnit The deployment unit to deploy.
+ * @param esbMetaData The ESB MetaData that is associated with the deployment unit.
+ * @return BeanMetaData The {@link BeanMetaData} describing the EsbDeployment.
+ */
+ private BeanMetaData createBeanMetaData(final DeploymentUnit deploymentUnit, final EsbMetaData esbMetaData)
+ {
+ BeanMetaDataBuilder bmdBuilder = BeanMetaDataBuilder.createBuilder(BEAN_PREFIX + "." + deploymentUnit.getName(), EsbDeployment.class.getName());
+ // Setup the first constructor argument (esb config file).
+ bmdBuilder.addConstructorParameter(VirtualFile.class.getName(), esbMetaData.getEsbConfigXml());
+ // Setup the second constructor argument (esb archive name).
+ bmdBuilder.addConstructorParameter(String.class.getName(), esbMetaData.getArchiveName());
+ // Setup the third constructor argument (the name of the mbean).
+ final String mbeanName = BEAN_PREFIX + ":deployment=" + deploymentUnit.getSimpleName();
+ bmdBuilder.addConstructorParameter(String.class.getName(), mbeanName);
+ // Add management annotation.
+ bmdBuilder.addAnnotation("@org.jboss.aop.microcontainer.aspects.jmx.JMX(registerDirectly=true, exposedInterface=void.class, name=\"" + mbeanName + "\")");
+
+ // Add dependencies to the Registry and Juddi
+ bmdBuilder.addDependency("jboss.esb:service=ESBRegistry");
+ bmdBuilder.addDependency("jboss.esb:service=JuddiRMI");
+
+ // Find dependencies specified in deployment.xml
+ InputStream in = deploymentUnit.getClassLoader().getResourceAsStream("META-INF/deployment.xml");
+ if (in != null)
+ {
+ try
+ {
+ XmlFileLoader xfl = new XmlFileLoader();
+ Element jboss = xfl.getDocument(in, "META-INF/deployment.xml").getDocumentElement();
+ // Check for a ejb level class loading config
+ Iterator depends = MetaData.getChildrenByTagName(jboss, "depends");
+ if (depends != null)
+ {
+ while (depends.hasNext())
+ {
+ Element depend = (Element) depends.next();
+ ObjectName depOn = new ObjectName(MetaData.getElementContent(depend));
+ bmdBuilder.addDependency(depOn.getCanonicalName());
+ }
+ }
+ // TODO: Refactor and add the rest from jboss4.x deployment. Extract the code
+ /*
+ Iterator esbDepends = MetaData.getChildrenByTagName(jboss, "esb-depends");
+ if ((esbDepends != null) && esbDepends.hasNext())
+ {
+ final Map<String, DeploymentInfo> subDeploymentLocationMap;
+ if (di.subDeployments.size() > 0)
+ {
+ subDeploymentLocationMap = new HashMap<String, DeploymentInfo>();
+ final Set<DeploymentInfo> subDeployments = (Set<DeploymentInfo>) di.subDeployments;
+ for (DeploymentInfo subDI : subDeployments)
+ {
+ final String urlPath = subDI.url.getPath();
+ final String deployablePath = (urlPath.endsWith("/") ? urlPath.substring(0, urlPath.length() - 1) : urlPath);
+ final int lastSeparator = deployablePath.lastIndexOf('/');
+ final String deployable = (lastSeparator >= 0 ? deployablePath.substring(lastSeparator + 1) : deployablePath);
+ if (subDeploymentLocationMap.put(deployable, subDI) != null)
+ {
+ throw new DeploymentException("Duplicate subDeployment name: " + deployable);
+ }
+ }
+ } else
+ {
+ throw new DeploymentException("No subdeployments to match esb-depends");
+ }
+
+ do
+ {
+ Element depend = (Element) esbDepends.next();
+ final String deployable = MetaData.getElementContent(depend);
+ final DeploymentInfo subDI = subDeploymentLocationMap.get(deployable);
+ if ((subDI != null) && subDI.context.containsKey(AbstractWebContainer.WEB_MODULE))
+ {
+ final ObjectName jmxName = (ObjectName) subDI.context.get(AbstractWebContainer.WEB_MODULE);
+ bmdBuilder.addDependency(jmxName);
+ } else
+ {
+ throw new DeploymentException("Could not locate WAR subdeployment matching: " + deployable);
+ }
+ } while (esbDepends.hasNext());
+ }
+ */
+ }
+ catch (final DeploymentException e)
+ {
+ e.printStackTrace();
+ }
+ catch (final MalformedObjectNameException e)
+ {
+ e.printStackTrace();
+ }
+ catch (final NullPointerException e)
+ {
+ e.printStackTrace();
+ }
+ finally
+ {
+ try { in.close(); } catch (IOException ignore) { }
+ }
+ }
+
+ return bmdBuilder.getBeanMetaData();
+ }
+
+}
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployment.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployment.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployment.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -0,0 +1,149 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.soa.esb.listeners.deployers.mc;
+
+import java.io.InputStream;
+import java.util.List;
+
+import javax.management.ObjectName;
+
+import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.publish.ContractReferencePublisher;
+import org.jboss.internal.soa.esb.util.StreamUtils;
+import org.jboss.soa.esb.lifecycle.LifecycleResourceManager;
+import org.jboss.soa.esb.listeners.config.Configuration;
+import org.jboss.soa.esb.listeners.config.ServicePublisher;
+import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleController;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * EsbDeployment for Microcontainer.
+ * <p/>
+ *
+ * Microcontainer will call the lifecycle methods:
+ * <lu>
+ * <li><i>create</i> will create the ESB deployment.</i>
+ * <li><i>start</i> will start the ESB deployment.</i>
+ * <li><i>stop</i> will stop the ESB deployment.</i>
+ * <li><i>destroy</i> will destroy the ESB deployment.</i>
+ * </lu>
+ *
+ * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
+ */
+public class EsbDeployment implements EsbDeploymentMBean
+{
+ private Logger log = Logger.getLogger(EsbDeployment.class);
+
+ private final VirtualFile jbossEsbConfig;
+ private final String jbossEsbXml;
+ private String deploymentName;
+ private List<ContractReferencePublisher> publishers;
+ private ManagedLifecycleController controller;
+ private final String mbeanName;
+
+ public EsbDeployment(final VirtualFile config, final String deploymentName, final String mbeanName) throws Exception
+ {
+ this.jbossEsbConfig = config;
+ this.deploymentName = deploymentName;
+ this.mbeanName = mbeanName;
+ this.jbossEsbXml = readEsbConfig(config);
+ }
+
+ private String readEsbConfig(final VirtualFile config) throws Exception
+ {
+ InputStream in = jbossEsbConfig.openStream();
+ try
+ {
+ return StreamUtils.readStreamString(in, "UTF-8");
+ }
+ finally
+ {
+ jbossEsbConfig.closeStreams();
+ }
+ }
+
+ public String getJbossEsbXml()
+ {
+ return jbossEsbXml;
+ }
+
+ public String getJbossEsbXmlAsHtml()
+ {
+ return jbossEsbXml.replace("<", "<").replace(">", ">");
+ }
+
+ public void setPublishers(final List<ContractReferencePublisher> publishers)
+ {
+ this.publishers = publishers;
+ }
+
+ public ManagedLifecycleController getController()
+ {
+ return controller;
+ }
+
+ public String getDeploymentName()
+ {
+ return deploymentName;
+ }
+
+ public void setDeploymentName(final String deploymentName)
+ {
+ this.deploymentName = deploymentName;
+ }
+
+ public List<ContractReferencePublisher> getPublishers()
+ {
+ return publishers;
+ }
+
+ public void create()
+ {
+ log.info("Creating ESB Deployment Service.");
+ LifecycleResourceManager.getSingleton().associateDeployment(deploymentName);
+ }
+
+ public void start() throws Exception
+ {
+ log.info("Starting EBS Deployment Service.");
+ if (controller == null)
+ {
+ controller = Configuration.create(jbossEsbXml, new ObjectName(mbeanName), publishers);
+ controller.start();
+ }
+ }
+
+ public void stop() throws Exception
+ {
+ log.info("Stopping ESB Deployment Service.");
+ ServicePublisher.removeServicePublishers(controller);
+ controller.stop();
+ log.info("Stopped ESB Deployment Service.");
+ }
+
+ public void destroy() throws Exception
+ {
+ log.info("Destroying ESB Deployment Service.");
+ LifecycleResourceManager.getSingleton().disassociateDeployment(deploymentName);
+ LifecycleResourceManager.getSingleton().destroyResources();
+ }
+}
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeploymentMBean.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeploymentMBean.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeploymentMBean.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware
+ * LLC, and individual contributors by the @authors tag. See the copyright.txt
+ * in the distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+package org.jboss.soa.esb.listeners.deployers.mc;
+
+/**
+ * Interface for exposing JMX operations.
+ *
+ * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
+ */
+public interface EsbDeploymentMBean
+{
+ /**
+ * Start a deployment.
+ *
+ * @throws Exception If an exception occurs while starting.
+ */
+ void start() throws Exception;
+
+ /**
+ * Stop a deployment.
+ *
+ * @throws Exception If an exeption occurs while stoping.
+ */
+ void stop() throws Exception;
+
+ /**
+ * Gets the jboss-esb.xml configuration.
+ *
+ * @return String The jboss-esb.xml files content.
+ */
+ String getJbossEsbXml();
+
+ /**
+ * Gets the jboss-esb.xml configuration as html.
+ *
+ * @return String The jboss-esb.xml files content as html.
+ */
+ String getJbossEsbXmlAsHtml();
+}
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbExtensionProvider.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbExtensionProvider.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbExtensionProvider.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware
+ * LLC, and individual contributors by the @authors tag. See the copyright.txt
+ * in the distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+package org.jboss.soa.esb.listeners.deployers.mc;
+
+import org.jboss.deployers.spi.deployer.matchers.JarExtensionProvider;
+
+/**
+ * Simply adds the '.esb' extension.
+ *
+ * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
+ *
+ */
+public class EsbExtensionProvider implements JarExtensionProvider
+{
+ /**
+ * Returns '.esb'.
+ *
+ * @return String The '.esb' extension.
+ */
+ public final String getJarExtension()
+ {
+ return ".esb";
+ }
+
+}
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbMetaData.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbMetaData.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbMetaData.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -0,0 +1,86 @@
+/*
+ * JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware
+ * LLC, and individual contributors by the @authors tag. See the copyright.txt
+ * in the distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+package org.jboss.soa.esb.listeners.deployers.mc;
+
+import java.io.Serializable;
+
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * Metadata for an ESB deployment.
+ * <p/>
+ * This metadata is intended to be created by a Deployment Parser. A deployment
+ * parser could read an xml configuration file, or it could gather the same
+ * information in some other way, perhaps using annotations on class files, another
+ * language, etc.
+ *
+ * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
+ */
+public class EsbMetaData implements Serializable
+{
+ /** Serial version unique identifier. */
+ private static final long serialVersionUID = 0L;
+
+ /** The name of the .esb archive. */
+ private String archiveName;
+
+ /** The jboss-esb.xml configuration. */
+ private final VirtualFile esbConfigXml;
+
+ /**
+ * Creates a EsbMetaData with the jboss-esb.xml as a VirtualFile and
+ * the name of the .esb archive.
+ *
+ * @param deploymentUnit The ESB {@link DeploymentUnit}.
+ * @param archiveName The name of the .esb archive.
+ */
+ public EsbMetaData(final VirtualFile esbConfigXml, final String archiveName)
+ {
+ this.esbConfigXml = esbConfigXml;
+ this.archiveName = archiveName;
+ }
+
+ /**
+ * Gets the name of the archive that this metadata came from.
+ *
+ * @return String The name of the archive that this metadata came from.
+ */
+ public final String getArchiveName()
+ {
+ return archiveName;
+ }
+
+ public VirtualFile getEsbConfigXml()
+ {
+ return esbConfigXml;
+ }
+
+ /**
+ * toString.
+ *
+ * @return String String representation of this metadata.
+ */
+ @Override
+ public final String toString()
+ {
+ return String.format("EsbMetaData [esbConfigXml='%s, archiveName='%s']", esbConfigXml, archiveName);
+ }
+}
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbStructure.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbStructure.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbStructure.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware
+ * LLC, and individual contributors by the @authors tag. See the copyright.txt
+ * in the distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+package org.jboss.soa.esb.listeners.deployers.mc;
+
+import java.util.HashSet;
+
+import org.apache.log4j.Logger;
+import org.jboss.deployers.vfs.plugins.structure.jar.JARStructure;
+
+/**
+ * A StructureDeployer that can identify .esb archives.
+ *
+ * A StructureDeployer is a deployer that runs prior to normal deployers.
+ *
+ * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
+ *
+ */
+public class EsbStructure extends JARStructure
+{
+ /**
+ * Logger.
+ */
+ private Logger log = Logger.getLogger(EsbStructure.class);
+
+ /**
+ * Suffix used to identify a esb archive(file or directory).
+ */
+ private static final String ESB_JAR_SUFFIX = ".esb";
+
+ /**
+ * The suffixes that this structure handles.
+ */
+ private HashSet<String> suffixes;
+
+ /**
+ *
+ */
+ public EsbStructure()
+ {
+ setRelativeOrder(1000);
+ suffixes = new HashSet<String>();
+ suffixes.add(ESB_JAR_SUFFIX);
+ setSuffixes(suffixes);
+ addJarExtension(null);
+ log.info(this);
+ }
+
+ /**
+ * Returns a string representation of this instance.
+ * @return String The string representation of this instance.
+ *
+ */
+ @Override
+ public final String toString()
+ {
+ return "EsbStructure [suffixes='" + suffixes + "']";
+ }
+
+
+}
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/jca/JBoss42ActivationBridge.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/jca/JBoss42ActivationBridge.java 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/jca/JBoss42ActivationBridge.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -21,6 +21,9 @@
*/
package org.jboss.soa.esb.listeners.jca;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
@@ -35,6 +38,7 @@
import org.jboss.metadata.ActivationConfigPropertyMetaData;
import org.jboss.mx.util.JMXExceptionDecoder;
import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.soa.esb.util.ClassUtil;
/**
* interfaces with JCA to activate an endpoint
@@ -111,7 +115,8 @@
for (String key : activationProperties.keySet())
{
String value = activationProperties.get(key);
- metaData.add(new ActivationConfigPropertyMetaData(key, value));
+ metaData.add(createActivationConfigPropertyMetaData(key, value));
+ //metaData.add(new ActivationConfigPropertyMetaData(key, value));
}
Object[] params = new Object[]
@@ -141,9 +146,56 @@
throw new RuntimeException("Endpoint activation failed ra=" + resourceAdapterObjectName +
" activationSpec=" + activationSpec, t);
}
-
-
}
+
+ private ActivationConfigPropertyMetaData createActivationConfigPropertyMetaData(final String key, final String value)
+ {
+ try
+ {
+ Class<?> c = ClassUtil.forName("org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData" , getClass());
+ Object instance = c.newInstance();
+ // Call setActivationConfigPropertyName with the key.
+ Method setName = c.getMethod("setActivationConfigPropertyName", new Class[] { String.class});
+ setName.invoke(instance, key);
+ // Call setValue with the value.
+ Method setValue = c.getMethod("setValue", String.class);
+ setValue.invoke(instance, value);
+
+ // Now create the AS 5 version of ActivationConfigPropertyMetaData.
+ Class<?> returnClass = ClassUtil.forName("org.jboss.metadata.ActivationConfigPropertyMetaData" , getClass());
+ // Call the constructor using the above created instance as the argument.
+ Constructor<?> constructor = returnClass.getConstructor(c);
+ return (ActivationConfigPropertyMetaData) constructor.newInstance(instance);
+ }
+ catch (final ClassNotFoundException e)
+ {
+ return new ActivationConfigPropertyMetaData(key, value);
+ }
+ catch (final InstantiationException e)
+ {
+ throw new RuntimeException("Could not instantiate an instance of org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData", e);
+ }
+ catch (final IllegalAccessException e)
+ {
+ throw new RuntimeException("IllegalAccessException while trying to create an instance of org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData", e);
+ }
+ catch (SecurityException e)
+ {
+ throw new RuntimeException(e.getMessage(), e);
+ }
+ catch (NoSuchMethodException e)
+ {
+ throw new RuntimeException(e.getMessage(), e);
+ }
+ catch (IllegalArgumentException e)
+ {
+ throw new RuntimeException(e.getMessage(), e);
+ }
+ catch (InvocationTargetException e)
+ {
+ throw new RuntimeException(e.getMessage(), e);
+ }
+ }
/**
* Deactivate
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/ManagedLifecycleController.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/ManagedLifecycleController.java 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/ManagedLifecycleController.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -23,6 +23,8 @@
import java.util.Collection;
+import org.apache.log4j.Logger;
+
/**
* Controller class to manage the lifecycles of a set of managed instances.
*
@@ -30,6 +32,8 @@
*/
public class ManagedLifecycleController
{
+ private Logger log = Logger.getLogger(ManagedLifecycleController.class);
+
/**
* The managed lifecycle instances.
*/
@@ -214,6 +218,7 @@
}
catch (final ManagedLifecycleException mle)
{
+ log.error(mle.getMessage(), mle);
} // Ignore exception
}
}
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -292,7 +292,7 @@
Message message = null ;
boolean problem = false;
- PickUpOnlyCourier pickUpCourier = null ;
+ PickUpOnlyCourier pickUpCourier = null ;
try
{
transactionStrategy.begin();
@@ -311,16 +311,14 @@
return;
}
- catch (MalformedEPRException e)
- {
- problem = true;
-
- return;
- }
+ catch (MalformedEPRException e)
+ {
+ problem = true;
+ return;
+ }
catch (CourierTimeoutException e)
{
problem = true;
-
return;
}
catch (FaultMessageException fme)
@@ -329,20 +327,19 @@
}
catch (CourierException e)
{
- _logger.debug("Courier Exception", e);
- if (errorDelay == 0)
- {
- errorDelay = MIN_ERROR_DELAY ;
- }
- else if (errorDelay < MAX_ERROR_DELAY)
- {
- errorDelay <<= 1 ;
- }
- _logger.warn("Error processing courier, backing off for " + errorDelay + " milliseconds") ;
- waitForRunningStateChange(ManagedLifecycleThreadState.STOPPING, errorDelay) ;
-
+ _logger.debug("Courier Exception", e);
+ if (errorDelay == 0)
+ {
+ errorDelay = MIN_ERROR_DELAY ;
+ }
+ else if (errorDelay < MAX_ERROR_DELAY)
+ {
+ errorDelay <<= 1 ;
+ }
+ _logger.warn("Error processing courier, backing off for " + errorDelay + " milliseconds") ;
+ boolean waitForRunningStateChange = waitForRunningStateChange(ManagedLifecycleThreadState.STOPPING, errorDelay) ;
+ _logger.info("State reached : " + waitForRunningStateChange);
problem = true;
-
return;
}
finally
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/build.xml 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/build.xml 2009-03-20 15:23:58 UTC (rev 25766)
@@ -29,6 +29,7 @@
<!-- added these first two jar explicetly to get the security features working -->
<fileset dir="${org.jboss.esb.lib.dir}" includes="jaxr-api*.jar"/>
<fileset dir="${org.jboss.esb.lib.dir}" includes="jbossall-client-*.jar"/>
+ <fileset dir="${org.jboss.esb.lib.dir}" includes="jbossxb-2.0.0.GA.jar"/>
<fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
<fileset dir="${org.jboss.esb.lib.dir}" includes="*.jar"/>
<fileset dir="${org.jboss.esb.root.dir}/../testlib" includes="*.jar"/>
@@ -119,9 +120,14 @@
<fileset dir="${org.jboss.esb.module.tests.src.dir}" includes="**/*.xml" />
</copy>
<copy file="${org.jboss.esb.root.dir}/etc/schemas/xml/jbossesb-1.0.1.xsd" todir="${org.jboss.esb.tests.classes.dir}"/>
-
+ <copy todir="${org.jboss.esb.tests.classes.dir}" >
+ <fileset dir="${org.jboss.esb.module.tests.src.dir}" includes="/org/jboss/soa/esb/listeners/deployers/mc/test_esb_archives"/>
+ </copy>
+ <copy file="${org.jboss.esb.module.tests.src.dir}/org/jboss/soa/esb/listeners/deployers/mc/test_esb_archives/esb-archive.esb"
+ todir="${org.jboss.esb.tests.classes.dir}/org/jboss/soa/esb/listeners/deployers/mc/test_esb_archives/esb-archive.esb"/>
+
<junit printsummary="yes" haltonerror="${org.jboss.esb.build.haltonerror}" haltonfailure="${org.jboss.esb.build.haltonfailure}" showoutput="no" fork="true">
<formatter type="plain" usefile="false"/>
<formatter type="xml"/>
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParserUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParserUnitTest.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParserUnitTest.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware
+ * LLC, and individual contributors by the @authors tag. See the copyright.txt
+ * in the distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+package org.jboss.soa.esb.listeners.deployers.mc;
+
+import java.net.URL;
+
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployment.DeploymentException;
+import org.jboss.test.kernel.junit.MicrocontainerTest;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * Unit tests for {@link EsbConfigParser}.
+ * <p/>
+ *
+ * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
+ *
+ */
+public class EsbConfigParserUnitTest extends MicrocontainerTest
+{
+ private URL dir = getClass().getResource("/org/jboss/soa/esb/listeners/deployers/mc/test_esb_archives");
+
+ private EsbConfigParser parserDeployer = new EsbConfigParser();
+
+ public EsbConfigParserUnitTest(String name)
+ {
+ super(name);
+ }
+
+ public void testEsbArchive() throws Throwable
+ {
+ assertDeployed(dir, "esb-archive.esb");
+ }
+
+ public void testExplodedEsbArchive() throws Throwable
+ {
+ assertDeployed(dir, "exploded-esb-archive.esb");
+ }
+
+ private EsbMetaData assertDeployed(final URL dir, final String archiveName) throws Exception, DeploymentException
+ {
+ VirtualFile virtualFile = TestUtil.getVirtualFile(dir, archiveName, this.getClass());
+ VFSDeploymentUnit deploymentUnit = TestUtil.getDeploymentUnit(virtualFile);
+ EsbMetaData esbMetaData = parserDeployer.parse(deploymentUnit, virtualFile, (EsbMetaData)null);
+
+ assertEquals(virtualFile.getName(), esbMetaData.getArchiveName());
+ return esbMetaData;
+ }
+
+}
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParserUnitTest.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParserUnitTest.xml (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParserUnitTest.xml 2009-03-20 15:23:58 UTC (rev 25766)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="EsbConfigParser" class="org.jboss.soa.esb.listeners.deployers.mc.EsbConfigParser"/>
+
+ <bean name="EsbExtensionProvider" class="org.jboss.soa.esb.listeners.deployers.mc.EsbExtensionProvider"/>
+
+ <bean name="EsbStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
+ <incallback method="addJarExtension">
+ <parameter><inject bean="EsbExtensionProvider"/></parameter>
+ </incallback>
+ </bean>
+
+ <!-- bean name="EsbDeployer" class="org.jboss.soa.esb.listeners.deployers.mc.EsbDeployer"/-->
+
+ <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
+ <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
+ <property name="deployers"><inject bean="Deployers"/></property>
+ </bean>
+
+ <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
+ <property name="structureBuilder">
+ <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder"/>
+ </property>
+ <incallback method="addDeployer"/>
+ <uncallback method="removeDeployer"/>
+ </bean>
+
+ <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl">
+ <constructor><parameter><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
+ <incallback method="addDeployer"/>
+ <uncallback method="removeDeployer"/>
+ </bean>
+
+
+</deployment>
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/TestUtil.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/TestUtil.java (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/TestUtil.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -0,0 +1,227 @@
+/*
+ * JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware
+ * LLC, and individual contributors by the @authors tag. See the copyright.txt
+ * in the distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+package org.jboss.soa.esb.listeners.deployers.mc;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.List;
+
+import org.jboss.deployers.vfs.plugins.structure.AbstractVFSDeploymentUnit;
+import org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl;
+import org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder;
+import org.jboss.deployers.vfs.plugins.structure.jar.JARStructure;
+import org.jboss.deployers.vfs.spi.client.VFSDeployment;
+import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
+import org.jboss.deployers.vfs.spi.structure.StructureDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentContext;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.virtual.VFS;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.virtual.spi.VFSContext;
+import org.jboss.virtual.spi.VirtualFileHandler;
+
+/**
+ * Util methods used with Microcontainer tests.
+ * </p>
+ *
+ * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
+ */
+public class TestUtil
+{
+ private TestUtil()
+ {
+ }
+
+ public static VFSDeploymentUnit getDeploymentUnit(final VirtualFile esbArchive) throws Exception
+ {
+ VFSDeploymentContext deploymentContext = getDeploymentContext(esbArchive);
+ deploymentContext.setClassLoader(TestUtil.class.getClassLoader());
+ return getDeploymentUnit(deploymentContext);
+ }
+
+ public static VFSDeploymentUnit getDeploymentUnit(final VFSDeploymentContext deploymentContext)
+ {
+ return new AbstractVFSDeploymentUnit(deploymentContext);
+ }
+
+ public static VFSDeploymentContext getDeploymentContext(final VirtualFile esbArchive) throws Exception
+ {
+ VFSDeployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(esbArchive);
+ VFSStructuralDeployersImpl structuralDeployers = new VFSStructuralDeployersImpl();
+ VFSStructureBuilder builder = new VFSStructureBuilder();
+ structuralDeployers.setStructureBuilder(builder);
+ StructureDeployer[] deployers = new StructureDeployer[]{new JARStructure()};
+ for (StructureDeployer deployer : deployers)
+ {
+ structuralDeployers.addDeployer(deployer);
+ }
+ return (VFSDeploymentContext) structuralDeployers.determineStructure(deployment);
+ }
+
+ public static VirtualFile getVirtualFile(final URL directoryURL, final String fileName, final Class<?> clazz) throws Exception
+ {
+ return VFS.getVirtualFile(directoryURL, fileName);
+ }
+
+
+ public static VirtualFile getMockVF(final File esbFile)
+ {
+ VirtualFile file = new VirtualFile(new VirtualFileHandler()
+ {
+ private static final long serialVersionUID = 1L;
+
+ public void close()
+ {
+ }
+
+ public boolean exists() throws IOException
+ {
+ return false;
+ }
+
+ public VirtualFileHandler getChild(String arg0) throws IOException
+ {
+ return null;
+ }
+
+ public List<VirtualFileHandler> getChildren(boolean arg0) throws IOException
+ {
+ return null;
+ }
+
+ public long getLastModified() throws IOException
+ {
+ return 0;
+ }
+
+ public String getName()
+ {
+ return esbFile.getName();
+ }
+
+ public VirtualFileHandler getParent() throws IOException
+ {
+ return null;
+ }
+
+ public String getPathName()
+ {
+ return esbFile.getAbsolutePath();
+ }
+
+ public long getSize() throws IOException
+ {
+ return 0;
+ }
+
+ public VFSContext getVFSContext()
+ {
+ return null;
+ }
+
+ public VirtualFile getVirtualFile()
+ {
+ return null;
+ }
+
+ public boolean hasBeenModified() throws IOException
+ {
+ return false;
+ }
+
+ public boolean isHidden() throws IOException
+ {
+ return false;
+ }
+
+ public boolean isLeaf() throws IOException
+ {
+ return false;
+ }
+
+ public String getLocalPathName()
+ {
+ return null;
+ }
+
+ public boolean isNested() throws IOException
+ {
+ return false;
+ }
+
+ public InputStream openStream() throws IOException
+ {
+ return null;
+ }
+
+ public URI toURI() throws URISyntaxException
+ {
+ return null;
+ }
+
+ public URL toURL() throws MalformedURLException, URISyntaxException
+ {
+ return null;
+ }
+
+ public URL toVfsUrl() throws MalformedURLException, URISyntaxException
+ {
+ return null;
+ }
+
+ public void replaceChild(VirtualFileHandler original, VirtualFileHandler replacement)
+ {
+ }
+
+ public boolean removeChild(String name) throws IOException
+ {
+ return false;
+ }
+
+ public boolean delete(int gracePeriod) throws IOException
+ {
+ return false;
+ }
+
+ public void cleanup()
+ {
+ }
+
+ public URL getRealURL() throws IOException, URISyntaxException
+ {
+
+ return null;
+ }
+
+ public boolean isArchive() throws IOException
+ {
+
+ return false;
+ }
+ });
+ return file;
+ }
+}
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/test_esb_archives/esb-archive.esb
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/test_esb_archives/esb-archive.esb
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/test_esb_archives/exploded-esb-archive.esb/META-INF/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/test_esb_archives/exploded-esb-archive.esb/META-INF/jboss-esb.xml (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/test_esb_archives/exploded-esb-archive.esb/META-INF/jboss-esb.xml 2009-03-20 15:23:58 UTC (rev 25766)
@@ -0,0 +1,10 @@
+<jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
+
+ <resources>
+ <resource id="schedule1" class="org.jboss.esb.schedule.SimpleSchedule">
+ <property name="frequency">100</property>
+ <property name="execCount">1</property>
+ </resource>
+ </resources>
+
+</jbossesb>
\ No newline at end of file
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/conf/base-build.xml 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/conf/base-build.xml 2009-03-20 15:23:58 UTC (rev 25766)
@@ -72,11 +72,12 @@
message="JBossESB must be built. Please run 'ant dist' in ${product.dir}"/>
</target>
+
<!-- ==================================================================== -->
<!-- This section handles the discovery of the messaging platform. -->
<!-- ==================================================================== -->
- <target name="messaging-config" depends="jbossesb-dependencies">
+ <target name="messaging-config" depends="jbossesb-dependencies-as4, jbossesb-dependencies-as5">
<condition property="messaging.present">
<available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/>
</condition>
@@ -126,10 +127,26 @@
<!-- org.jboss.esb.server.server and deployment-classpath -->
<!-- ==================================================================== -->
+ <target name="check-as-version">
+ <property name="org.jboss.esb.server.server" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
+ <echo message="${org.jboss.esb.server.server}"/>
+ <!-- Check for JBossAS5 -->
+ <condition property="jbossas5">
+ <available file="${org.jboss.esb.server.server}/deployers"/>
+ </condition>
+
+ <!-- Check for JBossAS4.x -->
+ <condition property="jbossas4">
+ <not>
+ <available file="${org.jboss.esb.server.server}/deployers"/>
+ </not>
+ </condition>
+ </target>
+
<!-- Configure dependencies for jbossesb and source distributions -->
- <target name="jbossesb-dependencies" depends="check-jbossesb-dist, qslib-dependencies, non-qslib-dependencies, jbossesb-source-dependencies, jbossesb-server-dependencies">
+ <target name="jbossesb-dependencies-as4" if="jbossas4" depends="check-jbossesb-dist, qslib-dependencies, non-qslib-dependencies, jbossesb-source-dependencies, jbossesb-server-dependencies, check-as-version">
<property name="org.jboss.esb.server.server" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
- <property name="org.jboss.esb.server.deploy.dir" location="${org.jboss.esb.server.server}/deploy"/>
+ <property name="org.jboss.esb.server.deploy.dir" location="${org.jboss.esb.server.server}/deploy"/>
<path id="deployment-classpath">
<fileset dir="${org.jboss.esb.server.deploy.dir}/jbossesb.sar/lib" includes="*.jar"/>
@@ -177,6 +194,72 @@
</path>
</target>
+ <!-- Configure dependencies for jbossesb and source distributions -->
+ <target name="jbossesb-dependencies-as5" if="jbossas5" depends="check-jbossesb-dist, qslib-dependencies, non-qslib-dependencies, jbossesb-source-dependencies, jbossesb-server-dependencies, check-as-version">
+
+ <property name="org.jboss.esb.server.server" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
+ <property name="org.jboss.esb.server.deploy.dir" location="${org.jboss.esb.server.server}/deploy"/>
+ <property name="org.jboss.esb.server.common.lib" location="${org.jboss.esb.server.home}/common/lib"/>
+
+ <path id="deployment-classpath">
+ <fileset dir="${org.jboss.esb.server.server}/deployers/esb.deployer" includes="*.jar"/>
+ <!-- jbossesb config -->
+ <fileset dir="${org.jboss.esb.server.deploy.dir}/jbossesb.esb" includes="*.jar"/>
+ <pathelement location="${org.jboss.esb.server.deploy.dir}/jbossesb.esb"/>
+ <!-- jbpm config -->
+ <fileset dir="${org.jboss.esb.server.deploy.dir}/jbpm.esb" includes="*.jar"/>
+ <pathelement location="${org.jboss.esb.server.deploy.dir}/jbpm.esb"/>
+
+ <pathelement location="${org.jboss.esb.server.home}/lib/cglib.jar"/>
+ <pathelement location="${org.jboss.esb.server.home}/lib/dom4j.jar"/>
+ <pathelement location="${org.jboss.esb.server.common.lib}/antlr.jar"/>
+ <!-- smooks config -->
+ <fileset dir="${org.jboss.esb.server.deploy.dir}/smooks.esb" includes="*.jar"/>
+ <pathelement location="${org.jboss.esb.server.deploy.dir}/smooks.esb"/>
+ <!-- jbrules config -->
+ <fileset dir="${org.jboss.esb.server.deploy.dir}/jbrules.esb" includes="*.jar"/>
+ <pathelement location="${org.jboss.esb.server.deploy.dir}/jbrules.esb"/>
+ <!-- spring config -->
+ <fileset dir="${org.jboss.esb.server.deploy.dir}/spring.esb" includes="*.jar"/>
+ <pathelement location="${org.jboss.esb.server.deploy.dir}/spring.esb"/>
+ <!-- soap config -->
+ <fileset dir="${org.jboss.esb.server.deploy.dir}/soap.esb" includes="*.jar"/>
+ <pathelement location="${org.jboss.esb.server.deploy.dir}/soap.esb"/>
+
+ <fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="activation.jar"/>
+ <fileset dir="${org.jboss.esb.server.common.lib}" includes="mail.jar, jboss-ejb3x.jar"/>
+
+ <!-- general libs -->
+ <pathelement location="${org.jboss.esb.server.common.lib}/commons-logging.jar"/>
+ <pathelement location="${org.jboss.esb.server.common.lib}/commons-codec.jar"/>
+ <pathelement location="${org.jboss.esb.server.common.lib}jbossts-common.jar"/>
+ <pathelement location="${org.jboss.esb.server.common.lib}/quartz.jar"/>
+
+ <pathelement location="${org.jboss.esb.server.home}/lib/jboss-system.jar"/>
+ <pathelement location="${org.jboss.esb.server.home}/lib/jboss-xml-binding.jar"/>
+
+ <!-- includes for read only cache -->
+ <fileset dir="${org.jboss.esb.server.server}/lib" includes="jbosscache-*.jar"/>
+ <pathelement location="${org.jboss.esb.server.server}/lib/jgroups.jar"/>
+
+ <!-- includes for h2 -->
+ <fileset dir="${org.jboss.esb.server.server}/lib" includes="h2*.jar"/>
+
+ <fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="xalan.jar"/>
+
+ <!-- common client jars -->
+ <fileset dir="${org.jboss.esb.server.home}/client" includes="jaxb-api.jar jaxb-impl.jar jaxb-xjc.jar"/>
+ <fileset dir="${org.jboss.esb.server.home}/client" includes="jaxws-rt.jar jaxws-tools.jar"/>
+ <fileset dir="${org.jboss.esb.server.home}/client" includes="jbossall-client.jar"/>
+
+ <!-- common lib jars -->
+ <fileset dir="${org.jboss.esb.server.common.lib}" includes="commons-httpclient.jar"/>
+ <fileset dir="${org.jboss.esb.server.common.lib}" includes="jboss-jaxws.jar jboss-saaj.jar jbossws-common.jar jbossws-spi.jar"/>
+ <fileset dir="${org.jboss.esb.server.common.lib}" includes="jbossws-*.jar"/>
+ </path>
+ </target>
+
+
<target name="jbossesb-quickstart-override">
<condition
property="org.jboss.esb.server.config"
@@ -267,7 +350,7 @@
<!-- compile-classpath, exec-classpath -->
<!-- ==================================================================== -->
- <target name="dependencies" depends="classpath-dependencies, quickstart-specific-checks">
+ <target name="dependencies" depends="classpath-dependencies-as4, classpath-dependencies-as5, quickstart-specific-checks">
<!-- jBPM Console properties -->
<condition property="jbpm.production.properties.set" value="true" else="false">
@@ -301,7 +384,7 @@
<!-- End jBPM Console properties -->
</target>
- <target name="classpath-dependencies" depends="messaging-dependencies, jbossmq-dependencies, quickstart-specific-dependencies">
+ <target name="classpath-dependencies-as4" if="jbossas4" depends="messaging-dependencies, jbossmq-dependencies, quickstart-specific-dependencies">
<path id="compile-classpath">
<path refid="quickstart-dependencies-classpath" />
@@ -327,7 +410,35 @@
</path>
<property name="exec-classpath" refid="exec-classpath"/>
</target>
+
+ <target name="classpath-dependencies-as5" if="jbossas5" depends="messaging-dependencies, jbossmq-dependencies, quickstart-specific-dependencies">
+
+ <path id="compile-classpath">
+ <path refid="quickstart-dependencies-classpath" />
+ <path refid="quickstart-lib-classpath" />
+ <fileset dir="${org.jboss.esb.server.home}/common/lib" includes="hibernate-*.jar" /> <!-- Required for jbpm Client Code. -->
+ <fileset dir="${org.jboss.esb.server.home}/common/lib" includes="quartz.jar"/> <!-- Required for the helloworld_hibernate_action quickstart -->
+ <path refid="deployment-classpath" />
+ <fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. -->
+ </path>
+ <property name="compile-classpath" refid="compile-classpath"/>
+ <path id="exec-classpath">
+ <pathelement location="." />
+ <pathelement location="${classes}" />
+ <pathelement location="${basedir}/src" />
+ <fileset dir="${org.jboss.esb.server.home}/common/lib" includes="jboss-remoting.jar jboss-javaee.jar jboss-messaging-client.jar" /> <!-- Required for JMS Client Code. -->
+ <fileset dir="${org.jboss.esb.server.home}/client" includes="jboss-messaging-client.jar" /> <!-- Required for JMS Client Code. -->
+ <fileset dir="${org.jboss.esb.server.home}/common/lib" includes="hibernate-*.jar commons-collections.jar hsqldb.jar" /> <!-- Required for jbpm Client Code. -->
+ <fileset dir="${org.jboss.esb.server.home}/common/lib" includes="bsh.jar" /> <!-- Required for scripting Client Code. -->
+ <fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="*.jar" /> <!-- Required for JMS Client Code. -->
+ <fileset dir="${org.jboss.esb.server.home}/lib" includes="jboss-aop.jar" /> <!-- Required for JMS Client Code. -->
+ <path refid="compile-classpath" />
+ <pathelement location="${pwd}/anttasks/classes" />
+ </path>
+ <property name="exec-classpath" refid="exec-classpath"/>
+ </target>
+
<!-- ==================================================================== -->
<!-- This section defines the following public targets. -->
<!-- compile, run, deploy jar, prepare-deployment, package-deployment, -->
@@ -513,7 +624,7 @@
<!-- supports JBossWS or EJB. -->
<!-- ==================================================================== -->
- <target name="assert-ws-available" depends="jbossesb-dependencies">
+ <target name="assert-ws-available" depends="jbossesb-dependencies-as4, jbossesb-dependencies-as5">
<available property="ws-spi" file="${org.jboss.esb.server.server}/lib/jbossws-spi.jar"/>
<available property="ws-intros" file="${org.jboss.esb.server.deploy.dir}/jbossws.sar/jboss-jaxb-intros.jar"/>
@@ -547,7 +658,7 @@
<fail unless="quickstart.ftp.config" message="Please configure ftp properties in quickstart.properties"/>
</target>
- <target name="assert-jbossremoting-version" depends="classpath-dependencies">
+ <target name="assert-jbossremoting-version" depends="classpath-dependencies-as4, classpath-dependencies-as5">
<java fork="yes" classname="org.jboss.remoting.Version" failonerror="true" outputproperty="jbr-version-string">
<classpath refid="exec-classpath"/>
</java>
@@ -564,7 +675,7 @@
<fail unless="is-valid-jbr-version" message="Invalid version of JBossRemoting installed on target server. Please install version 2.2.2.SP2 or higher: http://repository.jboss.org/jboss/remoting/" />
</target>
- <target name="assert-jgroups" depends="jbossesb-dependencies">
+ <target name="assert-jgroups" depends="jbossesb-dependencies-as4, jbossesb-dependencies-as5">
<available property="jgroups-available" file="${org.jboss.esb.server.server}/lib/jgroups.jar"/>
<fail unless="jgroups-available" message="Unfortunately this aspect requires jgroups in order to function correctly. Please target a server instance which contains jgroups.jar"/>
</target>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/helloworld/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/helloworld/jboss-esb.xml 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/helloworld/jboss-esb.xml 2009-03-20 15:23:58 UTC (rev 25766)
@@ -39,7 +39,7 @@
process="displayMessage"
/>
<action name="action2" class="org.jboss.soa.esb.actions.SystemPrintln">
- <property name="printfull" value="true"/>
+ <property name="printfull" value="false"/>
</action>
<!-- The next action is for Continuous Integration testing -->
<action name="testStore" class="org.jboss.soa.esb.actions.TestMessageStore"/>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/base-project-build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/base-project-build.xml 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/base-project-build.xml 2009-03-20 15:23:58 UTC (rev 25766)
@@ -34,6 +34,7 @@
<pathelement location="build/${ant.project.name}.esb" />
<pathelement location="build/classes" />
<pathelement location="build/test/classes" />
+ <fileset dir="${esb.main.lib}" includes="jboss-system-4.2.2.GA.jar" />
<fileset dir="lib/ext" includes="*.jar" />
<fileset dir="lib/ext/build-time" includes="*.jar" />
<fileset dir="${esb.product.lib.dir}" includes="*.jar" /> <!-- Product Jars. -->
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbossesb/src/main/resources/jbossesb-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbossesb/src/main/resources/jbossesb-service.xml 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbossesb/src/main/resources/jbossesb-service.xml 2009-03-20 15:23:58 UTC (rev 25766)
@@ -10,4 +10,4 @@
</attribute>
<depends>jboss.jca:service=DataSourceBinding,name=JBossESBDS</depends>
</mbean>
-</server>
\ No newline at end of file
+</server>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbpm/src/main/resources/jbpm-ds.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbpm/src/main/resources/jbpm-ds.xml 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbpm/src/main/resources/jbpm-ds.xml 2009-03-20 15:23:58 UTC (rev 25766)
@@ -33,5 +33,6 @@
<mbean code="org.jboss.internal.soa.esb.dependencies.H2Database"
name="jboss:service=h2,database=jbpmDB">
<attribute name="Database">jbpmDB</attribute>
+ <attribute name="DataDir">${jboss.server.data.dir}</attribute>
</mbean>
</datasources>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbpm/src/main/resources/jbpm-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbpm/src/main/resources/jbpm-service.xml 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbpm/src/main/resources/jbpm-service.xml 2009-03-20 15:23:58 UTC (rev 25766)
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <classpath codebase="deploy" archives="jbpm.esb"/>
- <classpath codebase="deploy/jbossesb.sar/lib" archives="jbossesb-rosetta.jar"/>
<mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
name="jboss.esb:service=JBPMDatabaseInitializer">
<attribute name="Datasource">java:/JbpmDS</attribute>
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soap/src/main/resources/META-INF/jboss-structure.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soap/src/main/resources/META-INF/jboss-structure.xml (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soap/src/main/resources/META-INF/jboss-structure.xml 2009-03-20 15:23:58 UTC (rev 25766)
@@ -0,0 +1,11 @@
+<structure>
+ <context>
+ <path name=""/>
+ <metaDataPath>
+ <path name="META-INF"/>
+ </metaDataPath>
+ <classpath>
+ <path name=""/>
+ </classpath>
+ </context>
+</structure>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/build.xml 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/build.xml 2009-03-20 15:23:58 UTC (rev 25766)
@@ -16,6 +16,7 @@
<path id="build.classpath">
<path location="${basedir}/src/test/resources"/>
+ <fileset dir="../../build/lib" includes="jboss-system-4.2.2.GA.jar" />
<fileset dir="src/lib" includes="*.jar" />
<fileset dir="../../lib/ext" includes="*.jar" />
<fileset dir="../../build/lib" includes="*.jar" />
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -41,6 +41,8 @@
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
+import org.jboss.system.server.ServerConfigImplMBean;
+import org.jboss.mx.util.MBeanProxyExt;
import org.apache.commons.httpclient.HttpClient;
import org.apache.log4j.Logger;
@@ -108,6 +110,8 @@
* The additional schema resources.
*/
private String schemas ;
+
+ private String serverDataDir;
/**
* The name of the SoapUI schema directory.
*/
@@ -133,8 +137,15 @@
super.startService();
if (propertyFile != null) {
- final ServerConfig serverConfig = ServerConfigLocator.locate() ;
- final File dataDir = serverConfig.getServerDataDir() ;
+ File dataDir;
+ if (serverDataDir != null) {
+
+ dataDir = new File(serverDataDir);
+ }
+ else {
+ final ServerConfig serverConfig = (ServerConfig) MBeanProxyExt.create(ServerConfig.class, ServerConfigImplMBean.OBJECT_NAME);
+ dataDir = serverConfig.getServerDataDir() ;
+ }
if (schemas != null)
{
@@ -164,8 +175,15 @@
{
if (propertyFile != null)
{
- final ServerConfig serverConfig = ServerConfigLocator.locate() ;
- final File dataDir = serverConfig.getServerDataDir() ;
+ File dataDir;
+ if (serverDataDir != null) {
+ dataDir = new File(serverDataDir);
+ }
+ else
+ {
+ final ServerConfig serverConfig = (ServerConfig) MBeanProxyExt.create(ServerConfig.class, ServerConfigImplMBean.OBJECT_NAME);
+ dataDir = serverConfig.getServerDataDir() ;
+ }
final File schemaDir = new File(dataDir, SOAP_UI_SCHEMA_DIRECTORY) ;
if (schemaDir.exists())
{
@@ -726,4 +744,14 @@
throw ioe ;
}
}
+
+ public void setServerDataDir(final String datadir)
+ {
+ this.serverDataDir = datadir;
+ }
+
+ public String getServerDataDir()
+ {
+ return serverDataDir;
+ }
}
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBean.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBean.java 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBean.java 2009-03-20 15:23:58 UTC (rev 25766)
@@ -108,4 +108,8 @@
* @see setPropertyFile
*/
public void setSchemas(final String schemas) ;
+
+ public String getServerDataDir() ;
+ public void setServerDataDir(String dataDir) ;
+
}
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/resources/META-INF/jboss-service-as5.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/resources/META-INF/jboss-service-as5.xml (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/resources/META-INF/jboss-service-as5.xml 2009-03-20 15:23:58 UTC (rev 25766)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service>
+ <classpath codebase="deploy/soapui-client.sar/lib" archives="*"/>
+
+ <mbean code="org.jboss.soa.esb.services.soapui.SoapUIClientService" name="jboss.esb:service=SoapUIClientService">
+ <attribute name="PropertyFile">soapui-settings.xml</attribute>
+ <attribute name="Schemas">schemas/XMLSchema1999.xsd</attribute>
+ <attribute name="ServerDataDir">${jboss.server.data.dir}</attribute>
+ </mbean>
+ <loader-repository>
+ jboss.esb:loader=soapui-client.sar
+ </loader-repository>
+</service>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/resources/META-INF/jboss-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/resources/META-INF/jboss-service.xml 2009-03-20 13:18:38 UTC (rev 25765)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/resources/META-INF/jboss-service.xml 2009-03-20 15:23:58 UTC (rev 25766)
@@ -4,6 +4,7 @@
name="jboss.esb:service=SoapUIClientService">
<attribute name="PropertyFile">soapui-settings.xml</attribute>
<attribute name="Schemas">schemas/XMLSchema1999.xsd</attribute>
+ <attribute name="ServerDataDir">${jboss.server.data.dir}</attribute>
<depends>jboss.esb:service=ESBDeployer</depends>
</mbean>
<loader-repository>
More information about the jboss-svn-commits
mailing list