[jboss-svn-commits] JBL Code SVN: r5447 - in labs/jbossesb/trunk/product/core: common/src/org/jboss/soa/esb/parameters common/tests/src/org/jboss/soa/esb/parameters listeners/src/org/jboss/soa/esb/listeners services/src/org/jboss/soa/esb/services/msglistener
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Aug 3 13:12:59 EDT 2006
Author: tfennelly
Date: 2006-08-03 13:12:47 -0400 (Thu, 03 Aug 2006)
New Revision: 5447
Modified:
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/parameters/ParamFileRepository.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/parameters/ParamRepository.java
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/parameters/ParamsFileRepositoryUnitTest.java
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/parameters/TestParamRepo.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/JmsQueueListener.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java
Log:
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/parameters/ParamFileRepository.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/parameters/ParamFileRepository.java 2006-08-03 16:39:19 UTC (rev 5446)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/parameters/ParamFileRepository.java 2006-08-03 17:12:47 UTC (rev 5447)
@@ -5,8 +5,10 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Properties;
-import javax.naming.Name;
+import javax.naming.CompoundName;
+import javax.naming.InvalidNameException;
import org.apache.log4j.Logger;
import org.jboss.soa.esb.util.StreamUtils;
@@ -60,14 +62,14 @@
logger.info("Setting parameter repository root dir to [" + root.getAbsolutePath() + "].");
}
- public void add(ParamName name, String value) throws ParamRepositoryException {
+ public void add(String name, String value) throws ParamRepositoryException {
+ FileParamName nameParam = asserNameOK(name);
+ if(value == null) {
+ throw new IllegalArgumentException("null 'value' arg in method call.");
+ }
+
synchronized (this) {
- asserNameOK(name);
- if(value == null) {
- throw new IllegalArgumentException("null 'value' arg in method call.");
- }
-
- File paramFile = toParamFile(name);
+ File paramFile = toParamFile(nameParam);
paramFile.getParentFile().mkdirs();
FileOutputStream fileStream = null;
@@ -75,7 +77,7 @@
fileStream = new FileOutputStream(paramFile);
fileStream.write(value.getBytes("UTF-8"));
} catch (IOException e) {
- throw new ParamRepositoryException("IO Error while storing param [" + name + "].", e);
+ throw new ParamRepositoryException("IO Error while storing param [" + nameParam + "].", e);
} finally {
try {
if(fileStream != null) {
@@ -89,12 +91,12 @@
}
}
- public String get(ParamName name) throws ParamRepositoryException {
+ public String get(String name) throws ParamRepositoryException {
+ FileParamName paramName = asserNameOK(name);
+
synchronized (this) {
- asserNameOK(name);
+ File paramFile = toParamFile(paramName);
- File paramFile = toParamFile(name);
-
if (!paramFile.exists()) {
return null;
}
@@ -118,11 +120,11 @@
}
}
- public void remove(ParamName name) {
+ public void remove(String name) {
+ FileParamName paramName = asserNameOK(name);
+
synchronized (this) {
- asserNameOK(name);
-
- File paramFile = toParamFile(name);
+ File paramFile = toParamFile(paramName);
if (paramFile.exists()) {
paramFile.delete();
}
@@ -142,13 +144,57 @@
* @param paramName The param name.
* @return The param file.
*/
- protected File toParamFile(Name paramName) {
+ protected File toParamFile(FileParamName paramName) {
return new File(root, paramName.toString());
}
- private void asserNameOK(ParamName name) {
- if (name == null || name.size() < 1) {
- throw new IllegalArgumentException("Invalid name arg: " + name);
+ private FileParamName asserNameOK(String name) {
+ FileParamName paramName;
+
+ if (name == null) {
+ throw new IllegalArgumentException("null 'name' arg in repository call.");
}
+ try {
+ paramName = new FileParamName(name);
+ } catch (InvalidNameException e) {
+ throw new IllegalArgumentException("Invalid 'name' arg: " + name, e);
+ }
+ if (paramName.size() == 0) {
+ throw new IllegalArgumentException("Invalid 'name' arg. 0 tokens: " + name);
+ }
+
+ return paramName;
}
+
+ /**
+ * Parameter Name.
+ * <p/>
+ * Represents a compound parameter name - from a hierarchical namespace.
+ * <h4 id="syntax">Parameter Name Format</h4>
+ * The syntax of the parameter name is expected to be in "directory" format,
+ * read from left to right, where the syntax seperator character is '/'
+ * e.g. "com/acme/ParameterX".
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+ private static class FileParamName extends CompoundName {
+
+ private static final long serialVersionUID = 1L;
+ private static final Properties nameSyntaxProperties = new Properties();
+ static {
+ nameSyntaxProperties.setProperty("jndi.syntax.direction", "left_to_right");
+ nameSyntaxProperties.setProperty("jndi.syntax.separator", "/");
+ };
+
+ /**
+ * Public Constructor.
+ * @param name The name of the parameter, specified according to the
+ * <a href="#syntax">defined syntax</a>.
+ * @throws InvalidNameException The supplied name violates the
+ * <a href="#syntax">defined syntax</a>.
+ */
+ public FileParamName(String name) throws InvalidNameException {
+ super(name, nameSyntaxProperties);
+ }
+ }
}
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/parameters/ParamRepository.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/parameters/ParamRepository.java 2006-08-03 16:39:19 UTC (rev 5446)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/parameters/ParamRepository.java 2006-08-03 17:12:47 UTC (rev 5447)
@@ -46,7 +46,7 @@
* @param value The parameter value. Must not be <code>null</code>.
* @throws ParamRepositoryException Failed to store the specified parameter value.
*/
- public void add(ParamName name, String value) throws ParamRepositoryException;
+ public void add(String name, String value) throws ParamRepositoryException;
/**
* Get the value associated with the named parameter.
@@ -56,7 +56,7 @@
* @throws ParamRepositoryException The parameter exists, but an error has occured
* while readingit.
*/
- public String get(ParamName name) throws ParamRepositoryException;
+ public String get(String name) throws ParamRepositoryException;
/**
* Remove a parameter, or a hierarchy of parameters.
@@ -67,5 +67,5 @@
* @throws ParamRepositoryException Failed to remove the parameter, or hierarchy of parameters,
* from the repository..
*/
- public void remove(ParamName name) throws ParamRepositoryException;
+ public void remove(String name) throws ParamRepositoryException;
}
Modified: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/parameters/ParamsFileRepositoryUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/parameters/ParamsFileRepositoryUnitTest.java 2006-08-03 16:39:19 UTC (rev 5446)
+++ labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/parameters/ParamsFileRepositoryUnitTest.java 2006-08-03 17:12:47 UTC (rev 5447)
@@ -61,18 +61,18 @@
ParamFileRepository fileRepo = new ParamFileRepository();
test_add_badargs(fileRepo, null, "val");
- test_add_badargs(fileRepo, new ParamName(""), "val");
- test_add_badargs(fileRepo, new ParamName(""), "val");
- test_add_badargs(fileRepo, new ParamName("xxx/yyy"), null);
+ test_add_badargs(fileRepo, "", "val");
+ test_add_badargs(fileRepo, "", "val");
+ test_add_badargs(fileRepo, "xxx/yyy", null);
test_get_badargs(fileRepo, null);
- test_get_badargs(fileRepo, new ParamName(""));
+ test_get_badargs(fileRepo, "");
test_remove_badargs(fileRepo, null);
- test_remove_badargs(fileRepo, new ParamName(""));
+ test_remove_badargs(fileRepo, "");
}
- private void test_add_badargs(ParamFileRepository fileRepo, ParamName name, String value) throws ParamRepositoryException {
+ private void test_add_badargs(ParamFileRepository fileRepo, String name, String value) throws ParamRepositoryException {
try {
fileRepo.add(name, value);
fail("expected IllegalArgumentException");
@@ -81,7 +81,7 @@
}
}
- private void test_get_badargs(ParamFileRepository fileRepo, ParamName name) throws ParamRepositoryException {
+ private void test_get_badargs(ParamFileRepository fileRepo, String name) throws ParamRepositoryException {
try {
fileRepo.get(name);
fail("expected IllegalArgumentException");
@@ -90,7 +90,7 @@
}
}
- private void test_remove_badargs(ParamFileRepository fileRepo, ParamName name) {
+ private void test_remove_badargs(ParamFileRepository fileRepo, String name) {
try {
fileRepo.remove(name);
fail("expected IllegalArgumentException");
@@ -102,13 +102,10 @@
public void test_add_get_remove() throws Exception {
System.setProperty(ParamFileRepository.FILE_PARAMS_REPOS_ROOT, "build/tests/");
ParamFileRepository fileRepo = new ParamFileRepository();
- ParamName name = new ParamName("repostests/jboss/testparam");
- File paramFile = fileRepo.toParamFile(name);
+ String name = "repostests/jboss/testparam";
// Make sure the parameter doesn't already exist...
- if(paramFile.exists()) {
- paramFile.delete();
- }
+ assertEquals(null, fileRepo.get(name));
// Now the tests...
assertEquals(null, fileRepo.get(name));
Modified: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/parameters/TestParamRepo.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/parameters/TestParamRepo.java 2006-08-03 16:39:19 UTC (rev 5446)
+++ labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/parameters/TestParamRepo.java 2006-08-03 17:12:47 UTC (rev 5447)
@@ -7,18 +7,18 @@
// TODO Auto-generated constructor stub
}
- public void add(ParamName name, String value)
+ public void add(String name, String value)
throws ParamRepositoryException {
// TODO Auto-generated method stub
}
- public String get(ParamName name) throws ParamRepositoryException {
+ public String get(String name) throws ParamRepositoryException {
// TODO Auto-generated method stub
return null;
}
- public void remove(ParamName name) throws ParamRepositoryException {
+ public void remove(String name) throws ParamRepositoryException {
// TODO Auto-generated method stub
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java 2006-08-03 16:39:19 UTC (rev 5446)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java 2006-08-03 17:12:47 UTC (rev 5447)
@@ -63,7 +63,7 @@
= new HashMap<String,GroupOfChilds>();
protected ParamRepository m_oParmRepos;
- protected ParamName m_oParmName;
+ protected String m_oParmName;
protected Logger m_oLogger;
protected DomElement m_oParms;
@@ -81,7 +81,7 @@
m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
m_oParmRepos = ParamRepositoryFactory.getInstance();
- m_oParmName = new ParamName(p_sParamsUid);
+ m_oParmName = p_sParamsUid;
} //__________________________________
protected void runUntilEndRequested() throws Exception
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/JmsQueueListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/JmsQueueListener.java 2006-08-03 16:39:19 UTC (rev 5446)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/JmsQueueListener.java 2006-08-03 17:12:47 UTC (rev 5447)
@@ -46,7 +46,7 @@
= new HashMap<String,GroupOfChilds>();
protected ParamRepository m_oParmRepos;
- protected ParamName m_oParmName;
+ protected String m_oParmName;
protected Logger m_oLogger;
protected DomElement m_oParms;
@@ -66,7 +66,7 @@
m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
m_oParmRepos = ParamRepositoryFactory.getInstance();
- m_oParmName = new ParamName(p_sParamsUid);
+ m_oParmName = p_sParamsUid;
runUntilEndRequested();
} //__________________________________
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java 2006-08-03 16:39:19 UTC (rev 5446)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java 2006-08-03 17:12:47 UTC (rev 5447)
@@ -75,10 +75,10 @@
{
m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
m_oParmRepos = ParamRepositoryFactory.getInstance();
- while (loadParmsCycle(new ParamName(p_sParamsUid))) {}
+ while (loadParmsCycle(p_sParamsUid)) {}
} //__________________________________
- protected boolean loadParmsCycle(ParamName paramName) throws Exception
+ protected boolean loadParmsCycle(String paramName) throws Exception
{
String sMsg = (null == paramXmlTree)
? "Initial Parameter loading" : "Reloading Params";
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java 2006-08-03 16:39:19 UTC (rev 5446)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java 2006-08-03 17:12:47 UTC (rev 5447)
@@ -240,7 +240,7 @@
throws Exception
{
ParamRepository repo = ParamRepositoryFactory.getInstance();
- return DomElement.fromXml(repo.get(new ParamName(p_sKey)));
+ return DomElement.fromXml(repo.get(p_sKey));
} //__________________________________
More information about the jboss-svn-commits
mailing list