[riftsaw-commits] riftsaw SVN: r1324 - in trunk/distribution/src/main/release: conf/juddi and 1 other directories.

Author: kurtstam Date: 2011-03-23 09:18:55 -0400 (Wed, 23 Mar 2011) New Revision: 1324 Added: trunk/distribution/src/main/release/conf/juddi/riftsaw_BusinessEntity.xml trunk/distribution/src/main/release/conf/juddi/riftsaw_Publisher.xml trunk/distribution/src/main/release/conf/juddi/riftsaw_tModels.xml Removed: trunk/distribution/src/main/release/conf/juddi/jbossesb_BusinessEntity.xml trunk/distribution/src/main/release/conf/juddi/jbossesb_tModels.xml Modified: trunk/distribution/src/main/release/conf/bpel.properties trunk/distribution/src/main/release/conf/juddi/esb.juddi.client.xml trunk/distribution/src/main/release/install/build.xml Log: RIFTSAW-328, changing the config to avoid conflict with jbesb Modified: trunk/distribution/src/main/release/conf/bpel.properties =================================================================== --- trunk/distribution/src/main/release/conf/bpel.properties 2011-03-22 18:19:40 UTC (rev 1323) +++ trunk/distribution/src/main/release/conf/bpel.properties 2011-03-23 13:18:55 UTC (rev 1324) @@ -107,7 +107,7 @@ # jbossesb.saw/esb.uddi.client.xml. Commented out by default. #bpel.uddi.config=META-INF/bpel.uddi.client.xml # only if you don't specify the bpel.uddi.config you need to specify the name of the clerk manager -bpel.uddi.clerk.manager=esb-registry +bpel.uddi.clerk.manager=uddi-portlet-manager # name of the clerk bpel.uddi.clerk=BPELClerk Modified: trunk/distribution/src/main/release/conf/juddi/esb.juddi.client.xml =================================================================== --- trunk/distribution/src/main/release/conf/juddi/esb.juddi.client.xml 2011-03-22 18:19:40 UTC (rev 1323) +++ trunk/distribution/src/main/release/conf/juddi/esb.juddi.client.xml 2011-03-23 13:18:55 UTC (rev 1324) @@ -1,39 +1,32 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> - +<?xml version="1.0" encoding="UTF-8"?> <uddi> - <reloadDelay>3600000</reloadDelay> - <manager name="esb-registry"> - <nodes> - <node> - <!-- required 'default' node --> - <name>default</name> - <description>Main jUDDI node</description> - <properties> - <property name="keyDomain" value="esb.jboss.org"/> - <property name="businessKey" value="redhat-jboss"/> - <property name="serviceDescription" value="BPEL Service deployed by Riftsaw"/> - <property name="bindingDescription" value="BPEL Endpoint deployed by Riftsaw"/> - </properties> - <!-- JAX-WS Transport - <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport> - <custodyTransferUrl>http://${jboss.esb.bind.address}:8080/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl> - <inquiryUrl>http://${jboss.esb.bind.address}:8080/juddiv3/services/inquiry?wsdl</inquiryUrl> - <publishUrl>http://${jboss.esb.bind.address}:8080/juddiv3/services/publish?wsdl</publishUrl> - <securityUrl>http://${jboss.esb.bind.address}:8080/juddiv3/services/security?wsdl</securityUrl> - <subscriptionUrl>http://${jboss.esb.bind.address}:8080/juddiv3/services/subscription?wsdl</subscriptionUrl> - <subscriptionListenerUrl>http://${jboss.esb.bind.address}:8080/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl> - <juddiApiUrl>http://${jboss.esb.bind.address}:8080/juddiv3/services/juddi-api?wsdl</juddiApiUrl> + <reloadDelay>3600000</reloadDelay> + <manager name="uddi-portlet-manager"> + <nodes> + <node isHomeJUDDI="true"> + <!-- required 'default' node --> + <name>default</name> + <description>Main jUDDI node</description> + <!-- JAX-WS Transport - The ESB transport requires Service Endpoint URLs and not the WSDL URLs. + <proxyTransport>org.jboss.internal.soa.esb.registry.client.JuddiJAXWSTransport</proxyTransport> + <custodyTransferUrl>http://REMOTE_HOST:REMOTE_PORT/juddiv3/services/custody-transfer</custodyTransferUrl> + <inquiryUrl>http://REMOTE_HOST:REMOTE_PORT/juddiv3/services/inquiry</inquiryUrl> + <publishUrl>http://REMOTE_HOST:REMOTE_PORT/juddiv3/services/publish</publishUrl> + <securityUrl>http://REMOTE_HOST:REMOTE_PORT/juddiv3/services/security</securityUrl> + <subscriptionUrl>http://REMOTE_HOST:REMOTE_PORT/juddiv3/services/subscription</subscriptionUrl> + <subscriptionListenerUrl>http://REMOTE_HOST:REMOTE_PORT/juddiv3/services/subscription-listener</subscriptionListenerUrl> + <juddiApiUrl>http://REMOTE_HOST:REMOTE_PORT/juddiv3/services/juddi-api</juddiApiUrl> --> - <!-- In VM Transport Settings --> - <proxyTransport>org.jboss.internal.soa.esb.registry.client.JuddiInVMTransport</proxyTransport> - <custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl> - <inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl> - <publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl> - <securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl> - <subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl> - <subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl> - <juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl> - <!-- RMI Transport Settings + <!-- In VM Transport Settings --> + <proxyTransport>org.jboss.internal.soa.esb.registry.client.JuddiInVMTransport</proxyTransport> + <custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl> + <inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl> + <publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl> + <securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl> + <subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl> + <subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl> + <juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl> + <!-- RMI Transport Settings <proxyTransport>org.jboss.internal.soa.esb.registry.client.JuddiRMITransport</proxyTransport> <custodyTransferUrl>/juddiv3/UDDICustodyTransferService</custodyTransferUrl> <inquiryUrl>/juddiv3/UDDIInquiryService</inquiryUrl> @@ -46,23 +39,30 @@ <javaNamingFactoryUrlPkgs>org.jboss.naming</javaNamingFactoryUrlPkgs> <javaNamingProviderUrl>jnp://${jboss.esb.bind.address}:1099</javaNamingProviderUrl> --> - </node> - <node> - <name>default-ws</name> - <description>jUDDI console node</description> - <!-- In VM Transport Settings --> - <proxyTransport>org.jboss.internal.soa.esb.registry.client.JuddiInVMTransport</proxyTransport> - <custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl> - <inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl> - <publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl> - <securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl> - <subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl> - <subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl> - <juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl> - </node> - </nodes> - <clerks registerOnStartup="true"> - <clerk name="BPELClerk" node="default" publisher="jbossesb" password="jbossesb" /> - </clerks> - </manager> -</uddi> + </node> + <node> + <name>riftsaw</name> + <description>Riftsaw node</description> + <properties> + <property name="keyDomain" value="riftsaw.jboss.org"/> + <property name="businessKey" value="redhat-jboss"/> + <property name="serviceDescription" value="BPEL Service deployed by Riftsaw"/> + <property name="bindingDescription" value="BPEL Endpoint deployed by Riftsaw"/> + </properties> + <!--In VM Transport Settings --> + <proxyTransport>org.jboss.internal.soa.esb.registry.client.JuddiInVMTransport</proxyTransport> + <custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl> + <inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl> + <publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl> + <securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl> + <subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl> + <subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl> + <juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl> + + </node> + </nodes> + <clerks registerOnStartup="true"> + <clerk name="BPELClerk" node="riftsaw" password="" publisher="riftsaw"/> + </clerks> + </manager> +</uddi> \ No newline at end of file Deleted: trunk/distribution/src/main/release/conf/juddi/jbossesb_BusinessEntity.xml =================================================================== --- trunk/distribution/src/main/release/conf/juddi/jbossesb_BusinessEntity.xml 2011-03-22 18:19:40 UTC (rev 1323) +++ trunk/distribution/src/main/release/conf/juddi/jbossesb_BusinessEntity.xml 2011-03-23 13:18:55 UTC (rev 1324) @@ -1,49 +0,0 @@ -<?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:esb.jboss.org:redhat-jboss"> - <name xml:lang="en">JBossESB Business</name> - <!-- Change the description field to provided a brief description of your registry --> - <description xml:lang="en">The business that owns all the services deployed by JBossESB and Riftsaw</description> -</businessEntity> - - - - Deleted: trunk/distribution/src/main/release/conf/juddi/jbossesb_tModels.xml =================================================================== --- trunk/distribution/src/main/release/conf/juddi/jbossesb_tModels.xml 2011-03-22 18:19:40 UTC (rev 1323) +++ trunk/distribution/src/main/release/conf/juddi/jbossesb_tModels.xml 2011-03-23 13:18:55 UTC (rev 1324) @@ -1,43 +0,0 @@ -<?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. - * - */ --> -<save_tModel xmlns="urn:uddi-org:api_v3"> - <tModel tModelKey="uddi:esb.jboss.org:keygenerator" xmlns="urn:uddi-org:api_v3"> - <name>esb-jboss-org:keyGenerator</name> - <description>JBossESB 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:jboss.org:esb" xmlns="urn:uddi-org:api_v3"> - <name>org.jboss.soa.esb.:category</name> - <description>JBoss ESB category</description> - <overviewDoc> - <overviewURL useType="text"> - http://www.jboss.org/community/wiki/JbossesbJAXR</overviewURL> - </overviewDoc> - <categoryBag> - <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:xml" - keyValue="xmlSpec" /> - </categoryBag> - </tModel> -</save_tModel> Added: trunk/distribution/src/main/release/conf/juddi/riftsaw_BusinessEntity.xml =================================================================== --- trunk/distribution/src/main/release/conf/juddi/riftsaw_BusinessEntity.xml (rev 0) +++ trunk/distribution/src/main/release/conf/juddi/riftsaw_BusinessEntity.xml 2011-03-23 13:18:55 UTC (rev 1324) @@ -0,0 +1,49 @@ +<?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:riftsaw.jboss.org:redhat-jboss"> + <name xml:lang="en">Riftsaw Business</name> + <!-- Change the description field to provided a brief description of your registry --> + <description xml:lang="en">The business that owns all the services deployed by Riftsaw</description> +</businessEntity> + + + + Added: trunk/distribution/src/main/release/conf/juddi/riftsaw_Publisher.xml =================================================================== --- trunk/distribution/src/main/release/conf/juddi/riftsaw_Publisher.xml (rev 0) +++ trunk/distribution/src/main/release/conf/juddi/riftsaw_Publisher.xml 2011-03-23 13:18:55 UTC (rev 1324) @@ -0,0 +1,21 @@ +<?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. + * + */ --> +<publisher xmlns="urn:juddi-apache-org:api_v3" authorizedName="riftsaw"> + <publisherName>Riftsaw publisher</publisherName> + <isAdmin>true</isAdmin> +</publisher> Added: trunk/distribution/src/main/release/conf/juddi/riftsaw_tModels.xml =================================================================== --- trunk/distribution/src/main/release/conf/juddi/riftsaw_tModels.xml (rev 0) +++ trunk/distribution/src/main/release/conf/juddi/riftsaw_tModels.xml 2011-03-23 13:18:55 UTC (rev 1324) @@ -0,0 +1,32 @@ +<?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. + * + */ --> +<save_tModel xmlns="urn:uddi-org:api_v3"> + <tModel tModelKey="uddi:riftsaw.jboss.org:keygenerator" xmlns="urn:uddi-org:api_v3"> + <name>riftsaw-jboss-org:keyGenerator</name> + <description>Riftsaw 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> + +</save_tModel> Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2011-03-22 18:19:40 UTC (rev 1323) +++ trunk/distribution/src/main/release/install/build.xml 2011-03-23 13:18:55 UTC (rev 1324) @@ -318,24 +318,18 @@ <target name="deploy.esb.uddi.config" if="is.jbossesb-registry" depends="check.jbossesb-registry,renameEsbJUDDIClientXML"> <echo>deploy jUDDI configuration</echo> - <move file="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/jbossesb_tModels.xml" - tofile="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/jbossesb_tModels.xml.old"/> - <copy file="../conf/juddi/jbossesb_tModels.xml" - todir="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/" /> - <copy file="../conf/juddi/jbossesb_BusinessEntity.xml" - todir="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/" /> + <copy file="../conf/juddi/riftsaw_Publisher.xml" + todir="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/" overwrite="true"/> + <copy file="../conf/juddi/riftsaw_tModels.xml" + todir="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/" overwrite="true"/> + <copy file="../conf/juddi/riftsaw_BusinessEntity.xml" + todir="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/" overwrite="true" /> <replace file="${deploy.dir}/riftsaw.sar/bpel.properties" token="bpel.uddi.registration=false" value="bpel.uddi.registration=true"/> <replace file="${deploy.dir}/riftsaw.sar/bpel.properties" token="bpel.uddi.lookup=false" value="bpel.uddi.lookup=true"/> - <replace file="${deploy.dir}/riftsaw.sar/bpel.properties" - token="bpel.uddi.clerk.manager=esb-registry" - value="bpel.uddi.clerk.manager=esb-registry"/> - <replace file="${deploy.dir}/riftsaw.sar/bpel.properties" - token="bpel.uddi.client.impl=org.jboss.soa.bpel.uddi.UDDIRegistration" - value="bpel.uddi.client.impl=org.jboss.soa.bpel.uddi.UDDIRegistration"/> <!-- juddi-client, should be removed once esb catches up to 3.0.4--> <!-- now deletes the 3.0.3 version, and then copy the 3.0.4 into the esb.deployer/lib--> @@ -358,9 +352,9 @@ <target name="undeploy.esb.uddi.config" if="is.jbossesb-registry" depends="check.jbossesb-registry"> <echo>undeploy jUDDI configuration</echo> <move file="${deploy.dir}/jbossesb.sar/esb.juddi.client.xml.old" tofile="${deploy.dir}/jbossesb.sar/esb.juddi.client.xml"/> - <move file="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/jbossesb_tModels.xml.old" - tofile="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/jbossesb_tModels.xml"/> - <delete file="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/jbossesb_BusinessEntity.xml" /> + <delete file="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/riftsaw_Publisher.xml" /> + <delete file="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/riftsaw_BusinessEntity.xml" /> + <delete file="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/riftsaw_tModels.xml" /> </target> </project>