[jboss-svn-commits] JBL Code SVN: r26514 - in labs/jbossesb/workspace/dbevenius/jbossas5/product: rosetta/src/org/jboss/internal/soa/esb/dependencies and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 13 14:30:19 EDT 2009
Author: beve
Date: 2009-05-13 14:30:19 -0400 (Wed, 13 May 2009)
New Revision: 26514
Modified:
labs/jbossesb/workspace/dbevenius/jbossas5/product/install/jboss-service-jbossas5.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/install/jboss-service.xml
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/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/tests/src/org/jboss/soa/esb/listeners/gateway/DefaultESBPropertiesSetterUnitTest.java
Log:
Updated mbean property names and made them mandatory.
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/install/jboss-service-jbossas5.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/install/jboss-service-jbossas5.xml 2009-05-13 18:20:26 UTC (rev 26513)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/install/jboss-service-jbossas5.xml 2009-05-13 18:30:19 UTC (rev 26514)
@@ -2,24 +2,23 @@
<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.soa.esb.common.JBossESBPropertyService" name="jboss.esb:service=PropertyService">
+ <attribute name="PropertyFile">jbossesb-properties.xml</attribute>
+ <attribute name="PropertiesFileDir">${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.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">
+ <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>
+ <attribute name="PropertiesFileDir">${jboss.server.data.dir}</attribute>
<depends>jboss.jca:service=DataSourceBinding,name=juddiDB</depends>
<depends>jboss.esb:service=PropertyService</depends>
- </mbean>
+ </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"/>
</server>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/install/jboss-service.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/install/jboss-service.xml 2009-05-13 18:20:26 UTC (rev 26513)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/install/jboss-service.xml 2009-05-13 18:30:19 UTC (rev 26514)
@@ -2,32 +2,31 @@
<server>
- <classpath codebase="deploy/jbossesb.sar/lib" archives="*.jar"/>
+ <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.soa.esb.common.JBossESBPropertyService" name="jboss.esb:service=PropertyService">
+ <attribute name="PropertyFile">jbossesb-properties.xml</attribute>
+ <attribute name="PropertiesFileDir">${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.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">
+ <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>
+ <attribute name="PropertiesFileDir">${jboss.server.data.dir}</attribute>
<depends>jboss.jca:service=DataSourceBinding,name=juddiDB</depends>
<depends>jboss.esb:service=PropertyService</depends>
- </mbean>
+ </mbean>
- <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.config.JBoss4ESBDeployer" name="jboss.esb:service=ESBDeployer">
+ <attribute name="WarFilesDir">${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>
+ <mbean code="org.jboss.soa.esb.listeners.message.MessageCounter" name="jboss.esb:service=MessageCounter"/>
+
</server>
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-05-13 18:20:26 UTC (rev 26513)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java 2009-05-13 18:30:19 UTC (rev 26514)
@@ -26,6 +26,7 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.net.URL;
@@ -54,7 +55,7 @@
private static final String JUDDI_PROPERTY_FILE_COMMENTS = "Auto generated property file, do not edit" ;
private String propertiesResourceFile ;
- private String serverDataDir;
+ private String propertiesFileDir;
public String getPropertiesResourceFile()
{
@@ -100,13 +101,17 @@
xmlPropertyIS.close() ;
}
- File dataDir;
- if (serverDataDir != null) {
- dataDir = new File(serverDataDir);
+ if (propertiesFileDir == null)
+ {
+ final String errorMsg = String.format("No property named '%s' was configured in jbossesb.sar/META-INF/jboss-service.xml for %s", "propertiesFileDir", getClass().getName());
+ throw new IllegalArgumentException(errorMsg);
}
- else {
- final ServerConfig serverConfig = (ServerConfig) MBeanProxyExt.create(ServerConfig.class, ServerConfigImplMBean.OBJECT_NAME);
- dataDir = serverConfig.getServerDataDir() ;
+
+ File dataDir = new File(propertiesFileDir);
+ if (!dataDir.exists())
+ {
+ final String errorMsg = String.format("The directory configured for %s='%s' does not exist.", "warFilesDir", dataDir);
+ throw new FileNotFoundException(errorMsg);
}
final File juddiPropertyFile = new File(dataDir, JUDDI_PROPERTIES_RESOURCE_FILE) ;
@@ -146,8 +151,8 @@
ic.unbind(JNDIRegistration.PUBLISH_SERVICE) ;
}
- public void setServerDataDir(final String directory)
+ public void setPropertiesFileDir(final String directory)
{
- this.serverDataDir = directory;
+ this.propertiesFileDir = 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-05-13 18:20:26 UTC (rev 26513)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIServiceMBean.java 2009-05-13 18:30:19 UTC (rev 26514)
@@ -31,5 +31,5 @@
void setPropertiesResourceFile(String propertiesResourceFile) ;
- void setServerDataDir(final String directory);
+ void setPropertiesFileDir(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-05-13 18:20:26 UTC (rev 26513)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyService.java 2009-05-13 18:30:19 UTC (rev 26514)
@@ -22,6 +22,7 @@
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.net.InetAddress;
@@ -58,7 +59,7 @@
*/
private String propertyFile ;
- private String serverDataDir;
+ private String propertiesFileDir;
/**
* Get the property file.
@@ -119,15 +120,16 @@
}
try {
- File dataDir;
- if (serverDataDir != null) {
- dataDir = new File(serverDataDir);
+ if (propertiesFileDir == null) {
+ final String errorMsg = String.format("No property named '%s' was configured in jbossesb.sar/META-INF/jboss-service.xml for %s", "propertiesFileDir", getClass().getName());
+ throw new IllegalArgumentException(errorMsg);
}
- else {
- final ServerConfig serverConfig = (ServerConfig) MBeanProxyExt.create(ServerConfig.class, ServerConfigImplMBean.OBJECT_NAME);
- dataDir = serverConfig.getServerDataDir() ;
+ File dataDir = new File(propertiesFileDir);
+ if (!dataDir.exists()) {
+ final String errorMsg = String.format("The directory configured for %s='%s' does not exist.", "warFilesDir", dataDir);
+ throw new FileNotFoundException(errorMsg);
}
- final File esbPropertyFile = new File(dataDir, ESB_PROPERTY_FILE) ;
+ final File esbPropertyFile = new File(dataDir, ESB_PROPERTY_FILE);
final FileOutputStream esbPropertyOS = new FileOutputStream(esbPropertyFile) ;
try {
@@ -356,8 +358,8 @@
}
}
- public void setServerDataDir(String directory)
+ public void setPropertiesFileDir(String directory)
{
- this.serverDataDir = directory;
+ this.propertiesFileDir = 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-05-13 18:20:26 UTC (rev 26513)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/common/JBossESBPropertyServiceMBean.java 2009-05-13 18:30:19 UTC (rev 26514)
@@ -39,5 +39,5 @@
*/
public void setPropertyFile(final String propertyFile) ;
- public void setServerDataDir(final String directory);
+ public void setPropertiesFileDir(final String directory);
}
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-05-13 18:20:26 UTC (rev 26513)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java 2009-05-13 18:30:19 UTC (rev 26514)
@@ -102,7 +102,11 @@
private static final String PREFIX_CANONICAL_NAME = "jboss.esb:deployment=" ;
private static final String ESB_ARTIFACT_NAME = "jbossesb.esb" ;
- private String serverTmpDir;
+ /**
+ * The path the the directory that will be used to generate the war file
+ * for EBWS deployments.
+ */
+ private String warFilesDir;
/**
* Default CTOR used to set default values to the Suffixes and RelativeOrder
@@ -192,15 +196,17 @@
public void init(DeploymentInfo di) throws DeploymentException
{
- File tmpDir;
- if (serverTmpDir != null)
+ if (warFilesDir == null)
{
- tmpDir = new File(serverTmpDir);
+ final String errorMsg = String.format("No property named '%s' was configured in jbossesb.sar/META-INF/jboss-service.xml for %s", "warFilesDir", getClass().getName());
+ throw new DeploymentException(errorMsg);
}
- else
+
+ final File tmpDir = new File(warFilesDir);
+ if (!tmpDir.exists())
{
- final ServerConfig config = (ServerConfig) MBeanProxyExt.create(ServerConfig.class, ServerConfigImplMBean.OBJECT_NAME);
- tmpDir = config.getServerTempDeployDir();
+ final String errorMsg = String.format("The directory configured for %s='%s' does not exist.", "warFilesDir", tmpDir);
+ throw new DeploymentException(errorMsg);
}
esbWarFiles = JBossDeployerUtil.createDir(tmpDir, "esbwarfiles");
@@ -679,9 +685,13 @@
esbNames.remove(deploymentName) ;
}
- public void setServerTempDir(final String tmpDir)
+ /**
+ * Sets the directory that will be used for generating ESWS wars.
+ * @param String the directory to be used.
+ */
+ public void setWarFilesDir(final String dir)
{
- this.serverTmpDir = tmpDir;
+ this.warFilesDir = dir;
}
static Map<String, String> getSchemas(final File file) throws DeploymentException
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-05-13 18:20:26 UTC (rev 26513)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployerMBean.java 2009-05-13 18:30:19 UTC (rev 26514)
@@ -31,5 +31,5 @@
*/
public interface JBoss4ESBDeployerMBean extends SubDeployerMBean
{
- public void setServerTempDir(final String tmpDir);
+ public void setWarFilesDir(final String dir);
}
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/DefaultESBPropertiesSetterUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/DefaultESBPropertiesSetterUnitTest.java 2009-05-13 18:20:26 UTC (rev 26513)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/DefaultESBPropertiesSetterUnitTest.java 2009-05-13 18:30:19 UTC (rev 26514)
@@ -133,7 +133,7 @@
@Test
public void setPropertiesFilterAllVendorSpecificProperties() throws JMSException
{
- final String filter = "(JMS_).*";
+ final String filter = "^(JMS_).*";
DefaultESBPropertiesSetter setter = new DefaultESBPropertiesSetter(filter);
final String propertyKey = "JMS_SomeVendor_Property";
@@ -149,7 +149,7 @@
@Test
public void setPropertiesFilterIBMQVendorSpecificProperties() throws JMSException
{
- final String filter = "(JMS_IBMQ).*";
+ final String filter = "^(JMS_IBMQ_).+";
DefaultESBPropertiesSetter setter = new DefaultESBPropertiesSetter(filter);
final String propertyKey = "JMS_IBMQ_Property";
More information about the jboss-svn-commits
mailing list