You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2009/10/15 20:36:29 UTC
svn commit: r825609 - in /webservices/juddi/trunk:
juddi-client/src/main/java/org/apache/juddi/v3/annotations/
juddi-core/src/main/java/org/apache/juddi/config/
juddiv3-samples/src/main/java/org/apache/juddi/samples/
juddiv3-samples/src/main/resources/...
Author: kstam
Date: Thu Oct 15 18:36:27 2009
New Revision: 825609
URL: http://svn.apache.org/viewvc?rev=825609&view=rev
Log:
JUDDI-240
- setting up data for the "sales" and for the "marketing" affiliates
- catching exceptions caused by loading badly configured root data
- adding juddi.load.install.data flag to prevent other wars then juddiv3 to preload the UDDI
- adding some more properties to the helloWorld annotation example.
Added:
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketing_BusinessEntity.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketing_Publisher.xml
- copied, changed from r825474, webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketinglistener_Publisher.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketing_tModels.xml
- copied, changed from r825474, webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketinglistener_tModels.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/sales_Publisher.xml (contents, props changed)
- copied, changed from r825474, webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/saleslistener_Publisher.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/sales_tModels.xml (contents, props changed)
- copied, changed from r825474, webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/saleslistener_tModels.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketing_Publisher.xml (contents, props changed)
- copied, changed from r825474, webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketinglistener_Publisher.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketing_tModels.xml (contents, props changed)
- copied, changed from r825474, webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketinglistener_tModels.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/sales_BusinessEntity.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/sales_Publisher.xml
- copied, changed from r825474, webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/saleslistener_Publisher.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/sales_tModels.xml
- copied, changed from r825474, webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/saleslistener_tModels.xml
Removed:
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/itmark_Publisher.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/itmark_tModelKeyGen.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketinglistener_Publisher.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketinglistener_tModels.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/saleslistener_Publisher.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/saleslistener_tModels.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/itsales_Publisher.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/itsales_tModelKeyGen.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketinglistener_Publisher.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketinglistener_tModels.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/saleslistener_Publisher.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/saleslistener_tModels.xml
Modified:
webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/annotations/AnnotationProcessor.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java
webservices/juddi/trunk/juddiv3-samples/src/main/java/org/apache/juddi/samples/HelloWorldImpl.java
webservices/juddi/trunk/juddiv3-samples/src/main/resources/META-INF/uddi.xml
webservices/juddi/trunk/juddiv3-samples/src/main/webapp/WEB-INF/classes/juddiv3.properties
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/root_BusinessEntity.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/root_tModelKeyGen.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/root_BusinessEntity.xml
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/root_tModelKeyGen.xml
Modified: webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/annotations/AnnotationProcessor.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/annotations/AnnotationProcessor.java?rev=825609&r1=825608&r2=825609&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/annotations/AnnotationProcessor.java (original)
+++ webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/annotations/AnnotationProcessor.java Thu Oct 15 18:36:27 2009
@@ -58,10 +58,10 @@
}
Name name = new Name();
name.setLang(lang);
- service.setBusinessKey(uddiService.businessKey());
- service.setServiceKey(uddiService.serviceKey());
+ service.setBusinessKey(TokenResolver.replaceTokens(uddiService.businessKey(),properties));
+ service.setServiceKey(TokenResolver.replaceTokens(uddiService.serviceKey(),properties));
if (!"".equals(uddiService.serviceName())) {
- name.setValue(uddiService.serviceName());
+ name.setValue(TokenResolver.replaceTokens(uddiService.serviceName(),properties));
} else if (webServiceAnnotation!=null && !"".equals(webServiceAnnotation.serviceName())) {
name.setValue(webServiceAnnotation.serviceName());
} else {
@@ -70,7 +70,7 @@
service.getName().add(name);
Description description = new Description();
description.setLang(lang);
- description.setValue(uddiService.description());
+ description.setValue(TokenResolver.replaceTokens(uddiService.description(),properties));
service.getDescription().add(description);
//categoryBag on the service
@@ -107,15 +107,15 @@
if (uddiServiceBinding!=null) {
bindingTemplate = new BindingTemplate();
- bindingTemplate.setBindingKey(uddiServiceBinding.bindingKey());
+ bindingTemplate.setBindingKey(TokenResolver.replaceTokens(uddiServiceBinding.bindingKey(), properties));
String bindingLang = String.valueOf(lang);
if (uddiServiceBinding.lang()!=null) {
- bindingLang = uddiServiceBinding.lang();
+ bindingLang = TokenResolver.replaceTokens(uddiServiceBinding.lang(),properties);
}
Description bindingDescription = new Description();
bindingDescription.setLang(bindingLang);
- bindingDescription.setValue(uddiServiceBinding.description());
+ bindingDescription.setValue(TokenResolver.replaceTokens(uddiServiceBinding.description(),properties));
bindingTemplate.getDescription().add(bindingDescription);
AccessPoint accessPoint = new AccessPoint();
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java?rev=825609&r1=825608&r2=825609&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java Thu Oct 15 18:36:27 2009
@@ -16,13 +16,11 @@
*/
package org.apache.juddi.config;
-import java.io.IOException;
import java.util.List;
import java.util.Properties;
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
-import javax.xml.bind.JAXBException;
import org.apache.commons.configuration.CompositeConfiguration;
import org.apache.commons.configuration.Configuration;
@@ -39,7 +37,6 @@
import org.apache.log4j.Logger;
import org.uddi.api_v3.CategoryBag;
import org.uddi.api_v3.KeyedReference;
-import org.uddi.v3_service.DispositionReportFaultMessage;
/**
* Handles the application level configuration for jUDDI. By default it first
@@ -101,22 +98,18 @@
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
try {
- tx.begin();
- if (!Install.alreadyInstalled(em, config)) {
+ if (!Install.alreadyInstalled(config)) {
log.info("The 'root' publisher was not found, loading...");
try {
Install.install(config);
- } catch (JAXBException e) {
- throw new ConfigurationException(e);
- } catch (DispositionReportFaultMessage e) {
- throw new ConfigurationException(e);
- } catch (IOException e) {
+ } catch (Exception e) {
throw new ConfigurationException(e);
+ } catch (Throwable t) {
+ throw new ConfigurationException(t);
}
-
}
- tx.commit();
+
tx.begin();
String rootPublisherStr = config.getString(Property.JUDDI_ROOT_PUBLISHER);
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java?rev=825609&r1=825608&r2=825609&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java Thu Oct 15 18:36:27 2009
@@ -87,7 +87,7 @@
try {
tx.begin();
- if (alreadyInstalled(em, config))
+ if (alreadyInstalled(config))
new FatalErrorException(new ErrorMessage("errors.install.AlreadyInstalled"));
String rootPublisherStr = config.getString(Property.JUDDI_ROOT_PUBLISHER);
@@ -161,38 +161,51 @@
}
+ /**
+ * Checks if there is a database with a root publisher. If it is not found
+ * an
+ *
+ * @param em
+ * @param config
+ * @return true if it finds a database with the root publisher in it.
+ * @throws ConfigurationException
+ */
protected static boolean alreadyInstalled(Configuration config) throws ConfigurationException {
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
-
- boolean result = alreadyInstalled(em, config);
-
- tx.commit();
- return result;
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- }
-
- protected static boolean alreadyInstalled(EntityManager em, Configuration config) throws ConfigurationException {
String rootPublisherStr = config.getString(Property.JUDDI_ROOT_PUBLISHER);
- org.apache.juddi.model.Publisher publisher = em.find(org.apache.juddi.model.Publisher.class, rootPublisherStr);
- if (publisher != null)
- return true;
-
- List<String> publishers = getPublishers(config);
- for (String publisherStr : publishers) {
- publisher = em.find(org.apache.juddi.model.Publisher.class, publisherStr);
- if (publisher != null)
- return true;
+ org.apache.juddi.model.Publisher publisher = null;
+ int numberOfTries=0;
+ while (numberOfTries++ < 20) {
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+ publisher = em.find(org.apache.juddi.model.Publisher.class, rootPublisherStr);
+ tx.commit();
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ if (publisher != null) return true;
+
+ if (config.getBoolean(Property.JUDDI_LOAD_INSTALL_DATA,Property.DEFAULT_LOAD_INSTALL_DATA)) {
+ log.debug("Install data not yet installed.");
+ break;
+ } else {
+ try {
+ log.info("Install data not yet installed.");
+ log.info("Going to sleep and retry...");
+ Thread.sleep(5000l);
+ } catch (InterruptedException e) {
+ log.error(e.getMessage(),e);
+ }
+ }
+ }
+ if (numberOfTries>=19) {
+ throw new ConfigurationException("Could not load the Root node data. Please check for errors.");
}
-
return false;
}
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java?rev=825609&r1=825608&r2=825609&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java Thu Oct 15 18:36:27 2009
@@ -3,6 +3,7 @@
public interface Property
{
public final static String JUDDI_ROOT_PUBLISHER ="juddi.root.publisher";
+ public final static String JUDDI_LOAD_INSTALL_DATA ="juddi.load.install.data";
public final static String JUDDI_PERSISTENCEUNIT_NAME ="juddi.persistenceunit.name";
public final static String JUDDI_AUTHENTICATOR ="juddi.authenticator";
public final static String JUDDI_CONFIGURATION_RELOAD_DELAY ="juddi.configuration.reload.delay";
@@ -36,5 +37,6 @@
public final static String DEFAULT_XML_USERSFILE ="juddi-users.xml";
public final static String DEFAULT_ENCRYPTED_XML_USERSFILE ="juddi-users-encrypted.xml";
public final static String DEFAULT_SECURITY_DOMAIN ="java:/jaas/other";
+ public final static boolean DEFAULT_LOAD_INSTALL_DATA =true;
}
Modified: webservices/juddi/trunk/juddiv3-samples/src/main/java/org/apache/juddi/samples/HelloWorldImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-samples/src/main/java/org/apache/juddi/samples/HelloWorldImpl.java?rev=825609&r1=825608&r2=825609&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-samples/src/main/java/org/apache/juddi/samples/HelloWorldImpl.java (original)
+++ webservices/juddi/trunk/juddiv3-samples/src/main/java/org/apache/juddi/samples/HelloWorldImpl.java Thu Oct 15 18:36:27 2009
@@ -7,12 +7,12 @@
@UDDIService(
- businessKey="uddi:juddi.apache.org:businesses-asf",
- serviceKey="uddi:juddi.apache.org:services-helloworld",
+ businessKey="uddi:${keyDomain}:{department}-asf",
+ serviceKey="uddi:${keyDomain}:services-hello${department}",
description = "Hello World test service")
@UDDIServiceBinding(
- bindingKey="uddi:juddi.apache.org:bindings-helloworld-wsdl",
- description="WSDL endpoint for the HelloWorld Service. This service is used for "
+ bindingKey="uddi:${keyDomain}:bindings-hello${department}-wsdl",
+ description="WSDL endpoint for the hello${department} Service. This service is used for "
+ "testing the jUDDI annotation functionality",
accessPointType="wsdlDeployment",
accessPoint="http://${serverName}:${serverPort}/juddiv3-samples/services/helloworld?wsdl")
Modified: webservices/juddi/trunk/juddiv3-samples/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-samples/src/main/resources/META-INF/uddi.xml?rev=825609&r1=825608&r2=825609&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-samples/src/main/resources/META-INF/uddi.xml (original)
+++ webservices/juddi/trunk/juddiv3-samples/src/main/resources/META-INF/uddi.xml Thu Oct 15 18:36:27 2009
@@ -8,8 +8,10 @@
<name>default</name>
<description>Main jUDDI node</description>
<properties>
- <property name="serverName" value="localhost"/>
- <property name="serverPort" value="8080"/>
+ <property name="serverName" value="localhost"/>
+ <property name="serverPort" value="8080"/>
+ <property name="keyDomain" value="juddi.apache.org"/>
+ <property name="department" value="businesses" />
</properties>
<proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
<custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
Modified: webservices/juddi/trunk/juddiv3-samples/src/main/webapp/WEB-INF/classes/juddiv3.properties
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-samples/src/main/webapp/WEB-INF/classes/juddiv3.properties?rev=825609&r1=825608&r2=825609&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-samples/src/main/webapp/WEB-INF/classes/juddiv3.properties (original)
+++ webservices/juddi/trunk/juddiv3-samples/src/main/webapp/WEB-INF/classes/juddiv3.properties Thu Oct 15 18:36:27 2009
@@ -7,6 +7,7 @@
################################################################
#
juddi.root.publisher=root
+juddi.load.install.data=false
#
# Name of the persistence unit to use (the default, "juddiDatabase" refers to the unit compiled into the juddi library)
juddi.persistenceunit.name=juddiDatabase
@@ -69,10 +70,11 @@
#
# Specifies the interval at which the notification timer triggers
juddi.notification.interval=5000
-#
-# Specifies the amount of time to wait before the notification timer initially f
-ires
+# Specifies the amount of time to wait before the notification timer initially fires
juddi.notification.start.buffer=20000
+# Specifies UDDIs to which we subscribe
+juddi.subscription.service=uddi:sales.apache.org:services-subscription
+#juddi.subscription.service=uddi:marketing.apache.org:services-subscription
#
# These two tokens are referenced in the install data. Note that you
Added: webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketing_BusinessEntity.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketing_BusinessEntity.xml?rev=825609&view=auto
==============================================================================
--- webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketing_BusinessEntity.xml (added)
+++ webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketing_BusinessEntity.xml Thu Oct 15 18:36:27 2009
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+ <!--
+ This file contains the root business entity structure that represents your registry. The key chosen (or generated) for this entity will serve
+ as the node id for all entities published within the registry. The services contained within this business entity reflect the UDDI APIs that
+ you wish to support (adding or subtracting the services here will not enable/disable them, simply add/omit them from being discovered via UDDI).
+
+ The top-level business entity and sub-entities all use keys as unique identifiers. They are left blank by default which means the system will
+ generate a key (generated as root partition with GUID appended). You can choose to create your own, human-readable keys but they must match
+ the root key generator created in the root_tModelKeyGen.xml file. Matching means they must equal the root key generator with the keyword
+ "keygenerator" replaced by your own string.
+
+ Example:
+
+ root_tModelKeyGen.xml key is uddi:www.mycompany.com:registry:keygenerator
+
+ Legal user-defined keys are:
+
+ uddi:www.mycompany.com:registry:ubr-node (for the businessKey)
+ uddi:www.mycompany.com:registry:inquiry-service (for the inquiry service service key)
+ uddi:www.mycompany.com:registry:inquiry-service-wsdlDeployment (for the inquiry service binding template that represents the WSDL)
+
+
+ See below for other fields that you may want to edit...
+ -->
+<businessEntity xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" businessKey="uddi:marketing.apache.org:marketing-asf">
+ <!-- Change the name field to represent the name of your registry -->
+ <name xml:lang="en">Marketing Node</name>
+ <!-- Change the description field to provided a brief description of your registry -->
+ <description xml:lang="en">This is a UDDI v3 registry for Marketing</description>
+ <discoveryURLs>
+ <!-- This discovery URL should point to the home installation URL of jUDDI -->
+ <discoveryURL useType="home">http://${juddi.server.name}:${juddi.server.port}/juddiv3</discoveryURL>
+ </discoveryURLs>
+ <businessServices>
+ <!-- As mentioned above, you may want to provide user-defined keys for these (and the services/bindingTemplates below. Services that you
+ don't intend to support should be removed entirely -->
+ <businessService serviceKey="uddi:marketing.apache.org:services-subscriptionlistener" businessKey="uddi:marketing.apache.org:marketing-asf">
+ <name xml:lang="en">Marketing Subscription Listener Service</name>
+ <description xml:lang="en">Web Service supporting UDDI Subscription Listener API</description>
+ <bindingTemplates>
+ <bindingTemplate bindingKey="uddi:marketing.apache.org:servicebindings-subscriptionlistener-ws" serviceKey="uddi:marketing.apache.org:services-subscriptionlistener">
+ <description>UDDI Subscription Listener API V3</description>
+ <accessPoint useType="wsdlDeployment">http://${juddi.server.name}:${juddi.server.port}/juddiv3/services/subscription-listener?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_subscriptionlistener" />
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+ </bindingTemplates>
+ </businessService>
+ </businessServices>
+</businessEntity>
+
+
+
+
Copied: webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketing_Publisher.xml (from r825474, webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketinglistener_Publisher.xml)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketing_Publisher.xml?p2=webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketing_Publisher.xml&p1=webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketinglistener_Publisher.xml&r1=825474&r2=825609&rev=825609&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketinglistener_Publisher.xml (original)
+++ webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketing_Publisher.xml Thu Oct 15 18:36:27 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/ -->
-<publisher xmlns="urn:juddi-apache-org:api_v3" authorizedName="marketinglistener">
+<publisher xmlns="urn:juddi-apache-org:api_v3" authorizedName="marketing">
<publisherName>Marketing Listener Publisher</publisherName>
<isAdmin>false</isAdmin>
</publisher>
Copied: webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketing_tModels.xml (from r825474, webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketinglistener_tModels.xml)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketing_tModels.xml?p2=webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketing_tModels.xml&p1=webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketinglistener_tModels.xml&r1=825474&r2=825609&rev=825609&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketinglistener_tModels.xml (original)
+++ webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/marketing_tModels.xml Thu Oct 15 18:36:27 2009
@@ -17,8 +17,8 @@
*/ -->
<save_tModel xmlns="urn:uddi-org:api_v3">
<tModel tModelKey="uddi:marketing.apache.org:keygenerator" xmlns="urn:uddi-org:api_v3">
- <name>uddi-org:keyGenerator</name>
- <description>Marketing Root domain key generator</description>
+ <name>marketing-apache-org:keyGenerator</name>
+ <description>Marketing domain key generator</description>
<overviewDoc>
<overviewURL useType="text">
http://uddi.org/pubs/uddi_v3.htm#keyGen</overviewURL>
@@ -28,21 +28,20 @@
keyValue="keyGenerator" />
</categoryBag>
</tModel>
- <tModel tModelKey="uddi:it.sales.apache.org:keygenerator"
- xmlns="urn:uddi-org:api_v3">
- <name>uddi-org:keyGenerator</name>
- <description>IT Sales domain key generator</description>
- <overviewDoc>
- <overviewURL useType="text">
- http://uddi.org/pubs/uddi_v3.htm#keyGen</overviewURL>
- </overviewDoc>
- <categoryBag>
- <keyedReference tModelKey="uddi:uddi.org:categorization:types"
- keyName="uddi-org:types:keyGenerator" keyValue="keyGenerator" />
- </categoryBag>
+ <tModel tModelKey="uddi:marketing-subs.apache.org:keygenerator" xmlns="urn:uddi-org:api_v3">
+ <name>marketing-apache-org:subscription:keyGenerator</name>
+ <description>Marketing Subscriptions domain key generator</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#keyGen</overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
+ keyValue="keyGenerator" />
+ </categoryBag>
</tModel>
<tModel tModelKey="uddi:sales.apache.org:keygenerator" xmlns="urn:uddi-org:api_v3">
- <name>uddi-org:keyGenerator</name>
+ <name>sales-apache-org:keyGenerator</name>
<description>Sales Root domain key generator</description>
<overviewDoc>
<overviewURL useType="text">
Modified: webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/root_BusinessEntity.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/root_BusinessEntity.xml?rev=825609&r1=825608&r2=825609&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/root_BusinessEntity.xml (original)
+++ webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/root_BusinessEntity.xml Thu Oct 15 18:36:27 2009
@@ -38,9 +38,9 @@
See below for other fields that you may want to edit...
-->
-<businessEntity xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" businessKey="uddi:marketing.apache.org:businesses-asf">
+<businessEntity xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" businessKey="uddi:juddi.apache.org:business-marketing-asf">
<!-- Change the name field to represent the name of your registry -->
- <name xml:lang="en">An Apache jUDDI Node</name>
+ <name xml:lang="en">An Root Marketing jUDDI Node</name>
<!-- Change the description field to provided a brief description of your registry -->
<description xml:lang="en">This is a UDDI v3 registry node as implemented by Apache jUDDI.</description>
<discoveryURLs>
@@ -53,11 +53,11 @@
<businessServices>
<!-- As mentioned above, you may want to provide user-defined keys for these (and the services/bindingTemplates below. Services that you
don't intend to support should be removed entirely -->
- <businessService serviceKey="uddi:marketing.apache.org:services-inquiry" businessKey="uddi:marketing.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-inquiry" businessKey="uddi:juddi.apache.org:business-marketing-asf">
<name xml:lang="en">UDDI Inquiry Service</name>
<description xml:lang="en">Web Service supporting UDDI Inquiry API</description>
<bindingTemplates>
- <bindingTemplate bindingKey="uddi:marketing.apache.org:servicebindings-inquiry-ws" serviceKey="uddi:marketing.apache.org:services-inquiry">
+ <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-inquiry-ws" serviceKey="uddi:juddi.apache.org:services-inquiry">
<description>UDDI Inquiry API V3</description>
<!-- This should be changed to the WSDL URL of the inquiry API. An access point inside a bindingTemplate will be found for every service
in this file. They all must point to their API's WSDL URL -->
@@ -84,11 +84,11 @@
</bindingTemplate>
</bindingTemplates>
</businessService>
- <businessService serviceKey="uddi:marketing.apache.org:services-publish" businessKey="uddi:marketing.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-publish" businessKey="uddi:juddi.apache.org:business-marketing-asf">
<name xml:lang="en">UDDI Publish Service</name>
<description xml:lang="en">Web Service supporting UDDI Publish API</description>
<bindingTemplates>
- <bindingTemplate bindingKey="uddi:marketing.apache.org:servicebindings-publish-ws" serviceKey="uddi:marketing.apache.org:services-publish">
+ <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-publish-ws" serviceKey="uddi:juddi.apache.org:services-publish">
<description>UDDI Publication API V3</description>
<accessPoint useType="wsdlDeployment">http://${juddi.server.name}:${juddi.server.port}/juddiv3/services/publish?wsdl</accessPoint>
<tModelInstanceDetails>
@@ -111,11 +111,11 @@
</bindingTemplate>
</bindingTemplates>
</businessService>
- <businessService serviceKey="uddi:marketing.apache.org:services-security" businessKey="uddi:marketing.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-security" businessKey="uddi:juddi.apache.org:business-marketing-asf">
<name xml:lang="en">UDDI Security Service</name>
<description xml:lang="en">Web Service supporting UDDI Security API</description>
<bindingTemplates>
- <bindingTemplate bindingKey="uddi:marketing.apache.org:servicebindings-security-ws" serviceKey="uddi:marketing.apache.org:services-security">
+ <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-security-ws" serviceKey="uddi:juddi.apache.org:services-security">
<description>UDDI Security API V3</description>
<accessPoint useType="wsdlDeployment">http://${juddi.server.name}:${juddi.server.port}/juddiv3/services/security?wsdl</accessPoint>
<tModelInstanceDetails>
@@ -127,11 +127,11 @@
</bindingTemplate>
</bindingTemplates>
</businessService>
- <businessService serviceKey="uddi:marketing.apache.org:services-custodytransfer" businessKey="uddi:marketing.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-custodytransfer" businessKey="uddi:juddi.apache.org:business-marketing-asf">
<name xml:lang="en">UDDI Custody and Ownership Transfer Service</name>
<description xml:lang="en">Web Service supporting UDDI Custody and Ownership Transfer API</description>
<bindingTemplates>
- <bindingTemplate bindingKey="uddi:marketing.apache.org:servicebindings-custodytransfer-ws" serviceKey="uddi:marketing.apache.org:services-custodytransfer">
+ <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-custodytransfer-ws" serviceKey="uddi:juddi.apache.org:services-custodytransfer">
<description>UDDI Custody and Ownership Transfer API V3</description>
<accessPoint useType="wsdlDeployment">http://${juddi.server.name}:${juddi.server.port}/juddiv3/services/custody-transfer?wsdl</accessPoint>
<tModelInstanceDetails>
@@ -155,11 +155,11 @@
</bindingTemplate>
</bindingTemplates>
</businessService>
- <businessService serviceKey="uddi:marketing.apache.org:services-subscription" businessKey="uddi:marketing.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-subscription" businessKey="uddi:juddi.apache.org:business-marketing-asf">
<name xml:lang="en">UDDI Subscription Service</name>
<description xml:lang="en">Web Service supporting UDDI Subscription API</description>
<bindingTemplates>
- <bindingTemplate bindingKey="uddi:marketing.apache.org:servicebindings-subscription-ws" serviceKey="uddi:marketing.apache.org:services-subscription">
+ <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-subscription-ws" serviceKey="uddi:juddi.apache.org:services-subscription">
<description>UDDI Subscription API V3</description>
<accessPoint useType="wsdlDeployment">http://${juddi.server.name}:${juddi.server.port}/juddiv3/services/subscription?wsdl</accessPoint>
<tModelInstanceDetails>
@@ -184,27 +184,11 @@
</bindingTemplate>
</bindingTemplates>
</businessService>
- <businessService serviceKey="uddi:marketing.apache.org:services-subscriptionlistener" businessKey="uddi:marketing.apache.org:businesses-asf">
- <name xml:lang="en">UDDI Subscription Listener Service</name>
- <description xml:lang="en">Web Service supporting UDDI Subscription Listener API</description>
- <bindingTemplates>
- <bindingTemplate bindingKey="uddi:marketing.apache.org:servicebindings-subscriptionlistener-ws" serviceKey="uddi:marketing.apache.org:services-subscriptionlistener">
- <description>UDDI Subscription Listener API V3</description>
- <accessPoint useType="wsdlDeployment">http://${juddi.server.name}:${juddi.server.port}/juddiv3/services/subscription-listener?wsdl</accessPoint>
- <tModelInstanceDetails>
- <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_subscriptionlistener" />
- </tModelInstanceDetails>
- <categoryBag>
- <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
- </categoryBag>
- </bindingTemplate>
- </bindingTemplates>
- </businessService>
- <businessService serviceKey="uddi:marketing.apache.org:services-publisher" businessKey="uddi:marketing.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-publisher" businessKey="uddi:juddi.apache.org:business-marketing-asf">
<name xml:lang="en">jUDDI Publisher Service</name>
<description xml:lang="en">Web Service supporting jUDDI specific API</description>
<bindingTemplates>
- <bindingTemplate bindingKey="uddi:marketing.apache.org:servicebindings-publisher-ws" serviceKey="uddi:marketing.apache.org:services-publisher">
+ <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-publisher-ws" serviceKey="uddi:juddi.apache.org:services-publisher">
<description>jUDDI Publisher Service API V3</description>
<accessPoint useType="wsdlDeployment">http://${juddi.server.name}:${juddi.server.port}/juddiv3/services/publisher?wsdl</accessPoint>
<categoryBag>
Modified: webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/root_tModelKeyGen.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/root_tModelKeyGen.xml?rev=825609&r1=825608&r2=825609&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/root_tModelKeyGen.xml (original)
+++ webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/root_tModelKeyGen.xml Thu Oct 15 18:36:27 2009
@@ -26,7 +26,7 @@
uddi:uddi.acme.com:keygenerator
uddi:engineering.umich.edu:soa:ubr:keygenerator
-->
-<tModel tModelKey="uddi:marketing.apache.org:keygenerator" xmlns="urn:uddi-org:api_v3">
+<tModel tModelKey="uddi:juddi.apache.org:keygenerator" xmlns="urn:uddi-org:api_v3">
<name>uddi-org:keyGenerator</name>
<description>Root domain key generator</description>
<overviewDoc>
Copied: webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/sales_Publisher.xml (from r825474, webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/saleslistener_Publisher.xml)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/sales_Publisher.xml?p2=webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/sales_Publisher.xml&p1=webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/saleslistener_Publisher.xml&r1=825474&r2=825609&rev=825609&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/saleslistener_Publisher.xml (original)
+++ webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/sales_Publisher.xml Thu Oct 15 18:36:27 2009
@@ -15,8 +15,8 @@
* limitations under the License.
*
*/ -->
-<publisher xmlns="urn:juddi-apache-org:api_v3" authorizedName="saleslistener">
- <publisherName>Sales Listener Publisher</publisherName>
+<publisher xmlns="urn:juddi-apache-org:api_v3" authorizedName="sales">
+ <publisherName>Sales Publisher</publisherName>
<isAdmin>false</isAdmin>
</publisher>
Propchange: webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/sales_Publisher.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 15 18:36:27 2009
@@ -0,0 +1 @@
+/webservices/juddi/branches/v3_trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/saleslistener_Publisher.xml:797614-802957
Copied: webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/sales_tModels.xml (from r825474, webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/saleslistener_tModels.xml)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/sales_tModels.xml?p2=webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/sales_tModels.xml&p1=webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/saleslistener_tModels.xml&r1=825474&r2=825609&rev=825609&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/saleslistener_tModels.xml (original)
+++ webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/sales_tModels.xml Thu Oct 15 18:36:27 2009
@@ -16,9 +16,9 @@
*
*/ -->
<save_tModel xmlns="urn:uddi-org:api_v3">
- <tModel tModelKey="uddi:sales.apache.org:keygenerator" xmlns="urn:uddi-org:api_v3">
+ <tModel tModelKey="uddi:sales.apache.org:subscription:keygenerator" xmlns="urn:uddi-org:api_v3">
<name>uddi-org:keyGenerator</name>
- <description>Sales Root domain key generator</description>
+ <description>Sales domain key generator</description>
<overviewDoc>
<overviewURL useType="text">
http://uddi.org/pubs/uddi_v3.htm#keyGen</overviewURL>
Propchange: webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/sales_tModels.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 15 18:36:27 2009
@@ -0,0 +1 @@
+/webservices/juddi/branches/v3_trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/saleslistener_tModels.xml:797614-802957
Copied: webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketing_Publisher.xml (from r825474, webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketinglistener_Publisher.xml)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketing_Publisher.xml?p2=webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketing_Publisher.xml&p1=webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketinglistener_Publisher.xml&r1=825474&r2=825609&rev=825609&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketinglistener_Publisher.xml (original)
+++ webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketing_Publisher.xml Thu Oct 15 18:36:27 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/ -->
-<publisher xmlns="urn:juddi-apache-org:api_v3" authorizedName="marketinglistener">
+<publisher xmlns="urn:juddi-apache-org:api_v3" authorizedName="marketing">
<publisherName>Marketing Listener Publisher</publisherName>
<isAdmin>false</isAdmin>
</publisher>
Propchange: webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketing_Publisher.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 15 18:36:27 2009
@@ -0,0 +1 @@
+/webservices/juddi/branches/v3_trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketinglistener_Publisher.xml:797614-802957
Copied: webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketing_tModels.xml (from r825474, webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketinglistener_tModels.xml)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketing_tModels.xml?p2=webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketing_tModels.xml&p1=webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketinglistener_tModels.xml&r1=825474&r2=825609&rev=825609&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketinglistener_tModels.xml (original)
+++ webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketing_tModels.xml Thu Oct 15 18:36:27 2009
@@ -16,7 +16,7 @@
*
*/ -->
<save_tModel xmlns="urn:uddi-org:api_v3">
- <tModel tModelKey="uddi:marketing.apache.org:keygenerator" xmlns="urn:uddi-org:api_v3">
+ <tModel tModelKey="uddi:marketing.apache.org:subscription:keygenerator" xmlns="urn:uddi-org:api_v3">
<name>uddi-org:keyGenerator</name>
<description>Marketing Root domain key generator</description>
<overviewDoc>
Propchange: webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketing_tModels.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 15 18:36:27 2009
@@ -0,0 +1 @@
+/webservices/juddi/branches/v3_trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/marketinglistener_tModels.xml:797614-802957
Modified: webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/root_BusinessEntity.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/root_BusinessEntity.xml?rev=825609&r1=825608&r2=825609&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/root_BusinessEntity.xml (original)
+++ webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/root_BusinessEntity.xml Thu Oct 15 18:36:27 2009
@@ -38,9 +38,9 @@
See below for other fields that you may want to edit...
-->
-<businessEntity xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" businessKey="uddi:sales.apache.org:businesses-asf">
+<businessEntity xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" businessKey="uddi:juddi.apache.org:business-marketing-asf">
<!-- Change the name field to represent the name of your registry -->
- <name xml:lang="en">An Apache Sales jUDDI Node</name>
+ <name xml:lang="en">An Root Sales jUDDI Node</name>
<!-- Change the description field to provided a brief description of your registry -->
<description xml:lang="en">This is a UDDI v3 registry node as implemented by Apache jUDDI.</description>
<discoveryURLs>
@@ -53,11 +53,11 @@
<businessServices>
<!-- As mentioned above, you may want to provide user-defined keys for these (and the services/bindingTemplates below. Services that you
don't intend to support should be removed entirely -->
- <businessService serviceKey="uddi:sales.apache.org:services-inquiry" businessKey="uddi:sales.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-inquiry" businessKey="uddi:juddi.apache.org:business-marketing-asf">
<name xml:lang="en">UDDI Inquiry Service</name>
<description xml:lang="en">Web Service supporting UDDI Inquiry API</description>
<bindingTemplates>
- <bindingTemplate bindingKey="uddi:sales.apache.org:servicebindings-inquiry-ws" serviceKey="uddi:sales.apache.org:services-inquiry">
+ <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-inquiry-ws" serviceKey="uddi:juddi.apache.org:services-inquiry">
<description>UDDI Inquiry API V3</description>
<!-- This should be changed to the WSDL URL of the inquiry API. An access point inside a bindingTemplate will be found for every service
in this file. They all must point to their API's WSDL URL -->
@@ -84,11 +84,11 @@
</bindingTemplate>
</bindingTemplates>
</businessService>
- <businessService serviceKey="uddi:sales.apache.org:services-publish" businessKey="uddi:sales.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-publish" businessKey="uddi:juddi.apache.org:business-marketing-asf">
<name xml:lang="en">UDDI Publish Service</name>
<description xml:lang="en">Web Service supporting UDDI Publish API</description>
<bindingTemplates>
- <bindingTemplate bindingKey="uddi:sales.apache.org:servicebindings-publish-ws" serviceKey="uddi:sales.apache.org:services-publish">
+ <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-publish-ws" serviceKey="uddi:juddi.apache.org:services-publish">
<description>UDDI Publication API V3</description>
<accessPoint useType="wsdlDeployment">http://${juddi.server.name}:${juddi.server.port}/juddiv3/services/publish?wsdl</accessPoint>
<tModelInstanceDetails>
@@ -111,11 +111,11 @@
</bindingTemplate>
</bindingTemplates>
</businessService>
- <businessService serviceKey="uddi:sales.apache.org:services-security" businessKey="uddi:sales.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-security" businessKey="uddi:juddi.apache.org:business-marketing-asf">
<name xml:lang="en">UDDI Security Service</name>
<description xml:lang="en">Web Service supporting UDDI Security API</description>
<bindingTemplates>
- <bindingTemplate bindingKey="uddi:sales.apache.org:servicebindings-security-ws" serviceKey="uddi:sales.apache.org:services-security">
+ <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-security-ws" serviceKey="uddi:juddi.apache.org:services-security">
<description>UDDI Security API V3</description>
<accessPoint useType="wsdlDeployment">http://${juddi.server.name}:${juddi.server.port}/juddiv3/services/security?wsdl</accessPoint>
<tModelInstanceDetails>
@@ -127,11 +127,11 @@
</bindingTemplate>
</bindingTemplates>
</businessService>
- <businessService serviceKey="uddi:sales.apache.org:services-custodytransfer" businessKey="uddi:sales.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-custodytransfer" businessKey="uddi:juddi.apache.org:business-marketing-asf">
<name xml:lang="en">UDDI Custody and Ownership Transfer Service</name>
<description xml:lang="en">Web Service supporting UDDI Custody and Ownership Transfer API</description>
<bindingTemplates>
- <bindingTemplate bindingKey="uddi:sales.apache.org:servicebindings-custodytransfer-ws" serviceKey="uddi:sales.apache.org:services-custodytransfer">
+ <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-custodytransfer-ws" serviceKey="uddi:juddi.apache.org:services-custodytransfer">
<description>UDDI Custody and Ownership Transfer API V3</description>
<accessPoint useType="wsdlDeployment">http://${juddi.server.name}:${juddi.server.port}/juddiv3/services/custody-transfer?wsdl</accessPoint>
<tModelInstanceDetails>
@@ -155,11 +155,11 @@
</bindingTemplate>
</bindingTemplates>
</businessService>
- <businessService serviceKey="uddi:sales.apache.org:services-subscription" businessKey="uddi:sales.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-subscription" businessKey="uddi:juddi.apache.org:business-marketing-asf">
<name xml:lang="en">UDDI Subscription Service</name>
<description xml:lang="en">Web Service supporting UDDI Subscription API</description>
<bindingTemplates>
- <bindingTemplate bindingKey="uddi:sales.apache.org:servicebindings-subscription-ws" serviceKey="uddi:sales.apache.org:services-subscription">
+ <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-subscription-ws" serviceKey="uddi:juddi.apache.org:services-subscription">
<description>UDDI Subscription API V3</description>
<accessPoint useType="wsdlDeployment">http://${juddi.server.name}:${juddi.server.port}/juddiv3/services/subscription?wsdl</accessPoint>
<tModelInstanceDetails>
@@ -184,27 +184,11 @@
</bindingTemplate>
</bindingTemplates>
</businessService>
- <businessService serviceKey="uddi:sales.apache.org:services-subscriptionlistener" businessKey="uddi:sales.apache.org:businesses-asf">
- <name xml:lang="en">UDDI Subscription Listener Service</name>
- <description xml:lang="en">Web Service supporting UDDI Subscription Listener API</description>
- <bindingTemplates>
- <bindingTemplate bindingKey="uddi:sales.apache.org:servicebindings-subscriptionlistener-ws" serviceKey="uddi:sales.apache.org:services-subscriptionlistener">
- <description>UDDI Subscription Listener API V3</description>
- <accessPoint useType="wsdlDeployment">http://${juddi.server.name}:${juddi.server.port}/juddiv3/services/subscription-listener?wsdl</accessPoint>
- <tModelInstanceDetails>
- <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_subscriptionlistener" />
- </tModelInstanceDetails>
- <categoryBag>
- <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
- </categoryBag>
- </bindingTemplate>
- </bindingTemplates>
- </businessService>
- <businessService serviceKey="uddi:sales.apache.org:services-publisher" businessKey="uddi:sales.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-publisher" businessKey="uddi:juddi.apache.org:business-marketing-asf">
<name xml:lang="en">jUDDI Publisher Service</name>
<description xml:lang="en">Web Service supporting jUDDI specific API</description>
<bindingTemplates>
- <bindingTemplate bindingKey="uddi:sales.apache.org:servicebindings-publisher-ws" serviceKey="uddi:sales.apache.org:services-publisher">
+ <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-publisher-ws" serviceKey="uddi:juddi.apache.org:services-publisher">
<description>jUDDI Publisher Service API V3</description>
<accessPoint useType="wsdlDeployment">http://${juddi.server.name}:${juddi.server.port}/juddiv3/services/publisher?wsdl</accessPoint>
<categoryBag>
Modified: webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/root_tModelKeyGen.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/root_tModelKeyGen.xml?rev=825609&r1=825608&r2=825609&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/root_tModelKeyGen.xml (original)
+++ webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/root_tModelKeyGen.xml Thu Oct 15 18:36:27 2009
@@ -26,7 +26,7 @@
uddi:uddi.acme.com:keygenerator
uddi:engineering.umich.edu:soa:ubr:keygenerator
-->
-<tModel tModelKey="uddi:sales.apache.org:keygenerator" xmlns="urn:uddi-org:api_v3">
+<tModel tModelKey="uddi:juddi.apache.org:keygenerator" xmlns="urn:uddi-org:api_v3">
<name>uddi-org:keyGenerator</name>
<description>Root domain key generator</description>
<overviewDoc>
Added: webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/sales_BusinessEntity.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/sales_BusinessEntity.xml?rev=825609&view=auto
==============================================================================
--- webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/sales_BusinessEntity.xml (added)
+++ webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/sales_BusinessEntity.xml Thu Oct 15 18:36:27 2009
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+ <!--
+ This file contains the root business entity structure that represents your registry. The key chosen (or generated) for this entity will serve
+ as the node id for all entities published within the registry. The services contained within this business entity reflect the UDDI APIs that
+ you wish to support (adding or subtracting the services here will not enable/disable them, simply add/omit them from being discovered via UDDI).
+
+ The top-level business entity and sub-entities all use keys as unique identifiers. They are left blank by default which means the system will
+ generate a key (generated as root partition with GUID appended). You can choose to create your own, human-readable keys but they must match
+ the root key generator created in the root_tModelKeyGen.xml file. Matching means they must equal the root key generator with the keyword
+ "keygenerator" replaced by your own string.
+
+ Example:
+
+ root_tModelKeyGen.xml key is uddi:www.mycompany.com:registry:keygenerator
+
+ Legal user-defined keys are:
+
+ uddi:www.mycompany.com:registry:ubr-node (for the businessKey)
+ uddi:www.mycompany.com:registry:inquiry-service (for the inquiry service service key)
+ uddi:www.mycompany.com:registry:inquiry-service-wsdlDeployment (for the inquiry service binding template that represents the WSDL)
+
+
+ See below for other fields that you may want to edit...
+ -->
+<businessEntity xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" businessKey="uddi:sales.apache.org:sales-asf">
+ <!-- Change the name field to represent the name of your registry -->
+ <name xml:lang="en">Sales Node</name>
+ <!-- Change the description field to provided a brief description of your registry -->
+ <description xml:lang="en">This is a UDDI v3 registry for Sales</description>
+ <discoveryURLs>
+ <!-- This discovery URL should point to the home installation URL of jUDDI -->
+ <discoveryURL useType="home">http://${juddi.server.name}:${juddi.server.port}/juddiv3</discoveryURL>
+ </discoveryURLs>
+ <businessServices>
+ <!-- As mentioned above, you may want to provide user-defined keys for these (and the services/bindingTemplates below. Services that you
+ don't intend to support should be removed entirely -->
+ <businessService serviceKey="uddi:sales.apache.org:services-subscriptionlistener" businessKey="uddi:sales.apache.org:sales-asf">
+ <name xml:lang="en">Sales Subscription Listener Service</name>
+ <description xml:lang="en">Web Service supporting UDDI Subscription Listener API</description>
+ <bindingTemplates>
+ <bindingTemplate bindingKey="uddi:sales.apache.org:servicebindings-subscriptionlistener-ws" serviceKey="uddi:sales.apache.org:services-subscriptionlistener">
+ <description>UDDI Subscription Listener API V3</description>
+ <accessPoint useType="wsdlDeployment">http://${juddi.server.name}:${juddi.server.port}/juddiv3/services/subscription-listener?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_subscriptionlistener" />
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+ </bindingTemplates>
+ </businessService>
+ </businessServices>
+</businessEntity>
+
+
+
+
Copied: webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/sales_Publisher.xml (from r825474, webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/saleslistener_Publisher.xml)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/sales_Publisher.xml?p2=webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/sales_Publisher.xml&p1=webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/saleslistener_Publisher.xml&r1=825474&r2=825609&rev=825609&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/saleslistener_Publisher.xml (original)
+++ webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/sales_Publisher.xml Thu Oct 15 18:36:27 2009
@@ -15,8 +15,8 @@
* limitations under the License.
*
*/ -->
-<publisher xmlns="urn:juddi-apache-org:api_v3" authorizedName="saleslistener">
- <publisherName>Sales Listener Publisher</publisherName>
+<publisher xmlns="urn:juddi-apache-org:api_v3" authorizedName="sales">
+ <publisherName>Sales Publisher</publisherName>
<isAdmin>false</isAdmin>
</publisher>
Copied: webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/sales_tModels.xml (from r825474, webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/saleslistener_tModels.xml)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/sales_tModels.xml?p2=webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/sales_tModels.xml&p1=webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/saleslistener_tModels.xml&r1=825474&r2=825609&rev=825609&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/saleslistener_tModels.xml (original)
+++ webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/sales_tModels.xml Thu Oct 15 18:36:27 2009
@@ -17,7 +17,7 @@
*/ -->
<save_tModel xmlns="urn:uddi-org:api_v3">
<tModel tModelKey="uddi:sales.apache.org:keygenerator" xmlns="urn:uddi-org:api_v3">
- <name>uddi-org:keyGenerator</name>
+ <name>sales-apache-org:keyGenerator</name>
<description>Sales Root domain key generator</description>
<overviewDoc>
<overviewURL useType="text">
@@ -28,21 +28,20 @@
keyValue="keyGenerator" />
</categoryBag>
</tModel>
- <tModel tModelKey="uddi:it.marketing.apache.org:keygenerator"
- xmlns="urn:uddi-org:api_v3">
- <name>uddi-org:keyGenerator</name>
- <description>IT Marketing domain key generator</description>
- <overviewDoc>
- <overviewURL useType="text">
- http://uddi.org/pubs/uddi_v3.htm#keyGen</overviewURL>
- </overviewDoc>
- <categoryBag>
- <keyedReference tModelKey="uddi:uddi.org:categorization:types"
- keyName="uddi-org:types:keyGenerator" keyValue="keyGenerator" />
- </categoryBag>
+ <tModel tModelKey="uddi:sales-subs.apache.org:keygenerator" xmlns="urn:uddi-org:api_v3">
+ <name>sales-apache-org:subscription:keyGenerator</name>
+ <description>Sales Root domain key generator</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#keyGen</overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
+ keyValue="keyGenerator" />
+ </categoryBag>
</tModel>
<tModel tModelKey="uddi:marketing.apache.org:keygenerator" xmlns="urn:uddi-org:api_v3">
- <name>uddi-org:keyGenerator</name>
+ <name>marketing-apache-org:keyGenerator</name>
<description>Marketing Root domain key generator</description>
<overviewDoc>
<overviewURL useType="text">
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org