juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject svn commit: r1548908 - in /juddi/trunk: juddi-core-openjpa/src/test/resources/ juddi-core/src/main/java/org/apache/juddi/config/ juddi-core/src/main/java/org/apache/juddi/mapping/ juddi-core/src/main/resources/juddi_install_data/ juddi-core/src/test/re...
Date Sat, 07 Dec 2013 13:18:13 GMT
Author: alexoree
Date: Sat Dec  7 13:18:13 2013
New Revision: 1548908

URL: http://svn.apache.org/r1548908
Log:
JUDDI-741 done

Modified:
    juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-3des.xml
    juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes128.xml
    juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes256.xml
    juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-default.xml
    juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.xml
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
    juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
    juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-3des.xml
    juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes128.xml
    juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes256.xml
    juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-default.xml
    juddi/trunk/juddi-core/src/test/resources/juddiv3.xml
    juddi/trunk/juddi-examples/hello-world-embedded/src/main/resources/juddiv3.xml
    juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.xml
    juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml

Modified: juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-3des.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-3des.xml?rev=1548908&r1=1548907&r2=1548908&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-3des.xml (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-3des.xml Sat Dec  7 13:18:13
2013
@@ -13,6 +13,7 @@
 		<!-- The ${juddi.server.baseurl} token can be referenced in accessPoints and will be
resolved at runtime. -->
 		<server>
 			<baseurl>http://localhost:8080/juddiv3</baseurl>
+			<baseurlsecure>https://localhost:8443/juddiv3</baseurlsecure>
 		</server>
 		<!-- The node Id must be unique when setup in a cluster of UDDI servers implementing
the replication API
 			don't worry, jUDDI doesn't implement it right now, but it may come in the future -->

Modified: juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes128.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes128.xml?rev=1548908&r1=1548907&r2=1548908&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes128.xml (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes128.xml Sat Dec  7 13:18:13
2013
@@ -13,6 +13,7 @@
 		<!-- The ${juddi.server.baseurl} token can be referenced in accessPoints and will be
resolved at runtime. -->
 		<server>
 			<baseurl>http://localhost:8080/juddiv3</baseurl>
+			<baseurlsecure>https://localhost:8443/juddiv3</baseurlsecure>
 		</server>
 		<!-- The node Id must be unique when setup in a cluster of UDDI servers implementing
the replication API
 			don't worry, jUDDI doesn't implement it right now, but it may come in the future -->

Modified: juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes256.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes256.xml?rev=1548908&r1=1548907&r2=1548908&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes256.xml (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes256.xml Sat Dec  7 13:18:13
2013
@@ -13,6 +13,7 @@
 		<!-- The ${juddi.server.baseurl} token can be referenced in accessPoints and will be
resolved at runtime. -->
 		<server>
 			<baseurl>http://localhost:8080/juddiv3</baseurl>
+			<baseurlsecure>https://localhost:8443/juddiv3</baseurlsecure>
 		</server>
 		<!-- The node Id must be unique when setup in a cluster of UDDI servers implementing
the replication API
 			don't worry, jUDDI doesn't implement it right now, but it may come in the future -->

Modified: juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-default.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-default.xml?rev=1548908&r1=1548907&r2=1548908&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-default.xml (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-default.xml Sat Dec  7 13:18:13
2013
@@ -13,6 +13,7 @@
 		<!-- The ${juddi.server.baseurl} token can be referenced in accessPoints and will be
resolved at runtime. -->
 		<server>
 			<baseurl>http://localhost:8080/juddiv3</baseurl>
+			<baseurlsecure>https://localhost:8443/juddiv3</baseurlsecure>
 		</server>
 		<!-- The node Id must be unique when setup in a cluster of UDDI servers implementing
the replication API
 			don't worry, jUDDI doesn't implement it right now, but it may come in the future -->

Modified: juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.xml?rev=1548908&r1=1548907&r2=1548908&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.xml (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.xml Sat Dec  7 13:18:13 2013
@@ -13,6 +13,7 @@
 		<!-- The ${juddi.server.baseurl} token can be referenced in accessPoints and will be
resolved at runtime. -->
 		<server>
 			<baseurl>http://localhost:8080/juddiv3</baseurl>
+			<baseurlsecure>https://localhost:8443/juddiv3</baseurlsecure>
 		</server>
 		<!-- The node Id must be unique when setup in a cluster of UDDI servers implementing
the replication API
 			don't worry, jUDDI doesn't implement it right now, but it may come in the future -->

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java?rev=1548908&r1=1548907&r2=1548908&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java Sat Dec  7
13:18:13 2013
@@ -12,6 +12,9 @@ import org.apache.juddi.v3.auth.MD5XMLDo
  */
 public interface Property {
     
+        public final static String JUDDI_BASE_URL="juddi.server.baseurl";
+        public final static String JUDDI_BASE_URL_SECURE="juddi.server.baseurlsecure";
+        
     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";
@@ -157,6 +160,7 @@ public interface Property {
     public final static String DEFAULT_SECURITY_DOMAIN = "java:/jaas/other";
     public final static boolean DEFAULT_LOAD_INSTALL_DATA = true;
     public final static String DEFAULT_BASE_URL = "http://localhost:8080/juddiv3";
+    public final static String DEFAULT_BASE_URL_SECURE = "https://localhost:8443/juddiv3";
     /* Allowing the the user to override jpa persistence properties in the juddi.properties
file */
     public final static String PERSISTENCE_PROVIDER = "persistenceProvider";
     public final static String DATASOURCE = "hibernate.connection.datasource";

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java?rev=1548908&r1=1548907&r2=1548908&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java Sat
Dec  7 13:18:13 2013
@@ -375,13 +375,22 @@ public class MappingModelToApi {
 			apiDiscUrl.setUseType(modelDiscUrl.getUseType());
 			String discoveryURL = modelDiscUrl.getUrl();
 			try {
-				String baseUrl = AppConfig.getConfiguration().getString("juddi.server.baseurl");
+				String baseUrl = AppConfig.getConfiguration().getString(Property.JUDDI_BASE_URL);
 				if (baseUrl==null) {
-					logger.warn("Token 'juddi.server.baseurl' not found in the juddiv3.properties, defaulting
to '" 
+					logger.warn("Token '"+Property.JUDDI_BASE_URL+"' not found in the juddiv3.xml, defaulting
to '" 
 							+ Property.DEFAULT_BASE_URL + "'");
 					baseUrl = Property.DEFAULT_BASE_URL;
 				}
-				discoveryURL = discoveryURL.replaceAll("\\$\\{juddi.server.baseurl\\}", baseUrl);
+				discoveryURL = discoveryURL.replaceAll("\\$\\{"+Property.JUDDI_BASE_URL+"\\}", baseUrl);
+                                
+                                 baseUrl = AppConfig.getConfiguration().getString(Property.JUDDI_BASE_URL_SECURE);
+				if (baseUrl==null) {
+					logger.warn("Token '"+Property.JUDDI_BASE_URL_SECURE+"' not found in the juddiv3.xml,
defaulting to '" 
+							+ Property.JUDDI_BASE_URL_SECURE + "'");
+					baseUrl = Property.DEFAULT_BASE_URL_SECURE;
+				}
+				discoveryURL = discoveryURL.replaceAll("\\$\\{"+Property.JUDDI_BASE_URL_SECURE+"\\}",
baseUrl);
+                                
 			} catch (ConfigurationException e) {
 				logger.error(e.getMessage(),e);
 			}
@@ -632,13 +641,21 @@ public class MappingModelToApi {
 		String accessPointValue = modelBindingTemplate.getAccessPointUrl();
 		if (accessPointValue!=null) {
 			try {
-				String baseUrl = AppConfig.getConfiguration().getString("juddi.server.baseurl");
+				String baseUrl = AppConfig.getConfiguration().getString(Property.JUDDI_BASE_URL);
 				if (baseUrl==null) {
-					logger.warn("Token 'juddi.server.baseurl' not found in the juddiv3.properties, defaulting
to '" 
+					logger.warn("Token '"+Property.JUDDI_BASE_URL+"' not found in the juddiv3.xml, defaulting
to '" 
 							+ Property.DEFAULT_BASE_URL + "'");
 					baseUrl = Property.DEFAULT_BASE_URL;
 				}
-				accessPointValue = accessPointValue.replaceAll("\\$\\{juddi.server.baseurl\\}", baseUrl);
+				accessPointValue = accessPointValue.replaceAll("\\$\\{"+Property.JUDDI_BASE_URL+"\\}",
baseUrl);
+                                
+                                 baseUrl = AppConfig.getConfiguration().getString(Property.JUDDI_BASE_URL_SECURE);
+				if (baseUrl==null) {
+					logger.warn("Token '"+Property.JUDDI_BASE_URL_SECURE+"' not found in the juddiv3.xml,
defaulting to '" 
+							+ Property.JUDDI_BASE_URL_SECURE + "'");
+					baseUrl = Property.DEFAULT_BASE_URL_SECURE;
+				}
+				accessPointValue = accessPointValue.replaceAll("\\$\\{"+Property.JUDDI_BASE_URL_SECURE+"\\}",
baseUrl);
 			} catch (ConfigurationException e) {
 				logger.error(e.getMessage(),e);
 			}

Modified: juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml?rev=1548908&r1=1548907&r2=1548908&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml (original)
+++ juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml Sat
Dec  7 13:18:13 2013
@@ -82,15 +82,61 @@
             <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
           </categoryBag>
         </bindingTemplate>
-		<bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-inquiry-rest" serviceKey="uddi:juddi.apache.org:services-inquiry">
+    
+	      <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-inquiry-ws-ssl"
serviceKey="uddi:juddi.apache.org:services-inquiry">
+          <description>UDDI Inquiry API V3 SSL</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 -->
+          <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/inquiry?wsdl</accessPoint>
+          <tModelInstanceDetails>
+            <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_inquiry">
+              <instanceDetails>
+                <instanceParms>
+                <![CDATA[
+                  <?xml version="1.0" encoding="utf-8" ?>
+                  <UDDIinstanceParmsContainer xmlns="urn:uddi-org:policy_v3_instanceParms">
+                    <defaultSortOrder>
+                      uddi:uddi.org:sortorder:binarysort
+                    </defaultSortOrder>
+                  </UDDIinstanceParmsContainer>
+                ]]>
+                </instanceParms>
+              </instanceDetails>
+            </tModelInstanceInfo>
+			 <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+          </tModelInstanceDetails>
+          <categoryBag>
+            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+          </categoryBag>
+        </bindingTemplate>
+      </bindingTemplates>
+	  
+    </businessService>
+	
+	<businessService serviceKey="uddi:juddi.apache.org:services-inquiry-rest" businessKey="uddi:juddi.apache.org:businesses-asf">
+      <name xml:lang="en">UDDI Inquiry REST Service</name>
+      <description xml:lang="en">Web Service supporting UDDI Inquiry API via HTTP GET</description>
+      <bindingTemplates>
+		<bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-inquiry-rest" serviceKey="uddi:juddi.apache.org:services-inquiry-rest">
           <description>UDDI Inquiry API V3 REST</description>
 		  <accessPoint useType="wadlDeployment">${juddi.server.baseurl}/services/inquiryRest?_wadl</accessPoint>
           <categoryBag>
             <keyedReference keyName="uddi-org:types:wadl" keyValue="wadlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
           </categoryBag>
         </bindingTemplate>
+		<bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-inquiry-rest-ssl"
serviceKey="uddi:juddi.apache.org:services-inquiry-rest">
+          <description>UDDI Inquiry API V3 REST SSL</description>
+		  <accessPoint useType="wadlDeployment">${juddi.server.baseurlsecure}/services/inquiryRest?_wadl</accessPoint>
+		  <tModelInstanceDetails>
+			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+          </tModelInstanceDetails>
+          <categoryBag>
+            <keyedReference keyName="uddi-org:types:wadl" keyValue="wadlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+          </categoryBag>
+        </bindingTemplate>
       </bindingTemplates>
     </businessService>
+	
     <businessService serviceKey="uddi:juddi.apache.org:services-publish" businessKey="uddi:juddi.apache.org:businesses-asf">
       <name xml:lang="en">UDDI Publish Service</name>
       <description xml:lang="en">Web Service supporting UDDI Publish API</description>
@@ -116,6 +162,30 @@
             <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
           </categoryBag>
         </bindingTemplate>
+		
+		<bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-publish-ws-ssl" serviceKey="uddi:juddi.apache.org:services-publish">
+          <description>UDDI Publication API V3 SSL</description>
+          <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/publish?wsdl</accessPoint>
+          <tModelInstanceDetails>
+            <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_publication">
+              <instanceDetails>
+                <instanceParms>
+                <![CDATA[
+                  <?xml version="1.0" encoding="utf-8" ?>
+                  <UDDIinstanceParmsContainer xmlns="urn:uddi-org:policy_v3_instanceParms">
+                    <authInfoUse>required</authInfoUse>
+                  </UDDIinstanceParmsContainer>
+                ]]>
+                </instanceParms>
+              </instanceDetails>
+            </tModelInstanceInfo>
+			<tModelInstanceInfo tModelKey="uddi:uddi.org:v3_security" />
+          </tModelInstanceDetails>
+          <categoryBag>
+            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+          </categoryBag>
+        </bindingTemplate>
+		
       </bindingTemplates>
     </businessService>
     <businessService serviceKey="uddi:juddi.apache.org:services-security" businessKey="uddi:juddi.apache.org:businesses-asf">
@@ -132,6 +202,16 @@
             <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
           </categoryBag>
         </bindingTemplate>
+		<bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-security-ws-ssl"
serviceKey="uddi:juddi.apache.org:services-security">
+          <description>UDDI Security API V3 SSL</description>
+          <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/security?wsdl</accessPoint>
+          <tModelInstanceDetails>
+            <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_security" />
+          </tModelInstanceDetails>
+          <categoryBag>
+            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+          </categoryBag>
+        </bindingTemplate>
       </bindingTemplates>
     </businessService>
     <businessService serviceKey="uddi:juddi.apache.org:services-custodytransfer" businessKey="uddi:juddi.apache.org:businesses-asf">
@@ -160,6 +240,33 @@
             <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
           </categoryBag>
         </bindingTemplate>
+		
+		
+		<bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-custodytransfer-ws-ssl"
serviceKey="uddi:juddi.apache.org:services-custodytransfer">
+          <description>UDDI Custody and Ownership Transfer API V3 SSL</description>
+          <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/custody-transfer?wsdl</accessPoint>
+          <tModelInstanceDetails>
+            <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_ownership_transfer">
+              <instanceDetails>
+                <instanceParms>
+                <![CDATA[
+                <?xml version="1.0" encoding="utf-8" ?>
+                <UDDIinstanceParmsContainer
+                 xmlns="urn:uddi-org:policy_v3_instanceParms">
+                  <authInfoUse>required</authInfoUse>
+                </UDDIinstanceParmsContainer>
+                ]]>
+                </instanceParms>
+              </instanceDetails>
+            </tModelInstanceInfo>
+			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+          </tModelInstanceDetails>
+          <categoryBag>
+            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+          </categoryBag>
+        </bindingTemplate>
+		
+		
       </bindingTemplates>
     </businessService>
     <businessService serviceKey="uddi:juddi.apache.org:services-subscription" businessKey="uddi:juddi.apache.org:businesses-asf">
@@ -189,6 +296,33 @@
             <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
           </categoryBag>
         </bindingTemplate>
+		
+		<bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-subscription-ws-ssl"
serviceKey="uddi:juddi.apache.org:services-subscription">
+          <description>UDDI Subscription API V3 SSL</description>
+          <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/subscription?wsdl</accessPoint>
+          <tModelInstanceDetails>
+            <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_subscription">
+              <instanceDetails>
+                <instanceParms>
+                <![CDATA[
+                <?xml version="1.0" encoding="utf-8" ?>
+                <UDDIinstanceParmsContainer
+                xmlns="urn:uddi-org:policy_v3_instanceParms">
+                <authInfoUse>required</authInfoUse>
+                <filterUsingFindAPI>supported</filterUsingFindAPI>
+                </UDDIinstanceParmsContainer>
+                ]]>
+                </instanceParms>
+              </instanceDetails>
+            </tModelInstanceInfo>
+			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+          </tModelInstanceDetails>
+          <categoryBag>
+            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+          </categoryBag>
+        </bindingTemplate>
+		
+		
       </bindingTemplates>
     </businessService>
     <businessService serviceKey="uddi:juddi.apache.org:services-subscriptionlistener"
businessKey="uddi:juddi.apache.org:businesses-asf">
@@ -200,11 +334,25 @@
           <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/services/subscription-listener?wsdl</accessPoint>
           <tModelInstanceDetails>
             <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_subscriptionlistener" />
+			<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
           </tModelInstanceDetails>
           <categoryBag>
             <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
           </categoryBag>
         </bindingTemplate>
+		
+		<bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws-ssl"
serviceKey="uddi:juddi.apache.org:services-subscriptionlistener">
+          <description>UDDI Subscription Listener API V3 SSL</description>
+          <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/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:juddi.apache.org:services-publisher" businessKey="uddi:juddi.apache.org:businesses-asf">
@@ -218,6 +366,16 @@
             <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
           </categoryBag>
         </bindingTemplate>
+		<bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-publisher-ws-ssl"
serviceKey="uddi:juddi.apache.org:services-publisher">
+          <description>jUDDI Publisher Service API V3 SSL</description>
+          <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/publisher?wsdl</accessPoint>
+		  <tModelInstanceDetails>
+            <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+          </tModelInstanceDetails>
+          <categoryBag>
+            <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+          </categoryBag>
+        </bindingTemplate>
       </bindingTemplates>
     </businessService>
   </businessServices>

Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-3des.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-3des.xml?rev=1548908&r1=1548907&r2=1548908&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-3des.xml (original)
+++ juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-3des.xml Sat Dec  7 13:18:13 2013
@@ -13,6 +13,7 @@
 		<!-- The ${juddi.server.baseurl} token can be referenced in accessPoints and will be
resolved at runtime. -->
 		<server>
 			<baseurl>http://localhost:8080/juddiv3</baseurl>
+			<baseurlsecure>https://localhost:8443/juddiv3</baseurlsecure>
 		</server>
 		<!-- The node Id must be unique when setup in a cluster of UDDI servers implementing
the replication API
 			don't worry, jUDDI doesn't implement it right now, but it may come in the future -->

Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes128.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes128.xml?rev=1548908&r1=1548907&r2=1548908&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes128.xml (original)
+++ juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes128.xml Sat Dec  7 13:18:13 2013
@@ -13,6 +13,7 @@
 		<!-- The ${juddi.server.baseurl} token can be referenced in accessPoints and will be
resolved at runtime. -->
 		<server>
 			<baseurl>http://localhost:8080/juddiv3</baseurl>
+			<baseurlsecure>https://localhost:8443/juddiv3</baseurlsecure>
 		</server>
 		<!-- The node Id must be unique when setup in a cluster of UDDI servers implementing
the replication API
 			don't worry, jUDDI doesn't implement it right now, but it may come in the future -->

Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes256.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes256.xml?rev=1548908&r1=1548907&r2=1548908&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes256.xml (original)
+++ juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes256.xml Sat Dec  7 13:18:13 2013
@@ -13,6 +13,7 @@
 		<!-- The ${juddi.server.baseurl} token can be referenced in accessPoints and will be
resolved at runtime. -->
 		<server>
 			<baseurl>http://localhost:8080/juddiv3</baseurl>
+			<baseurlsecure>https://localhost:8443/juddiv3</baseurlsecure>
 		</server>
 		<!-- The node Id must be unique when setup in a cluster of UDDI servers implementing
the replication API
 			don't worry, jUDDI doesn't implement it right now, but it may come in the future -->

Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-default.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-default.xml?rev=1548908&r1=1548907&r2=1548908&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-default.xml (original)
+++ juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-default.xml Sat Dec  7 13:18:13
2013
@@ -13,6 +13,7 @@
 		<!-- The ${juddi.server.baseurl} token can be referenced in accessPoints and will be
resolved at runtime. -->
 		<server>
 			<baseurl>http://localhost:8080/juddiv3</baseurl>
+			<baseurlsecure>https://localhost:8443/juddiv3</baseurlsecure>
 		</server>
 		<!-- The node Id must be unique when setup in a cluster of UDDI servers implementing
the replication API
 			don't worry, jUDDI doesn't implement it right now, but it may come in the future -->

Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3.xml?rev=1548908&r1=1548907&r2=1548908&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/resources/juddiv3.xml (original)
+++ juddi/trunk/juddi-core/src/test/resources/juddiv3.xml Sat Dec  7 13:18:13 2013
@@ -13,6 +13,7 @@
 		<!-- The ${juddi.server.baseurl} token can be referenced in accessPoints and will be
resolved at runtime. -->
 		<server>
 			<baseurl>http://localhost:8080/juddiv3</baseurl>
+			<baseurlsecure>https://localhost:8443/juddiv3</baseurlsecure>
 		</server>
 		<!-- The node Id must be unique when setup in a cluster of UDDI servers implementing
the replication API
 			don't worry, jUDDI doesn't implement it right now, but it may come in the future -->

Modified: juddi/trunk/juddi-examples/hello-world-embedded/src/main/resources/juddiv3.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/hello-world-embedded/src/main/resources/juddiv3.xml?rev=1548908&r1=1548907&r2=1548908&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/hello-world-embedded/src/main/resources/juddiv3.xml (original)
+++ juddi/trunk/juddi-examples/hello-world-embedded/src/main/resources/juddiv3.xml Sat Dec
 7 13:18:13 2013
@@ -13,6 +13,7 @@
 		<!-- The ${juddi.server.baseurl} token can be referenced in accessPoints and will be
resolved at runtime. -->
 		<server>
 			<baseurl>http://localhost:8080/juddiv3</baseurl>
+			<baseurlsecure>https://localhost:8443/juddiv3</baseurlsecure>
 		</server>
 		<!-- The node Id must be unique when setup in a cluster of UDDI servers implementing
the replication API
 			don't worry, jUDDI doesn't implement it right now, but it may come in the future -->

Modified: juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.xml?rev=1548908&r1=1548907&r2=1548908&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.xml
(original)
+++ juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.xml
Sat Dec  7 13:18:13 2013
@@ -13,6 +13,7 @@
 		<!-- The ${juddi.server.baseurl} token can be referenced in accessPoints and will be
resolved at runtime. -->
 		<server>
 			<baseurl>http://localhost:8080/juddiv3</baseurl>
+			<baseurlsecure>https://localhost:8443/juddiv3</baseurlsecure>
 		</server>
 		<!-- The node Id must be unique when setup in a cluster of UDDI servers implementing
the replication API
 			don't worry, jUDDI doesn't implement it right now, but it may come in the future -->

Modified: juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml?rev=1548908&r1=1548907&r2=1548908&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml Sat Dec  7 13:18:13
2013
@@ -13,6 +13,7 @@
 		<!-- The ${juddi.server.baseurl} token can be referenced in accessPoints and will be
resolved at runtime. -->
 		<server>
 			<baseurl>http://localhost:8080/juddiv3</baseurl>
+			<baseurlsecure>https://localhost:8443/juddiv3</baseurlsecure>
 		</server>
 		<!-- The node Id must be unique when setup in a cluster of UDDI servers implementing
the replication API
 			don't worry, jUDDI doesn't implement it right now, but it may come in the future -->



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org


Mime
View raw message