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/12 22:23:41 UTC
svn commit: r824484 - in /webservices/juddi/trunk/juddi-console: ./
juddi-portal/ uddi-portlets/
uddi-portlets/src/main/java/org/apache/juddi/portlets/client/
uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/
uddi-portlets/src/main/...
Author: kstam
Date: Mon Oct 12 20:23:40 2009
New Revision: 824484
URL: http://svn.apache.org/viewvc?rev=824484&view=rev
Log:
JUDDI-240 working on subscription handling, need to break up uddi-client, so juddi-core can depend on juddi-client.
Modified:
webservices/juddi/trunk/juddi-console/juddi-portal/build.xml
webservices/juddi/trunk/juddi-console/juddi-portal/tomcat-users.xml
webservices/juddi/trunk/juddi-console/pom.xml
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SubscriptionTreePanel.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/NotifyServiceImpl.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml
webservices/juddi/trunk/juddi-console/uddi-portlets/uddi-portlets.launch
Modified: webservices/juddi/trunk/juddi-console/juddi-portal/build.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/juddi-portal/build.xml?rev=824484&r1=824483&r2=824484&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/juddi-portal/build.xml (original)
+++ webservices/juddi/trunk/juddi-console/juddi-portal/build.xml Mon Oct 12 20:23:40 2009
@@ -13,7 +13,6 @@
<unzip dest="${webapps.dir}/pluto" src="${dependency.pluto-portal.war}"/>
<delete file="${webapps.dir}/pluto/WEB-INF/lib/commons-logging-api-1.1.jar"/>
<unzip dest="${webapps.dir}/uddi-portlets" src="${dependency.uddi-portlets.war}"/>
- <unzip dest="${webapps.dir}/subscription-listener" src="${dependency.subscription-listener.war}"/>
<!--
<copy file="${basedir}/pluto-portal-driver-config.xml" todir="${webapps.dir}/pluto/WEB-INF"/>
-->
Modified: webservices/juddi/trunk/juddi-console/juddi-portal/tomcat-users.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/juddi-portal/tomcat-users.xml?rev=824484&r1=824483&r2=824484&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/juddi-portal/tomcat-users.xml (original)
+++ webservices/juddi/trunk/juddi-console/juddi-portal/tomcat-users.xml Mon Oct 12 20:23:40 2009
@@ -2,14 +2,11 @@
<tomcat-users>
<role rolename="pluto"/>
<role rolename="tomcat"/>
- <role rolename="role1"/>
<role rolename="manager"/>
<user username="root" password="root" roles="pluto,tomcat,manager"/>
- <user username="affa" password="affa" roles="pluto"/>
- <user username="uddi" password="uddi" roles="pluto"/>
- <user username="juddi" password="juddi" roles="pluto,tomcat,manager"/>
- <user username="pluto" password="pluto" roles="pluto,tomcat,manager"/>
- <user username="tomcat" password="tomcat" roles="tomcat,pluto,manager"/>
- <user username="role1" password="tomcat" roles="role1"/>
- <user username="both" password="tomcat" roles="tomcat,role1"/>
+ <user username="uddi" password="uddi" roles="pluto,tomcat,manager"/>
+ <user username="itmark" password="itmark" roles="pluto,tomcat,manager"/>
+ <user username="itsales" password="itsales" roles="pluto,tomcat,manager"/>
+ <user username="saleslistener" password="saleslistener" roles="pluto,tomcat,manager"/>
+ <user username="marketinglistener" password="marketinglistener" roles="pluto,tomcat,manager"/>
</tomcat-users>
Modified: webservices/juddi/trunk/juddi-console/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/pom.xml?rev=824484&r1=824483&r2=824484&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/pom.xml (original)
+++ webservices/juddi/trunk/juddi-console/pom.xml Mon Oct 12 20:23:40 2009
@@ -52,7 +52,6 @@
</distributionManagement>
<modules>
<module>uddi-portlets</module>
- <module>subscription-listener</module>
<module>juddi-portal</module>
</modules>
<build>
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SubscriptionTreePanel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SubscriptionTreePanel.java?rev=824484&r1=824483&r2=824484&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SubscriptionTreePanel.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/SubscriptionTreePanel.java Mon Oct 12 20:23:40 2009
@@ -80,7 +80,7 @@
}
} else {
- Window.alert("error: " + response.getMessage() + ". Make sure the UDDI server is up and running.");
+ Window.alert(response.getMessage());
}
}
});
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/NotifyServiceImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/NotifyServiceImpl.java?rev=824484&r1=824483&r2=824484&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/NotifyServiceImpl.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/NotifyServiceImpl.java Mon Oct 12 20:23:40 2009
@@ -50,7 +50,7 @@
URL url = new URL(getThreadLocalRequest().getScheme(),
getThreadLocalRequest().getRemoteHost(),
getThreadLocalRequest().getLocalPort(),
- "/subscription-listener/notify/");
+ "/juddiv3/notify/");
URLConnection con = url.openConnection();
con.setDoOutput(true);
con.setDoInput(true);
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=824484&r1=824483&r2=824484&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 Mon Oct 12 20:23:40 2009
@@ -71,10 +71,11 @@
}
logger.debug("Publisher " + publisher + " sending getSubscription request..");
try {
+ boolean isMatchingClerk=false;
Map<String, UDDIClerk> clerks = UDDIClerkManager.getClientConfig().getClerks();
for (UDDIClerk clerk : clerks.values()) {
if (publisher.equals(clerk.getPublisher())) {
-
+ isMatchingClerk = true;
Node modelNode = getSubscriptions(session, clerk);
if (UP.equals(modelNode.getStatus())) {
response.setSuccess(true);
@@ -83,6 +84,9 @@
response.getNodes().add(modelNode);
}
}
+ if (! isMatchingClerk) {
+ response.setMessage("This user is not setup to own subscriptions");
+ }
} catch (Exception e) {
response.setSuccess(false);
response.setMessage(e.getMessage());
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml?rev=824484&r1=824483&r2=824484&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml Mon Oct 12 20:23:40 2009
@@ -63,10 +63,11 @@
</node>
</nodes>
<clerks registerOnStartup="false">
- <clerk name="default" node="default" publisher="root" password="root"/>
- <clerk name="medroot" node="med" publisher="root" password="root"/>
+ <clerk name="marketing" node="default" publisher="marketinglistener" password="marketinglistener"/>
+ <clerk name="marketingmed" node="med" publisher="marketinglistener" password="marketinglistener"/>
<xregister>
- <service bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" fromClerk="default" toClerk="medroot"/>
+
+ <servicebinding bindingKey="uddi:marketing.apache.org:servicebindings-subscriptionlistener-ws" fromClerk="marketing" toClerk="sales"/>
</xregister>
</clerks>
</manager>
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/uddi-portlets.launch
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/uddi-portlets.launch?rev=824484&r1=824483&r2=824484&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/uddi-portlets.launch (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/uddi-portlets.launch Mon Oct 12 20:23:40 2009
@@ -8,7 +8,7 @@
</listAttribute>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;javaProject name=&quot;juddi-console&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;default/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;javaProject name=&quot;jUDDI&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;javaProject name=&quot;juddi-console&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;default/&gt;&#10;" typeId="org
.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="UDDIConsole" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="juddi-console" type="1"/> "/>
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org