Author: alexoree
Date: Wed Aug 28 16:22:27 2013
New Revision: 1518278
URL: http://svn.apache.org/r1518278
Log:
JUDDI-579 revising the verbal for the juddi splash screen
JUDDI-242 fixing a few typos in the test resources files (tests are still not
functioning)
Modified:
juddi/trunk/juddiv3-war/src/main/webapp/index.jsp
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/FindTmodelTest.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceSMTP.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2SMTP.xml
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
Modified: juddi/trunk/juddiv3-war/src/main/webapp/index.jsp
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/index.jsp?rev=1518278&r1=1518277&r2=1518278&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/index.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/index.jsp Wed Aug 28 16:22:27 2013
@@ -27,9 +27,13 @@
jUDDI is an open source implementation of <a
href="http://oasis-open.org";>OASIS</a>'s <a
href="http://oasis-open.org/committees/uddi-spec/doc/tcspecs.htm#uddiv3";>Universal
Discovery Description and Integration (UDDI)</a>.
You've reached the deployment page for jUDDI's web services.<br>
- <h4><a href="/juddi-gui">View the jUDDI User Interface (fully featured
end user web app)</a></h4>
- <h4><a href="/pluto/portal/jUDDI">View the jUDDI Portal (older with
limited features)</a></h4>
- <h4><a href="admin">View the jUDDI Administration Interface
(authentication required)</a></h4>
+ Looking for the old jUDDI Portal/Porlets? We've completely
rewritten it.
+
+ <h4><a href="/juddi-gui">View the jUDDI User Interface</a> - This is a
nearly complete UDDIv3 end user web application.</h4>
+
+ <h4><a href="admin">View the jUDDI Administration Interface</a> - This
is for administrators to use to reconfigure jUDDI, check the status, and
perform administrative actions.</h4>
+
+
Here's some useful links to learn more about the UDDI and jUDDI.
<ul>
<li><a href="services">View the service listing on this UDDI
node</a></li>
@@ -43,7 +47,7 @@
<li><a href="http://www.nabble.com/jUDDI-f218.html";>jUDDI's
Mailing lists</a></li>
</ul>
-
+
<div class="install">
<h4>jUDDI Installation Status</h4>
<div class="content">
Modified:
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/FindTmodelTest.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/FindTmodelTest.xml?rev=1518278&r1=1518277&r2=1518278&view=diff
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/FindTmodelTest.xml
(original)
+++
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/FindTmodelTest.xml
Wed Aug 28 16:22:27 2013
@@ -15,7 +15,10 @@
* limitations under the License.
*
*/ -->
-<tModel tModelKey="uddi:uddi.joepublisher.com:tmodelone"
xmlns="urn:uddi-org:api_v3">
+ <save_tModel xmlns="urn:uddi-org:api_v3">
+ <tModel tModelKey="uddi:uddi.joepublisher.com:tmodelone" >
<name>tModel One</name>
<description>This is a test of find_tmodel for subscriptions</description>
</tModel>
+
+ </save_tModel>
Modified:
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceSMTP.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceSMTP.xml?rev=1518278&r1=1518277&r2=1518278&view=diff
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceSMTP.xml
(original)
+++
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceSMTP.xml
Wed Aug 28 16:22:27 2013
@@ -19,8 +19,8 @@
businessKey="uddi:uddi.joepublisher.com:businessone"
serviceKey="uddi:uddi.joepublisher.com:listeneronesmtp">
<name xml:lang="en">Listener Two SMTP</name>
<name xml:lang="es">Listener Dos SMTP </name>
- <description xml:lang="en">This is the description of listener two
rmi.</description>
- <description xml:lang="es">Ãsta es la descripción del listener dos
rmi.</description>
+ <description xml:lang="en">This is the description of listener two
SMTP.</description>
+ <description xml:lang="es">Ãsta es la descripción del listener dos
SMTP.</description>
<bindingTemplates>
<bindingTemplate xmlns="urn:uddi-org:api_v3"
bindingKey="uddi:uddi.joepublisher.com:bindinglistenersmtp">
<description xml:lang="en">This is the endpoint for the SMTP
subscription listener</description>
Modified:
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2.xml?rev=1518278&r1=1518277&r2=1518278&view=diff
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2.xml
(original)
+++
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2.xml
Wed Aug 28 16:22:27 2013
@@ -16,14 +16,14 @@
*
*/
-->
-<subscription xmlns="urn:uddi-org:sub_v3">
+<subscription xmlns="urn:uddi-org:sub_v3" brief="false">
<subscriptionKey>uddi:uddi.joepublisher.com:subscriptionone</subscriptionKey>
<subscriptionFilter>
<find_business xmlns="urn:uddi-org:api_v3"
xmlns:xml="http://www.w3.org/XML/1998/namespace";>
<findQualifiers>
- <findQualifier>exactMatch</findQualifier>
+ <findQualifier>approximateMatch</findQualifier>
</findQualifiers>
- <name xml:lang="en">Listener One</name>
+ <name xml:lang="en">%</name>
</find_business>
</subscriptionFilter>
<bindingKey
xmlns="urn:uddi-org:api_v3">uddi:uddi.joepublisher.com:bindinglistener</bindingKey>
Modified:
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2SMTP.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2SMTP.xml?rev=1518278&r1=1518277&r2=1518278&view=diff
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2SMTP.xml
(original)
+++
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2SMTP.xml
Wed Aug 28 16:22:27 2013
@@ -21,9 +21,9 @@
<subscriptionFilter>
<find_business xmlns="urn:uddi-org:api_v3"
xmlns:xml="http://www.w3.org/XML/1998/namespace";>
<findQualifiers>
- <findQualifier>exactMatch</findQualifier>
+ <findQualifier>approximateMatch</findQualifier>
</findQualifiers>
- <name xml:lang="en">Listener One</name>
+ <name xml:lang="en">%</name>
</find_business>
</subscriptionFilter>
<bindingKey
xmlns="urn:uddi-org:api_v3">uddi:uddi.joepublisher.com:bindinglistenersmtp</bindingKey>
Modified:
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java?rev=1518278&r1=1518277&r2=1518278&view=diff
==============================================================================
---
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
(original)
+++
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
Wed Aug 28 16:22:27 2013
@@ -266,7 +266,7 @@ public class UDDI_090_SubscriptionListen
}
}
- // @Test
+ //@Test
public void joePublisherUpdateBusiness_SMTP_FIND_BUSINESS() {
try {
mailServer = SimpleSmtpServer.start(smtpPort);
@@ -324,7 +324,7 @@ public class UDDI_090_SubscriptionListen
//tmodel tests
- // @Test
+ //@Test
public void joePublisherUpdateBusiness_HTTP_FIND_TMODEL() {
try {
tckTModel.saveJoePublisherTmodel(authInfoJoe);
@@ -355,7 +355,7 @@ public class UDDI_090_SubscriptionListen
if (UDDISubscriptionListenerImpl.notificationCount ==
0) {
Assert.fail("No Notification was sent");
}
- if
(!UDDISubscriptionListenerImpl.notifcationMap.get(0).contains("<name
xml:lang=\"en\">Service One</name>")) {
+ if
(!UDDISubscriptionListenerImpl.notifcationMap.get(0).contains("<name
xml:lang=\"en\">tModel One</name>")) {
Assert.fail("Notification does not contain the
correct service");
}
@@ -373,7 +373,7 @@ public class UDDI_090_SubscriptionListen
}
}
- // @Test
+ //@Test
public void joePublisherUpdateBusiness_SMTP_FIND_TMODEL() {
try {
mailServer = SimpleSmtpServer.start(smtpPort);
@@ -408,7 +408,7 @@ public class UDDI_090_SubscriptionListen
SmtpMessage email = (SmtpMessage)emailIter.next();
System.out.println("Subject:" +
email.getHeaderValue("Subject"));
System.out.println("Body:" + email.getBody());
- if (!email.getBody().contains("Service One")) {
+ if (!email.getBody().contains("tModel One")) {
Assert.fail("Notification does not contain the
correct service");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
