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/09 03:57:36 UTC
svn commit: r823379 - in /webservices/juddi/trunk/juddi-console:
subscription-listener/src/main/resources/META-INF/
uddi-portlets/src/main/java/org/apache/juddi/portlets/client/
uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/
Author: kstam
Date: Fri Oct 9 01:57:35 2009
New Revision: 823379
URL: http://svn.apache.org/viewvc?rev=823379&view=rev
Log:
JUDDI-240 working on subscription handling
Modified:
webservices/juddi/trunk/juddi-console/subscription-listener/src/main/resources/META-INF/uddi.xml
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SubscriptionPanel.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java
Modified: webservices/juddi/trunk/juddi-console/subscription-listener/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/subscription-listener/src/main/resources/META-INF/uddi.xml?rev=823379&r1=823378&r2=823379&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/subscription-listener/src/main/resources/META-INF/uddi.xml (original)
+++ webservices/juddi/trunk/juddi-console/subscription-listener/src/main/resources/META-INF/uddi.xml Fri Oct 9 01:57:35 2009
@@ -6,13 +6,11 @@
<nodes>
<node>
<name>default</name>
- <description>Main jUDDI node</description>
- <!--
+ <description>Main jUDDI node</description>
<properties>
<property name="serverName" value="localhost"/>
<property name="serverPort" value="8080"/>
</properties>
- -->
<!-- JAX-WS Transport
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SubscriptionPanel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SubscriptionPanel.java?rev=823379&r1=823378&r2=823379&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SubscriptionPanel.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SubscriptionPanel.java Fri Oct 9 01:57:35 2009
@@ -124,8 +124,8 @@
protected void newSubscription(Node node){
subscription = new Subscription();
- subscription.setSubscriptionKey("uddi:uddi.listeningforchanges.com:callthiskeytonotify");
- subscription.setBindingKey("uddi:uddi.example.com:subscriptionone");
+ subscription.setSubscriptionKey("uddi:juddi.apache.org:subscriptions-key1");
+ subscription.setBindingKey("uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws");
subscription.setBrief(true);
subscription.setMaxEntities(1000);
subscription.setNotificationInterval("P5D");
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java?rev=823379&r1=823378&r2=823379&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java Fri Oct 9 01:57:35 2009
@@ -87,7 +87,7 @@
try {
AuthToken clerkToken = login(clerk.getPublisher(), clerk.getPassword(), clerk.getNode().getName());
//set the clerkToken into the session
- session.setAttribute(clerk.getName(), clerkToken.getAuthInfo());
+ session.setAttribute("token-" + clerk.getName(), clerkToken.getAuthInfo());
} catch (Exception e) {
log.warn("Could not obtain authToken for clerk=" + clerk.getName());
}
@@ -118,9 +118,9 @@
InstantiationException, IllegalAccessException, TransportException, DispositionReportFaultMessage, RemoteException,
IllegalArgumentException, SecurityException, InvocationTargetException, NoSuchMethodException {
- String clazz = UDDIClerkManager.getClientConfig().getNodes().get(Constants.NODE_NAME).getProxyTransport();
+ String clazz = UDDIClerkManager.getClientConfig().getNodes().get(node).getProxyTransport();
Class<?> transportClass = Loader.loadClass(clazz);
- Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(Constants.NODE_NAME);
+ Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(node);
UDDISecurityPortType securityService = transport.getUDDISecurityService();
GetAuthToken getAuthToken = new GetAuthToken();
getAuthToken.setUserID(username);
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java?rev=823379&r1=823378&r2=823379&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java Fri Oct 9 01:57:35 2009
@@ -99,10 +99,10 @@
modelNode.setClerkName(clerk.getName());
modelNode.setDescription(node.getDescription());
try {
- String clazz = UDDIClerkManager.getClientConfig().getNodes().get(Constants.NODE_NAME).getProxyTransport();
+ String clazz = UDDIClerkManager.getClientConfig().getNodes().get(clerk.getNode().getName()).getProxyTransport();
Class<?> transportClass = Loader.loadClass(clazz);
- Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(Constants.NODE_NAME);
- String authToken = (String) session.getAttribute(clerk.getName());
+ Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(clerk.getNode().getName());
+ String authToken = (String) session.getAttribute("token-" + clerk.getName());
UDDISubscriptionPortType subscriptionService = transport.getUDDISubscriptionService();
List<org.uddi.sub_v3.Subscription> subscriptions = subscriptionService.getSubscriptions(authToken);
@@ -163,7 +163,7 @@
subscriptionList.add(subscription);
Holder<List<org.uddi.sub_v3.Subscription>> subscriptionHolder = new Holder<List<org.uddi.sub_v3.Subscription>>();
subscriptionHolder.value = subscriptionList;
- String authToken = (String) session.getAttribute(clerk.getName());
+ String authToken = (String) session.getAttribute("token-" + clerk.getName());
subscriptionService.saveSubscription(authToken, subscriptionHolder);
subscription = subscriptionHolder.value.get(0);
String expiresAfter = null;
@@ -210,7 +210,7 @@
Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(clerk.getNode().getName());
UDDISubscriptionPortType subscriptionService = transport.getUDDISubscriptionService();
DeleteSubscription deleteSubscription = new DeleteSubscription();
- String authToken = (String) session.getAttribute(clerk.getName());
+ String authToken = (String) session.getAttribute("token-" + clerk.getName());
deleteSubscription.setAuthInfo(authToken);
deleteSubscription.getSubscriptionKey().add(modelSubscription.getSubscriptionKey());
subscriptionService.deleteSubscription(deleteSubscription);
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org