[jboss-svn-commits] JBL Code SVN: r11561 - in labs/jbossesb/trunk: product/core/services/tests/src/org/jboss/soa/esb/services/registry and 14 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue May 1 14:29:32 EDT 2007
Author: kurt.stam at jboss.com
Date: 2007-05-01 14:29:32 -0400 (Tue, 01 May 2007)
New Revision: 11561
Modified:
labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java
labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/juddi-unittest.properties
labs/jbossesb/trunk/product/install/jUDDI-registry/sql/daffodildb/create_database.sql
labs/jbossesb/trunk/product/install/jUDDI-registry/sql/db2/create_database.sql
labs/jbossesb/trunk/product/install/jUDDI-registry/sql/derby/create_database.sql
labs/jbossesb/trunk/product/install/jUDDI-registry/sql/firebird/create_database.sql
labs/jbossesb/trunk/product/install/jUDDI-registry/sql/hsqldb/create_database.sql
labs/jbossesb/trunk/product/install/jUDDI-registry/sql/informix/create_database.sql
labs/jbossesb/trunk/product/install/jUDDI-registry/sql/jdatastore/create_database.sql
labs/jbossesb/trunk/product/install/jUDDI-registry/sql/mysql/create_database.sql
labs/jbossesb/trunk/product/install/jUDDI-registry/sql/oracle/create_database.sql
labs/jbossesb/trunk/product/install/jUDDI-registry/sql/postgresql/create_database.sql
labs/jbossesb/trunk/product/install/jUDDI-registry/sql/sybase/create_database.sql
labs/jbossesb/trunk/product/install/jUDDI-registry/sql/totalxml/create_database.sql
labs/jbossesb/trunk/product/lib/ext/scout-1.0-SNAPSHOT.jar
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/ContentBasedRouterTest.java
Log:
Fix for JBESB-495 Adding true categorization. No longer are we adding the category name to the service name. Adding the classificationScheme
to the juddi database.
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2007-05-01 17:50:32 UTC (rev 11560)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2007-05-01 18:29:32 UTC (rev 11561)
@@ -40,6 +40,8 @@
import javax.xml.registry.JAXRException;
import javax.xml.registry.JAXRResponse;
import javax.xml.registry.RegistryService;
+import javax.xml.registry.infomodel.Classification;
+import javax.xml.registry.infomodel.ClassificationScheme;
import javax.xml.registry.infomodel.EmailAddress;
import javax.xml.registry.infomodel.Key;
import javax.xml.registry.infomodel.Organization;
@@ -128,13 +130,17 @@
try {
connection.setCredentials(JAXRRegistryImpl.creds);
RegistryService rs = connection.getRegistryService();
+ BusinessQueryManager bqm = rs.getBusinessQueryManager();
BusinessLifeCycleManager blm = rs.getBusinessLifeCycleManager();
//Adding the category as prefix for the name
- service = blm.createService(blm.createInternationalString(category + ":" + serviceName));
+ service = blm.createService(blm.createInternationalString(serviceName));
service.setDescription(blm.createInternationalString(serviceDescription));
-// ClassificationScheme cScheme = getClassificationScheme(blm, "uddi-org:general_keywords", "");
-// Classification classification = blm.createClassification(cScheme, "JBossESB" + category, category);
-// service.addClassification(classification);
+ Collection<String> findQualifiers = new ArrayList<String>();
+ findQualifiers.add(FindQualifier.AND_ALL_KEYS);
+ findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
+ ClassificationScheme cScheme = bqm.findClassificationSchemeByName(findQualifiers, "org.jboss.soa.esb.:category");
+ Classification classification = blm.createClassification(cScheme, "category", category);
+ service.addClassification(classification);
organization.addService(service);
saveRegistryObject(service);
} finally {
@@ -145,20 +151,28 @@
/**
* Remove an EPR from the Registry
*/
- public void unRegisterService(String category, String serviceName) throws RegistryException{
- try {
- Organization organization = getJBossESBOrganization();
- for (Iterator i=organization.getServices().iterator(); i.hasNext();) {
- Service service = (Service) i.next();
- if (service.getName().getValue().equals(category + ":" + serviceName)) {
- organization.removeService(service);
- saveRegistryObject(organization);
- return;
- }
- }
- } catch (JAXRException je) {
- throw new RegistryException(je.getLocalizedMessage(), je);
- }
+ @SuppressWarnings("unchecked")
+ public void unRegisterService(String category, String serviceName) throws RegistryException{
+// first find the ServiceBindings for this service
+ Connection connection = JAXRRegistryImpl.getConnection();
+ Service service = null;
+ try {
+ service = findService(category, serviceName);
+ if (service==null) {
+ throw new RegistryException("No such EPR found for service with name = "
+ + serviceName);
+ }
+ connection.setCredentials(JAXRRegistryImpl.creds);
+ RegistryService rs = connection.getRegistryService();
+ BusinessLifeCycleManager blm = rs.getBusinessLifeCycleManager();
+ Collection<Key> serviceKeys = new ArrayList<Key>();
+ serviceKeys.add(service.getKey());
+ blm.deleteServices(serviceKeys);
+ } catch (Exception je) {
+ throw new RegistryException(je.getLocalizedMessage(), je);
+ } finally {
+ closeConnection(connection);
+ }
}
/**
* Publish an EPR to the Registry
@@ -169,7 +183,6 @@
Connection connection = JAXRRegistryImpl.getConnection();
try {
//Find the service
-
Service service = findService(category,serviceName);
if (service==null) {
logger.log(Priority.DEBUG, "Service " + serviceName + " does not yet exist, creating now..");
@@ -179,7 +192,7 @@
connection.setCredentials(JAXRRegistryImpl.creds);
RegistryService rs = connection.getRegistryService();
BusinessLifeCycleManager blm = rs.getBusinessLifeCycleManager();
-// BusinessQueryManager bqm = rs.getBusinessQueryManager();
+ BusinessQueryManager bqm = rs.getBusinessQueryManager();
ServiceBinding serviceBinding = blm.createServiceBinding();
serviceBinding.setDescription(blm.createInternationalString(eprDescription));
String xml = EPRHelper.toXMLString(epr);
@@ -225,6 +238,13 @@
ArrayList<ServiceBinding> serviceBindings = new ArrayList<ServiceBinding>();
serviceBindings.add(serviceBinding);
service.addServiceBindings(serviceBindings);
+ Collection<String> findQualifiers = new ArrayList<String>();
+ findQualifiers.add(FindQualifier.AND_ALL_KEYS);
+ findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
+ ClassificationScheme cScheme = bqm.findClassificationSchemeByName(findQualifiers, "org.jboss.soa.esb.:category");
+ Classification classification = blm.createClassification(cScheme, "category", category);
+ service.addClassification(classification);
+
saveRegistryObject(serviceBinding);
} catch (Exception je) {
throw new RegistryException(je.getLocalizedMessage(), je);
@@ -237,33 +257,36 @@
*/
public void unRegisterEPR(String category, String serviceName, EPR toBeDeletedEPR) throws RegistryException{
//first find the ServiceBindings for this service
+ Connection connection = JAXRRegistryImpl.getConnection();
+ Service service = null;
try {
- Service service = findService(category, serviceName);
+ service = findService(category, serviceName);
+ if (service==null) {
+ throw new RegistryException("No such Service found for service with category= "
+ + category + " and name = " + serviceName);
+ }
+ connection.setCredentials(JAXRRegistryImpl.creds);
Collection serviceBindings = findServiceBindings(service);
service.addServiceBindings(serviceBindings);
for (Iterator i=serviceBindings.iterator();i.hasNext();){
ServiceBinding serviceBinding = (ServiceBinding) i.next();
String xml = URLDecoder.decode(serviceBinding.getAccessURI(), "UTF-8");
if (xml.equals(EPRHelper.toXMLString(toBeDeletedEPR))) {
- service.removeServiceBinding(serviceBinding);
- i.remove();
- service.setProvidingOrganization(getJBossESBOrganization());
- saveRegistryObject(service);
- //adding the other bindings back in. Workaround for this scout bug.
- for (Iterator j=service.getServiceBindings().iterator();j.hasNext();){
- serviceBinding = (ServiceBinding) j.next();
- serviceBinding.setKey(null);
- saveRegistryObject(serviceBinding);
- }
+ RegistryService rs = connection.getRegistryService();
+ BusinessLifeCycleManager blm = rs.getBusinessLifeCycleManager();
+ Collection<Key> serviceBindingKeys = new ArrayList<Key>();
+ serviceBindingKeys.add(serviceBinding.getKey());
+ blm.deleteServiceBindings(serviceBindingKeys);
return;
}
}
- //We should not end up here or else we did not match any EPRs
- throw new RegistryException("No such EPR found for service with name = "
- + serviceName + " and EPR=" + toBeDeletedEPR);
+ throw new RegistryException("No such EPR found for service with name = "
+ + serviceName + " and EPR=" + toBeDeletedEPR);
} catch (Exception je) {
throw new RegistryException(je.getLocalizedMessage(), je);
- }
+ } finally {
+ closeConnection(connection);
+ }
}
/**
@@ -428,17 +451,25 @@
// Get registry service and business query manager
RegistryService rs = connection.getRegistryService();
BusinessQueryManager bqm = rs.getBusinessQueryManager();
+ BusinessLifeCycleManager blm = rs.getBusinessLifeCycleManager();
// Define find qualifiers and name patterns
- Collection<String> findQualifiers = new ArrayList<String>();
- findQualifiers.add(FindQualifier.AND_ALL_KEYS);
- findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
+ Collection<String> findQualifiers = new ArrayList<String>();
+ findQualifiers.add(FindQualifier.AND_ALL_KEYS);
+ findQualifiers.add(FindQualifier.EXACT_NAME_MATCH);
+ findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
+ ClassificationScheme cScheme = bqm.findClassificationSchemeByName(findQualifiers, "org.jboss.soa.esb.:category");
+ Collection<Classification> classifications = new ArrayList<Classification>();
+ Classification classification =
+ blm.createClassification(
+ cScheme,
+ "category", category );
+ classifications.add(classification);
Collection<String> namePatterns = new ArrayList<String>();
- namePatterns.add(category);
namePatterns.add(serviceName);
//Find based upon qualifier type and values
logger.log(Priority.DEBUG, "Going to query the registry for name pattern " + namePatterns);
BulkResponse response = bqm.findServices(null, findQualifiers,
- namePatterns, null, null);
+ namePatterns, classifications, null);
if (response.getStatus()==JAXRResponse.STATUS_SUCCESS) {
for (Iterator servIter = response.getCollection().iterator(); servIter.hasNext();)
{
@@ -479,16 +510,27 @@
// Get registry service and business query manager
RegistryService rs = connection.getRegistryService();
BusinessQueryManager bqm = rs.getBusinessQueryManager();
+ BusinessLifeCycleManager blm = rs.getBusinessLifeCycleManager();
+ Collection<String> findQualifiers = new ArrayList<String>();
+ findQualifiers.add(FindQualifier.AND_ALL_KEYS);
+ findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
+ ClassificationScheme cScheme = bqm.findClassificationSchemeByName(findQualifiers, "org.jboss.soa.esb.:category");
+ //Create classification
+ Classification classification =
+ blm.createClassification(
+ cScheme,
+ "category", category );
+
// Define find qualifiers and name patterns
- Collection<String> findQualifiers = new ArrayList<String>();
- findQualifiers.add(FindQualifier.AND_ALL_KEYS);
+ //Collection<String> findQualifiers = new ArrayList<String>();
+ //findQualifiers.add(FindQualifier.AND_ALL_KEYS);
findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
- Collection<String> namePatterns = new ArrayList<String>();
- namePatterns.add(category);
+ Collection<Classification> classifications = new ArrayList<Classification>();
+ classifications.add(classification);
//Find based upon qualifier type and values
- logger.log(Priority.DEBUG, "Going to query the registry for name pattern " + namePatterns);
+ logger.log(Priority.DEBUG, "Going to query the registry for classification " + classifications);
BulkResponse response = bqm.findServices(null, findQualifiers,
- namePatterns, null, null);
+ null, classifications, null);
if (response.getStatus()==JAXRResponse.STATUS_SUCCESS) {
services = response.getCollection();
}
@@ -545,7 +587,7 @@
// ClassificationScheme cScheme = getClassificationScheme(blm,
// blm.createInternationalString("uddi-org:general_keywords"), blm.createInternationalString(""));
// Classification classification = blm.createClassification(cScheme,
- // blm..createInternationalString("JBoss ESB"), blm..createInternationalString("JBESB"));
+ // blm.createInternationalString("JBoss ESB"), blm.createInternationalString("JBESB"));
// org.addClassification(classification);
saveRegistryObject(organization);
@@ -630,11 +672,9 @@
*/
private Organization getJBossESBOrganization() throws JAXRException
{
+ jbossESBOrganization = findOrganization("Red Hat/JBossESB");
if (jbossESBOrganization==null) {
- jbossESBOrganization = findOrganization("Red Hat/JBossESB");
- if (jbossESBOrganization==null) {
- jbossESBOrganization = createJBossESBOrganization();
- }
+ jbossESBOrganization = createJBossESBOrganization();
}
return jbossESBOrganization;
}
Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java 2007-05-01 17:50:32 UTC (rev 11560)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java 2007-05-01 18:29:32 UTC (rev 11561)
@@ -99,7 +99,7 @@
for (Iterator i=services.iterator();i.hasNext();) {
String serviceName = (String) i.next();
logger.log(Priority.INFO, "Found service: " + serviceName);
- assertEquals(CATEGORY + ":" + SERVICE_NAME, serviceName);
+ assertEquals(SERVICE_NAME, serviceName);
}
} catch (RegistryException re) {
logger.log(Priority.ERROR, re.getLocalizedMessage(), re);
Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/juddi-unittest.properties
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/juddi-unittest.properties 2007-05-01 17:50:32 UTC (rev 11560)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/juddi-unittest.properties 2007-05-01 18:29:32 UTC (rev 11561)
@@ -42,6 +42,12 @@
juddi.jdbcUrl=jdbc:hsqldb:hsql://localhost/juddi
juddi.jdbcUsername=sa
juddi.jdbcPassword=
+#For Mysql use:
+#juddi.jdbcDriver=com.mysql.jdbc.Driver
+#juddi.jdbcUrl=jdbc:mysql://localhost/juddi?allowMultiQueries=true
+#juddi.jdbcUsername=root
+#juddi.jdbcPassword=
+
# jUDDI DataSource to use
juddi.dataSource=java:comp/env/jdbc/juddiDB
Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/daffodildb/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/daffodildb/create_database.sql 2007-05-01 17:50:32 UTC (rev 11560)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/daffodildb/create_database.sql 2007-05-01 18:29:32 UTC (rev 11561)
@@ -671,6 +671,9 @@
INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
VALUES ('uuid:AD61DE98-4DB8-31B2-A299-A2373DC97212',0,'en','The WSDL Address tModel provides A mechanism to indicate that the endpoint address should be obtained from a WSDL document.');
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURTIMESTAMP());
+
Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/db2/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/db2/create_database.sql 2007-05-01 17:50:32 UTC (rev 11560)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/db2/create_database.sql 2007-05-01 18:29:32 UTC (rev 11561)
@@ -698,4 +698,7 @@
INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
VALUES ('uuid:AD61DE98-4DB8-31B2-A299-A2373DC97212',0,'en','The WSDL Address tModel provides A mechanism to indicate that the endpoint address should be obtained from a WSDL document.');
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURRENT TIMESTAMP);
+
Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/derby/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/derby/create_database.sql 2007-05-01 17:50:32 UTC (rev 11560)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/derby/create_database.sql 2007-05-01 18:29:32 UTC (rev 11561)
@@ -698,4 +698,7 @@
INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
VALUES ('uuid:AD61DE98-4DB8-31B2-A299-A2373DC97212',0,'en','The WSDL Address tModel provides A mechanism to indicate that the endpoint address should be obtained from a WSDL document.');
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURRENT TIMESTAMP);
+
Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/firebird/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/firebird/create_database.sql 2007-05-01 17:50:32 UTC (rev 11560)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/firebird/create_database.sql 2007-05-01 18:29:32 UTC (rev 11561)
@@ -626,7 +626,10 @@
INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
VALUES ('uuid:AD61DE98-4DB8-31B2-A299-A2373DC97212',0,'en','The WSDL Address tModel provides A mechanism to indicate that the endpoint address should be obtained from a WSDL document.');
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURRENT_DATE);
+
COMMIT WORK;
/******************************************************************************/
Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/hsqldb/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/hsqldb/create_database.sql 2007-05-01 17:50:32 UTC (rev 11560)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/hsqldb/create_database.sql 2007-05-01 18:29:32 UTC (rev 11561)
@@ -666,6 +666,8 @@
INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
VALUES ('uuid:AD61DE98-4DB8-31B2-A299-A2373DC97212',0,'en','The WSDL Address tModel provides A mechanism to indicate that the endpoint address should be obtained from a WSDL document.');
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURDATE());
Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/informix/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/informix/create_database.sql 2007-05-01 17:50:32 UTC (rev 11560)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/informix/create_database.sql 2007-05-01 18:29:32 UTC (rev 11561)
@@ -704,3 +704,6 @@
INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
VALUES ('uuid:AD61DE98-4DB8-31B2-A299-A2373DC97212',0,'en','The WSDL Address tModel provides A mechanism to indicate that the endpoint address should be obtained from a WSDL document.');
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME)
+VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category');
+
Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/jdatastore/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/jdatastore/create_database.sql 2007-05-01 17:50:32 UTC (rev 11560)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/jdatastore/create_database.sql 2007-05-01 18:29:32 UTC (rev 11561)
@@ -695,3 +695,6 @@
INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
VALUES ('uuid:AD61DE98-4DB8-31B2-A299-A2373DC97212',0,'en','The WSDL Address tModel provides A mechanism to indicate that the endpoint address should be obtained from a WSDL document.');
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURRENT_DATE);
Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/mysql/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/mysql/create_database.sql 2007-05-01 17:50:32 UTC (rev 11560)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/mysql/create_database.sql 2007-05-01 18:29:32 UTC (rev 11561)
@@ -1,4 +1,4 @@
-CREATE DATABASE juddi;
+CREATE DATABASE IF NOT EXISTS juddi;
-- GRANT ALL ON juddi.* TO juddi@"%" IDENTIFIED BY "juddi";
-- GRANT ALL ON juddi.* TO juddi@"localhost" IDENTIFIED BY "juddi";
@@ -676,4 +676,6 @@
INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
VALUES ('uuid:AD61DE98-4DB8-31B2-A299-A2373DC97212',0,'en','The WSDL Address tModel provides A mechanism to indicate that the endpoint address should be obtained from a WSDL document.');
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,NULL);
Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/oracle/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/oracle/create_database.sql 2007-05-01 17:50:32 UTC (rev 11560)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/oracle/create_database.sql 2007-05-01 18:29:32 UTC (rev 11561)
@@ -756,4 +756,7 @@
VALUES ('uuid:AD61DE98-4DB8-31B2-A299-A2373DC97212',0,'en','A tModel used to indicate the WSDL address option.');
INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
-VALUES ('uuid:AD61DE98-4DB8-31B2-A299-A2373DC97212',0,'en','The WSDL Address tModel provides A mechanism to indicate that the endpoint address should be obtained from a WSDL document.');
\ No newline at end of file
+VALUES ('uuid:AD61DE98-4DB8-31B2-A299-A2373DC97212',0,'en','The WSDL Address tModel provides A mechanism to indicate that the endpoint address should be obtained from a WSDL document.');
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,SYSDATE);
Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/postgresql/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/postgresql/create_database.sql 2007-05-01 17:50:32 UTC (rev 11560)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/postgresql/create_database.sql 2007-05-01 18:29:32 UTC (rev 11561)
@@ -700,3 +700,6 @@
INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
VALUES ('uuid:6E090AFA-33E5-36EB-81B7-1CA18373F457',1,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','categorization');
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL)
+VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL);
+
Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/sybase/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/sybase/create_database.sql 2007-05-01 17:50:32 UTC (rev 11560)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/sybase/create_database.sql 2007-05-01 18:29:32 UTC (rev 11561)
@@ -697,4 +697,6 @@
INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
VALUES ('uuid:AD61DE98-4DB8-31B2-A299-A2373DC97212',0,'en','The WSDL Address tModel provides A mechanism to indicate that the endpoint address should be obtained from a WSDL document.');
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,getDate());
Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/totalxml/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/totalxml/create_database.sql 2007-05-01 17:50:32 UTC (rev 11560)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/totalxml/create_database.sql 2007-05-01 18:29:32 UTC (rev 11561)
@@ -697,5 +697,8 @@
INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
VALUES ('uuid:AD61DE98-4DB8-31B2-A299-A2373DC97212',0,'en','The WSDL Address tModel provides A mechanism to indicate that the endpoint address should be obtained from a WSDL document.');
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURRENT_TIMESTAMP);
+
commit;
Modified: labs/jbossesb/trunk/product/lib/ext/scout-1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/ContentBasedRouterTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/ContentBasedRouterTest.java 2007-05-01 17:50:32 UTC (rev 11560)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/ContentBasedRouterTest.java 2007-05-01 18:29:32 UTC (rev 11561)
@@ -78,7 +78,7 @@
private static final String SERVICE_CATEGORY_NAME = "MessageRouting";
- private static final String SERVICE_NAME = "ContentBasedRouterService";
+ private static final String SERVICE_NAME = "ContentBasedRoutingService";
/**
* Testing the Content Based Router.
More information about the jboss-svn-commits
mailing list