Author: alexoree
Date: Mon Dec 9 00:40:43 2013
New Revision: 1549363
URL: http://svn.apache.org/r1549363
Log:
Merged revision(s) 1548772-1549358 from juddi/trunk:
JUDDI-738 done
JUDDI-739 fixed, done
JUDDI-733 fixed done
........
JUDDI-741 done
........
JUDDI-575 added test cases and corrects all test cases
........
JUDDI-575 revising test case xml docs
........
JUDDI-740 fixed
JUDDI-742 added test cases for most operations.
........
JUDDI-740 fixed
JUDDI-742 added test cases for most operations.
........
JUDDI-742 done
JUDDI-737 done and documented
........
JUDDI-742 done
JUDDI-737 done and documented
........
JUDDI-198 adding test class
Added:
juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_150_ValueSetValidationTest.java
juddi/branches/juddi-3.3.x/juddi-rest-cxf/src/test/
- copied from r1549358, juddi/trunk/juddi-rest-cxf/src/test/
juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/rest/
- copied from r1549358,
juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/rest/
Modified:
juddi/branches/juddi-3.3.x/ (props changed)
juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3-enc-3des.xml
juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes128.xml
juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes256.xml
juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3-enc-default.xml
juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3.xml
juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/config/Install.java
(contents, props changed)
juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/config/Property.java
juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
juddi/branches/juddi-3.3.x/juddi-core/src/main/resources/juddi_install_data/
(props changed)
juddi/branches/juddi-3.3.x/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
juddi/branches/juddi-3.3.x/juddi-core/src/test/resources/juddiv3-enc-3des.xml
juddi/branches/juddi-3.3.x/juddi-core/src/test/resources/juddiv3-enc-aes128.xml
juddi/branches/juddi-3.3.x/juddi-core/src/test/resources/juddiv3-enc-aes256.xml
juddi/branches/juddi-3.3.x/juddi-core/src/test/resources/juddiv3-enc-default.xml
juddi/branches/juddi-3.3.x/juddi-core/src/test/resources/juddiv3.xml
juddi/branches/juddi-3.3.x/juddi-examples/hello-world-embedded/src/main/resources/juddiv3.xml
juddi/branches/juddi-3.3.x/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.xml
juddi/branches/juddi-3.3.x/juddi-rest-cxf/pom.xml
juddi/branches/juddi-3.3.x/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java
juddi/branches/juddi-3.3.x/juddi-rest-cxf/src/test/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRSTest.java
juddi/branches/juddi-3.3.x/juddiv3-war/JAX-WS/CXF/WEB-INF/beans.xml
juddi/branches/juddi-3.3.x/juddiv3-war/pom.xml
juddi/branches/juddi-3.3.x/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
juddi/branches/juddi-3.3.x/pom.xml
juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java
(contents, props changed)
juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java
(contents, props changed)
juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/
(props changed)
juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/find/findBusiness1.xml
juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/find/findService1.xml
juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntity.xml
juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessService.xml
juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessService2.xml
juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/businessEntity.xml
juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/businessEntity_withProjection.xml
juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/businessService.xml
juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription1.xml
juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerService.xml
juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceRMI.xml
juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceSMTP.xml
juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java
juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClientSubscriptionInfo.java
juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/uddi/api_v3/OperationalInfo.java
juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/uddi/sub_v3/KeyBag.java
Propchange: juddi/branches/juddi-3.3.x/
------------------------------------------------------------------------------
Merged /juddi/trunk:r1548772-1549358
Modified:
juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3-enc-3des.xml
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3-enc-3des.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
---
juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3-enc-3des.xml
(original)
+++
juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3-enc-3des.xml
Mon Dec 9 00:40:43 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/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes128.xml
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes128.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
---
juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes128.xml
(original)
+++
juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes128.xml
Mon Dec 9 00:40:43 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/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes256.xml
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes256.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
---
juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes256.xml
(original)
+++
juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes256.xml
Mon Dec 9 00:40:43 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/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3-enc-default.xml
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3-enc-default.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
---
juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3-enc-default.xml
(original)
+++
juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3-enc-default.xml
Mon Dec 9 00:40:43 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/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3.xml
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
---
juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3.xml
(original)
+++
juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/juddiv3.xml
Mon Dec 9 00:40:43 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/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/config/Install.java
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/config/Install.java?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
---
juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/config/Install.java
(original)
+++
juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/config/Install.java
Mon Dec 9 00:40:43 2013
@@ -346,8 +346,8 @@ public class Install {
validatePublish.validateNames(businessEntity.getName());
validatePublish.validateDiscoveryUrls(businessEntity.getDiscoveryURLs());
validatePublish.validateContacts(businessEntity.getContacts(),config);
-
validatePublish.validateCategoryBag(businessEntity.getCategoryBag(),config);
-
validatePublish.validateIdentifierBag(businessEntity.getIdentifierBag(),config);
+
validatePublish.validateCategoryBag(businessEntity.getCategoryBag(),config,
true);
+
validatePublish.validateIdentifierBag(businessEntity.getIdentifierBag(),config,
true);
org.uddi.api_v3.BusinessServices businessServices =
businessEntity.getBusinessServices();
if (businessServices != null) {
@@ -399,7 +399,7 @@ public class Install {
ValidatePublish validatePublish = new
ValidatePublish(rootPublisher);
validatePublish.validateNames(businessService.getName());
-
validatePublish.validateCategoryBag(businessService.getCategoryBag(), config);
+
validatePublish.validateCategoryBag(businessService.getCategoryBag(),
config,true);
org.uddi.api_v3.BindingTemplates bindingTemplates =
businessService.getBindingTemplates();
if (bindingTemplates != null) {
@@ -449,8 +449,8 @@ public class Install {
ValidatePublish validatePublish = new
ValidatePublish(rootPublisher);
-
validatePublish.validateCategoryBag(bindingTemplate.getCategoryBag(), config);
-
validatePublish.validateTModelInstanceDetails(bindingTemplate.getTModelInstanceDetails(),config);
+
validatePublish.validateCategoryBag(bindingTemplate.getCategoryBag(),
config,true);
+
validatePublish.validateTModelInstanceDetails(bindingTemplate.getTModelInstanceDetails(),config,true);
}
Propchange:
juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/config/Install.java
------------------------------------------------------------------------------
Merged
/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java:r1548772-1549358
Modified:
juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/config/Property.java
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/config/Property.java?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
---
juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/config/Property.java
(original)
+++
juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/config/Property.java
Mon Dec 9 00:40:43 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";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
