[jboss-svn-commits] JBL Code SVN: r27346 - in labs/jbossesb/trunk/product: install/conf and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 30 12:03:16 EDT 2009
Author: tfennelly
Date: 2009-06-30 12:03:16 -0400 (Tue, 30 Jun 2009)
New Revision: 27346
Modified:
labs/jbossesb/trunk/product/docs/ServicesGuide.odt
labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
Log:
https://jira.jboss.org/jira/browse/JBESB-2581
Allow registry organization information to be configured
Modified: labs/jbossesb/trunk/product/docs/ServicesGuide.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml 2009-06-30 15:24:12 UTC (rev 27345)
+++ labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml 2009-06-30 16:03:16 UTC (rev 27346)
@@ -77,6 +77,9 @@
<!-- The following properties modify the cache interceptor behaviour -->
<property name="org.jboss.soa.esb.registry.cache.maxSize" value="100"/>
<property name="org.jboss.soa.esb.registry.cache.validityPeriod" value="600000"/>
+
+ <!-- Organization Category to be used by this deployment. -->
+ <property name="org.jboss.soa.esb.registry.orgCategory" value="org.jboss.soa.esb.:category"/>
</properties>
<properties name="transports" depends="core">
<property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/>
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2009-06-30 15:24:12 UTC (rev 27345)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2009-06-30 16:03:16 UTC (rev 27346)
@@ -53,12 +53,13 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.ws.scout.registry.infomodel.KeyImpl;
import org.apache.ws.scout.registry.infomodel.SpecificationLinkImpl;
import org.jboss.internal.soa.esb.addressing.helpers.EPRHelper;
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.MarshalException;
import org.jboss.soa.esb.UnmarshalException;
+import org.jboss.soa.esb.common.ModulePropertyManager;
+import org.jboss.soa.esb.common.Environment;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.services.registry.Registry;
import org.jboss.soa.esb.services.registry.RegistryException;
@@ -78,9 +79,11 @@
private static Organization jbossESBOrganization;
private static Concept jbossTModel;
public static final String JBOSS_ESB_CATEGORY = "org.jboss.soa.esb.:category";
+ public String orgCategory;
public JAXRRegistryImpl() throws ConfigurationException {
jaxrConnectionFactory = new JAXRConnectionFactory();
+ orgCategory = ModulePropertyManager.getPropertyManager(ModulePropertyManager.REGISTRY_MODULE).getProperty(Environment.REGISTRY_ORG_CATEGORY, JBOSS_ESB_CATEGORY);
}
/**
@@ -101,7 +104,7 @@
Collection<String> findQualifiers = new ArrayList<String>();
findQualifiers.add(FindQualifier.AND_ALL_KEYS);
findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
- ClassificationScheme cScheme = bqm.findClassificationSchemeByName(findQualifiers, JBOSS_ESB_CATEGORY);
+ ClassificationScheme cScheme = bqm.findClassificationSchemeByName(findQualifiers, orgCategory);
Classification classification = blm.createClassification(cScheme, "category", category);
service.addClassification(classification);
organization.addService(service);
@@ -176,7 +179,7 @@
Collection<String> findQualifiers = new ArrayList<String>();
findQualifiers.add(FindQualifier.AND_ALL_KEYS);
findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
- ClassificationScheme cScheme = bqm.findClassificationSchemeByName(findQualifiers, JBOSS_ESB_CATEGORY);
+ ClassificationScheme cScheme = bqm.findClassificationSchemeByName(findQualifiers, orgCategory);
Classification classification = blm.createClassification(cScheme, "category", category);
service.addClassification(classification);
@@ -305,7 +308,7 @@
Collection<String> findQualifiers = new ArrayList<String>();
findQualifiers.add(FindQualifier.AND_ALL_KEYS);
findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
- ClassificationScheme cScheme = bqm.findClassificationSchemeByName(findQualifiers, JBOSS_ESB_CATEGORY);
+ ClassificationScheme cScheme = bqm.findClassificationSchemeByName(findQualifiers, orgCategory);
Classification classification = blm.createClassification(cScheme, "category", category);
SpecificationLink sl = new SpecificationLinkImpl(blm);
@@ -462,19 +465,19 @@
findQualifiers.add(FindQualifier.AND_ALL_KEYS);
findQualifiers.add(FindQualifier.EXACT_NAME_MATCH);
findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
- ClassificationScheme cScheme = bqm.findClassificationSchemeByName(findQualifiers, JBOSS_ESB_CATEGORY);
+ ClassificationScheme cScheme = bqm.findClassificationSchemeByName(findQualifiers, orgCategory);
Collection<Classification> classifications = new ArrayList<Classification>();
// If the scheme returned null, then we have to create a org.jboss.soa.esb.:category scheme to use
if (cScheme == null) {
try {
- ClassificationScheme scheme = blm.createClassificationScheme(JBOSS_ESB_CATEGORY, JBOSS_ESB_CATEGORY);
+ ClassificationScheme scheme = blm.createClassificationScheme(orgCategory, orgCategory);
ArrayList<ClassificationScheme> cSchemes = new ArrayList<ClassificationScheme>();
cSchemes.add(scheme);
BulkResponse br = blm.saveClassificationSchemes(cSchemes);
} catch (Exception e) {
throw new JAXRException(e);
}
- cScheme = bqm.findClassificationSchemeByName(findQualifiers, JBOSS_ESB_CATEGORY);
+ cScheme = bqm.findClassificationSchemeByName(findQualifiers, orgCategory);
}
Classification classification =
blm.createClassification(
@@ -537,7 +540,7 @@
Collection<String> findQualifiers = new ArrayList<String>();
findQualifiers.add(FindQualifier.AND_ALL_KEYS);
findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
- ClassificationScheme cScheme = bqm.findClassificationSchemeByName(findQualifiers, JBOSS_ESB_CATEGORY);
+ ClassificationScheme cScheme = bqm.findClassificationSchemeByName(findQualifiers, orgCategory);
//Create classification
Classification classification =
blm.createClassification(
@@ -624,7 +627,7 @@
* @return
* @throws JAXRException
*/
- protected static Concept getJBossESBTModel(JAXRConnectionFactory jaxrConnectionFactory) throws JAXRException
+ private Concept getJBossESBTModel(JAXRConnectionFactory jaxrConnectionFactory) throws JAXRException
{
Connection connection = jaxrConnectionFactory.getConnection();
Concept tmodel = null;
@@ -636,7 +639,7 @@
Collection<String> findQualifiers = new ArrayList<String>();
findQualifiers.add(FindQualifier.SORT_BY_NAME_ASC);
Collection<String> namePatterns = new ArrayList<String>();
- namePatterns.add("%" + JBOSS_ESB_CATEGORY + "%");
+ namePatterns.add("%" + orgCategory + "%");
BulkResponse response = bqm.findConcepts(findQualifiers, namePatterns, null, null, null);
if (response.getStatus()==JAXRResponse.STATUS_SUCCESS) {
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java 2009-06-30 15:24:12 UTC (rev 27345)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java 2009-06-30 16:03:16 UTC (rev 27346)
@@ -136,6 +136,10 @@
* The cache validity period.
*/
public static final String REGISTRY_CACHE_VALIDITY_PERIOD = "org.jboss.soa.esb.registry.cache.validityPeriod";
+ /**
+ * The Registry Organization Category to be used by this deployment.
+ */
+ public static final String REGISTRY_ORG_CATEGORY = "org.jboss.soa.esb.registry.orgCategory";
/*
* Some default values.
*/
More information about the jboss-svn-commits
mailing list