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/07/03 21:21:23 UTC
svn commit: r790994 - in /webservices/juddi/branches/v3_trunk:
juddi-core/src/main/java/org/apache/juddi/api/impl/
juddi-core/src/main/java/org/apache/juddi/rmi/
juddi-core/src/main/resources/juddi_install_data/
juddi-cxf/src/main/webapp/WEB-INF/ uddi-...
Author: kstam
Date: Fri Jul 3 19:21:22 2009
New Revision: 790994
URL: http://svn.apache.org/viewvc?rev=790994&view=rev
Log:
JUDDI-259 lining up namespace with the package name, and hooking up the ObjectFactory in the JUDDIApiPortType so that marshalling actually works.
Added:
webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/JUDDI_010_PublisherIntegrationTest.java
Modified:
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/rmi/JUDDIApiService.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_Publisher.xml
webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/juddi_install_data/root_Publisher.xml
webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml
webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/Transport.java
webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/publisher.xml
webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/publisher.xml
webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetAllPublisherDetail.java
webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetPublisherDetail.java
webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/ObjectFactory.java
webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Publisher.java
webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/package-info.java
webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java?rev=790994&r1=790993&r2=790994&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java Fri Jul 3 19:21:22 2009
@@ -49,7 +49,7 @@
*/
@WebService(serviceName="JUDDIApiService",
endpointInterface="org.apache.juddi.v3_service.JUDDIApiPortType",
- targetNamespace = "urn:apache-org:juddi_api_v3_portType")
+ targetNamespace = "urn:juddi-apache-org:api_v3_portType")
public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortType {
/**
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/rmi/JUDDIApiService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/rmi/JUDDIApiService.java?rev=790994&r1=790993&r2=790994&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/rmi/JUDDIApiService.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/rmi/JUDDIApiService.java Fri Jul 3 19:21:22 2009
@@ -26,6 +26,7 @@
import org.apache.juddi.api_v3.PublisherDetail;
import org.apache.juddi.api_v3.SavePublisher;
import org.apache.juddi.v3_service.JUDDIApiPortType;
+import org.uddi.api_v3.DeleteTModel;
import org.uddi.v3_service.DispositionReportFaultMessage;
/**
* UDDIPublicationPortType wrapper so it can be exposed as a service over RMI.
@@ -36,7 +37,7 @@
public class JUDDIApiService extends UnicastRemoteObject implements JUDDIApiPortType {
private static final long serialVersionUID = 1L;
- private JUDDIApiPortType publisher = new JUDDIApiImpl();
+ private JUDDIApiPortType juddiAPI = new JUDDIApiImpl();
protected JUDDIApiService() throws RemoteException {
super();
@@ -44,23 +45,30 @@
public void deletePublisher(DeletePublisher body)
throws DispositionReportFaultMessage, RemoteException {
- publisher.deletePublisher(body);
+ juddiAPI.deletePublisher(body);
}
public PublisherDetail getAllPublisherDetail(GetAllPublisherDetail body)
throws DispositionReportFaultMessage, RemoteException {
- return publisher.getAllPublisherDetail(body);
+ return juddiAPI.getAllPublisherDetail(body);
}
public PublisherDetail getPublisherDetail(GetPublisherDetail body)
throws DispositionReportFaultMessage, RemoteException {
- return publisher.getPublisherDetail(body);
+ return juddiAPI.getPublisherDetail(body);
}
public PublisherDetail savePublisher(SavePublisher body)
throws DispositionReportFaultMessage, RemoteException {
- return publisher.savePublisher(body);
+ return juddiAPI.savePublisher(body);
}
+ public void adminDeleteTModel(DeleteTModel body)
+ throws DispositionReportFaultMessage, RemoteException {
+ juddiAPI.adminDeleteTModel(body);
+ }
+
+
+
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_Publisher.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_Publisher.xml?rev=790994&r1=790993&r2=790994&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_Publisher.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_Publisher.xml Fri Jul 3 19:21:22 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/ -->
-<publisher xmlns="urn:apache-org:juddi_api_v3" authorizedName="uddi">
+<publisher xmlns="urn:juddi-apache-org:api_v3" authorizedName="uddi">
<publisherName>UDDI publisher</publisherName>
<isAdmin>false</isAdmin>
</publisher>
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/juddi_install_data/root_Publisher.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/juddi_install_data/root_Publisher.xml?rev=790994&r1=790993&r2=790994&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/juddi_install_data/root_Publisher.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/juddi_install_data/root_Publisher.xml Fri Jul 3 19:21:22 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/ -->
-<publisher xmlns="urn:apache-org:juddi_api_v3" authorizedName="root">
+<publisher xmlns="urn:juddi-apache-org:api_v3" authorizedName="root">
<publisherName>root publisher</publisherName>
<isAdmin>true</isAdmin>
</publisher>
Modified: webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml?rev=790994&r1=790993&r2=790994&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml Fri Jul 3 19:21:22 2009
@@ -88,7 +88,7 @@
</jaxws:endpoint>
<jaxws:endpoint id="juddi-api" implementor="org.apache.juddi.api.impl.JUDDIApiImpl" address="/juddi-api"
- serviceName="a:JUDDIApiService" endpointName="a:JUDDIApiServicePort" xmlns:a="urn:apache-org:juddi_api_v3_portType">
+ serviceName="a:JUDDIApiService" endpointName="a:JUDDIApiServicePort" xmlns:a="urn:juddi-apache-org:api_v3_portType">
<jaxws:properties>
<entry key="schema-validation-enabled" value="true"/>
</jaxws:properties>
Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/Transport.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/Transport.java?rev=790994&r1=790993&r2=790994&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/Transport.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/transport/Transport.java Fri Jul 3 19:21:22 2009
@@ -29,7 +29,7 @@
public final static String SUB_V3_NAMESPACE = "urn:uddi-org:sub_v3_portType";
public final static String SUBR_V3_NAMESPACE = "urn:uddi-org:subr_v3_portType";
public final static String CUSTODY_V3_NAMESPACE = "urn:uddi-org:custody_v3_portType";
- public final static String JUDDI_API_V3_NAMESPACE = "urn:apache-org:juddi_api_v3";
+ public final static String JUDDI_API_V3_NAMESPACE = "urn:juddi-apache-org:api_v3_portType";
public final static String INQUIRY_SERVICE = "UDDIInquiryService";
public final static String SECURITY_SERVICE = "UDDISecurityService";
Added: webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/JUDDI_010_PublisherIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/JUDDI_010_PublisherIntegrationTest.java?rev=790994&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/JUDDI_010_PublisherIntegrationTest.java (added)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/JUDDI_010_PublisherIntegrationTest.java Fri Jul 3 19:21:22 2009
@@ -0,0 +1,270 @@
+/*
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juddi.client;
+
+import static junit.framework.Assert.assertEquals;
+
+import java.rmi.RemoteException;
+import java.util.List;
+
+import javax.xml.ws.soap.SOAPFaultException;
+
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.juddi.Registry;
+import org.apache.juddi.api_v3.DeletePublisher;
+import org.apache.juddi.api_v3.GetPublisherDetail;
+import org.apache.juddi.api_v3.Publisher;
+import org.apache.juddi.api_v3.PublisherDetail;
+import org.apache.juddi.api_v3.SavePublisher;
+import org.apache.juddi.config.Constants;
+import org.apache.juddi.error.InvalidKeyPassedException;
+import org.apache.juddi.v3_service.JUDDIApiPortType;
+import org.apache.log4j.Logger;
+import org.apache.log4j.helpers.Loader;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.uddi.api_v3.AuthToken;
+import org.uddi.api_v3.GetAuthToken;
+import org.uddi.api_v3.client.config.ClientConfig;
+import org.uddi.api_v3.client.config.Property;
+import org.uddi.api_v3.client.transport.InVMTransport;
+import org.uddi.api_v3.client.transport.Transport;
+import org.uddi.api_v3.tck.EntityCreator;
+import org.uddi.api_v3.tck.TckPublisher;
+import org.uddi.api_v3.tck.TckSecurity;
+import org.uddi.v3_service.DispositionReportFaultMessage;
+import org.uddi.v3_service.UDDISecurityPortType;
+
+/**
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ */
+public class JUDDI_010_PublisherIntegrationTest {
+
+ private static Logger logger = Logger.getLogger(JUDDI_010_PublisherIntegrationTest.class);
+
+ private static UDDISecurityPortType security =null;
+ private static JUDDIApiPortType publisher = null;
+ private static String authInfo = null;
+
+ @BeforeClass
+ public static void startRegistry() throws ConfigurationException {
+ String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ if (InVMTransport.class.getName().equals(clazz)) {
+ Registry.start();
+ }
+ logger.debug("Getting auth tokens..");
+ try {
+ Class<?> transportClass = Loader.loadClass(clazz);
+ if (transportClass!=null) {
+ Transport transport = (Transport) transportClass.newInstance();
+ security = transport.getUDDISecurityService();
+ publisher = transport.getJUDDIApiService();
+ } else {
+ Assert.fail();
+ }
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("Could not obtain authInfo token.");
+ }
+ }
+
+ @AfterClass
+ public static void stopRegistry() throws ConfigurationException {
+ String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ if (InVMTransport.class.getName().equals(clazz)) {
+ Registry.stop();
+ }
+ }
+
+ @Test
+ public void testAuthToken() {
+ try {
+ String clazz = ClientConfig.getConfiguration().getString(Property.UDDI_PROXY_TRANSPORT,Property.DEFAULT_UDDI_PROXY_TRANSPORT);
+ Class<?> transportClass = Loader.loadClass(clazz);
+ if (transportClass!=null) {
+ Transport transport = (Transport) transportClass.newInstance();
+
+ UDDISecurityPortType securityService = transport.getUDDISecurityService();
+ GetAuthToken getAuthToken = new GetAuthToken();
+ getAuthToken.setUserID("root");
+ getAuthToken.setCred("");
+ AuthToken authToken = securityService.getAuthToken(getAuthToken);
+ System.out.println(authToken.getAuthInfo());
+ Assert.assertNotNull(authToken);
+ } else {
+ Assert.fail();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ Assert.fail();
+ }
+ }
+
+ @Test
+ public void testJoePublisher() {
+ //We can only test this if the publisher is not there already.
+ //If it already there is probably has foreign key relationships.
+ //This test should really only run on an empty database. Seed
+ //data will be added if the root publisher is missing.
+ if (!isExistPublisher(TckPublisher.JOE_PUBLISHER_ID)) {
+ saveJoePublisher();
+ deleteJoePublisher();
+ }
+ }
+
+ @Test
+ public void testSamSyndicator() {
+ //We can only test this if the publisher is not there already.
+ if (!isExistPublisher(TckPublisher.SAM_SYNDICATOR_ID)) {
+ saveSamSyndicator();
+ deleteSamSyndicator();
+ }
+ }
+ /**
+ * Persists Joe Publisher to the database.
+ * @return - true if the published did not exist already,
+ * - false in all other cases.
+ */
+ public boolean saveJoePublisher() {
+ if (!isExistPublisher(TckPublisher.JOE_PUBLISHER_ID)) {
+ savePublisher(TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_XML);
+ return true;
+ } else {
+ return false;
+ }
+ }
+ /**
+ * Removes Joe Publisher from the database, this will fail if there
+ * are child objects attached; think Services etc.
+ */
+ public void deleteJoePublisher() {
+ deletePublisher(TckPublisher.JOE_PUBLISHER_ID);
+ }
+ /**
+ * Persists Sam Syndicator to the database.
+ * @return publisherId
+ */
+ public String saveSamSyndicator() {
+ if (!isExistPublisher(TckPublisher.SAM_SYNDICATOR_ID)) {
+ savePublisher(TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_XML);
+ }
+ return TckPublisher.SAM_SYNDICATOR_ID;
+ }
+ /**
+ * Removes Sam Syndicator from the database, this will fail if there
+ * are child objects attached; think Services etc.
+ */
+ public void deleteSamSyndicator() {
+ deletePublisher(TckPublisher.SAM_SYNDICATOR_ID);
+ }
+
+ private void savePublisher(String publisherId, String publisherXML) {
+ try {
+ authInfo = TckSecurity.getAuthToken(security, Constants.ROOT_PUBLISHER, "");
+ logger.debug("Saving new publisher: " + publisherXML);
+ SavePublisher sp = new SavePublisher();
+ sp.setAuthInfo(authInfo);
+ Publisher pubIn = (Publisher)EntityCreator.buildFromDoc(publisherXML, "org.apache.juddi.api_v3");
+ sp.getPublisher().add(pubIn);
+ publisher.savePublisher(sp);
+
+ // Now get the entity and check the values
+ GetPublisherDetail gp = new GetPublisherDetail();
+ gp.getPublisherId().add(publisherId);
+ gp.setAuthInfo(authInfo);
+ PublisherDetail pd = publisher.getPublisherDetail(gp);
+ List<Publisher> pubOutList = pd.getPublisher();
+ Publisher pubOut = pubOutList.get(0);
+
+ assertEquals(pubIn.getAuthorizedName(), pubOut.getAuthorizedName());
+ assertEquals(pubIn.getPublisherName(), pubOut.getPublisherName());
+ assertEquals(pubIn.getEmailAddress(), pubOut.getEmailAddress());
+ assertEquals(pubIn.getIsAdmin(), pubOut.getIsAdmin());
+ assertEquals(pubIn.getIsEnabled(), pubOut.getIsEnabled());
+ assertEquals(pubIn.getMaxBindingsPerService(), pubOut.getMaxBindingsPerService());
+ assertEquals(pubIn.getMaxBusinesses(), pubOut.getMaxBusinesses());
+ assertEquals(pubIn.getMaxServicePerBusiness(), pubOut.getMaxServicePerBusiness());
+ assertEquals(pubIn.getMaxTModels(), pubOut.getMaxTModels());
+
+ logger.debug("Querying for publisher: " + publisherXML);
+ //Querying for this publisher to make sure it's really gone
+ //We're expecting a invalid Key exception at this point.
+ PublisherDetail pdBeforeDelete =null;
+ try {
+ pdBeforeDelete = publisher.getPublisherDetail(gp);
+ Assert.assertNotNull(pdBeforeDelete);
+ } catch (InvalidKeyPassedException e) {
+ Assert.fail("We expected to find publisher " + publisherXML);
+ }
+
+ } catch(Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown");
+ }
+ }
+
+ private void deletePublisher(String publisherId) {
+ try {
+ authInfo = TckSecurity.getAuthToken(security, Constants.ROOT_PUBLISHER, "");
+ logger.debug("Delete publisher: " + publisherId);
+ //Now deleting this publisher
+ DeletePublisher dp = new DeletePublisher();
+ dp.setAuthInfo(authInfo);
+ dp.getPublisherId().add(publisherId);
+ publisher.deletePublisher(dp);
+
+ logger.info("Querying for publisher: " + publisherId + " after deletion.");
+ //Querying for this publisher to make sure it's really gone
+ //We're expecting a invalid Key exception at this point.
+ GetPublisherDetail gp = new GetPublisherDetail();
+ gp.getPublisherId().add(publisherId);
+ gp.setAuthInfo(authInfo);
+ PublisherDetail pdAfterDelete =null;
+ try {
+ pdAfterDelete = publisher.getPublisherDetail(gp);
+ Assert.fail("We did not expect to find this publisher anymore.");
+ //don't think we really want a SOAPFaulException be thrown here.
+ } catch (SOAPFaultException e) {
+ Assert.assertNull(pdAfterDelete);
+ }
+
+ } catch(Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown");
+ }
+ }
+
+ private boolean isExistPublisher(String publisherId) {
+ GetPublisherDetail gp = new GetPublisherDetail();
+ gp.getPublisherId().add(publisherId);
+ try {
+ publisher.getPublisherDetail(gp);
+ return true;
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
+ protected String authInfoJoe() throws RemoteException, DispositionReportFaultMessage {
+ return TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
+ }
+
+ protected String authInfoSam() throws RemoteException, DispositionReportFaultMessage {
+ return TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_CRED);
+ }
+
+}
Modified: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/publisher.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/publisher.xml?rev=790994&r1=790993&r2=790994&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/publisher.xml (original)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/publisher.xml Fri Jul 3 19:21:22 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/ -->
-<publisher xmlns="urn:apache-org:juddi_api_v3" authorizedName="joepublisher">
+<publisher xmlns="urn:juddi-apache-org:api_v3" authorizedName="joepublisher">
<publisherName>Joe Publisher</publisherName>
<emailAddress>jpublisher@business.com</emailAddress>
<isAdmin>true</isAdmin>
Modified: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/publisher.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/publisher.xml?rev=790994&r1=790993&r2=790994&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/publisher.xml (original)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/publisher.xml Fri Jul 3 19:21:22 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/ -->
-<publisher xmlns="urn:apache-org:juddi_api_v3" authorizedName="ssyndicator">
+<publisher xmlns="urn:juddi-apache-org:api_v3" authorizedName="ssyndicator">
<publisherName>Sam Syndicator</publisherName>
<emailAddress>ssyndicator@samco.com</emailAddress>
<isAdmin>false</isAdmin>
Modified: webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetAllPublisherDetail.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetAllPublisherDetail.java?rev=790994&r1=790993&r2=790994&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetAllPublisherDetail.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetAllPublisherDetail.java Fri Jul 3 19:21:22 2009
@@ -22,6 +22,7 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -39,6 +40,7 @@
@XmlTransient
private static final long serialVersionUID = 1L;
+ @XmlElement(namespace = "urn:uddi-org:api_v3")
protected String authInfo;
/**
Modified: webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetPublisherDetail.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetPublisherDetail.java?rev=790994&r1=790993&r2=790994&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetPublisherDetail.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetPublisherDetail.java Fri Jul 3 19:21:22 2009
@@ -34,7 +34,7 @@
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "get_publisherDetail", propOrder = {
+@XmlType(name = "get_publisher_detail", propOrder = {
"authInfo",
"publisherId"
})
Modified: webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/ObjectFactory.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/ObjectFactory.java?rev=790994&r1=790993&r2=790994&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/ObjectFactory.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/ObjectFactory.java Fri Jul 3 19:21:22 2009
@@ -36,22 +36,23 @@
* groups. Factory methods for each of these are
* provided in this class.
*
- * This object was copied from the UDDI generated package and hand-edited to fit the juddi specific Publisher structures.
+ * This object was copied from the UDDI generated package
+ * and hand-edited to fit the juddi specific Publisher structures.
*
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@XmlRegistry
public class ObjectFactory {
- private final static QName _SavePublisher_QNAME = new QName("urn:apache-org:juddi_api_v3", "save_publisher");
- private final static QName _DeletePublisher_QNAME = new QName("urn:apache-org:juddi_api_v3", "delete_publisher");
- private final static QName _Publisher_QNAME = new QName("urn:apache-org:juddi_api_v3", "publisher");
- private final static QName _PublisherDetail_QNAME = new QName("urn:apache-org:juddi_api_v3", "publisherDetail");
- private final static QName _GetPublisherDetail_QNAME = new QName("urn:apache-org:juddi_api_v3", "get_publisherDetail");
- private final static QName _GetAllPublisherDetail_QNAME = new QName("urn:apache-org:juddi_api_v3", "get_allPublisherDetail");
+ private final static QName _SavePublisher_QNAME = new QName("urn:juddi-apache-org:api_v3", "save_publisher");
+ private final static QName _DeletePublisher_QNAME = new QName("urn:juddi-apache-org:api_v3", "delete_publisher");
+ private final static QName _Publisher_QNAME = new QName("urn:juddi-apache-org:api_v3", "publisher");
+ private final static QName _PublisherDetail_QNAME = new QName("urn:juddi-apache-org:api_v3", "publisherDetail");
+ private final static QName _GetPublisherDetail_QNAME = new QName("urn:juddi-apache-org:api_v3", "get_publisherDetail");
+ private final static QName _GetAllPublisherDetail_QNAME = new QName("urn:juddi-apache-org:api_v3", "get_allPublisherDetail");
/**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.uddi.api_v3
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.juddi.api_v3
*
*/
public ObjectFactory() {
@@ -110,7 +111,7 @@
* Create an instance of {@link JAXBElement }{@code <}{@link SavePublisher }{@code >}}
*
*/
- @XmlElementDecl(namespace = "urn:apache-org:juddi_api_v3", name = "save_publisher")
+ @XmlElementDecl(namespace = "urn:juddi-apache-org:api_v3", name = "save_publisher")
public JAXBElement<SavePublisher> createSavePublisher(SavePublisher value) {
return new JAXBElement<SavePublisher>(_SavePublisher_QNAME, SavePublisher.class, null, value);
}
@@ -119,7 +120,7 @@
* Create an instance of {@link JAXBElement }{@code <}{@link DeletePublisher }{@code >}}
*
*/
- @XmlElementDecl(namespace = "urn:apache-org:juddi_api_v3", name = "delete_publisher")
+ @XmlElementDecl(namespace = "urn:juddi-apache-org:api_v3", name = "delete_publisher")
public JAXBElement<DeletePublisher> createDeletePublisher(DeletePublisher value) {
return new JAXBElement<DeletePublisher>(_DeletePublisher_QNAME, DeletePublisher.class, null, value);
}
@@ -128,7 +129,7 @@
* Create an instance of {@link JAXBElement }{@code <}{@link Publisher }{@code >}}
*
*/
- @XmlElementDecl(namespace = "urn:apache-org:juddi_api_v3", name = "publisher")
+ @XmlElementDecl(namespace = "urn:juddi-apache-org:api_v3", name = "publisher")
public JAXBElement<Publisher> createPublisher(Publisher value) {
return new JAXBElement<Publisher>(_Publisher_QNAME, Publisher.class, null, value);
}
@@ -137,7 +138,7 @@
* Create an instance of {@link JAXBElement }{@code <}{@link PublisherDetail }{@code >}}
*
*/
- @XmlElementDecl(namespace = "urn:apache-org:juddi_api_v3", name = "publisherDetail")
+ @XmlElementDecl(namespace = "urn:juddi-apache-org:api_v3", name = "publisherDetail")
public JAXBElement<PublisherDetail> createPublisherDetail(PublisherDetail value) {
return new JAXBElement<PublisherDetail>(_PublisherDetail_QNAME, PublisherDetail.class, null, value);
}
@@ -146,16 +147,16 @@
* Create an instance of {@link JAXBElement }{@code <}{@link GetPublisherDetail }{@code >}}
*
*/
- @XmlElementDecl(namespace = "urn:apache-org:juddi_api_v3", name = "get_publisherDetail")
+ @XmlElementDecl(namespace = "urn:juddi-apache-org:api_v3", name = "get_publisherDetail")
public JAXBElement<GetPublisherDetail> createGetPublisherDetail(GetPublisherDetail value) {
return new JAXBElement<GetPublisherDetail>(_GetPublisherDetail_QNAME, GetPublisherDetail.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link GetPublisherDetail }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link GetAllPublisherDetail }{@code >}}
*
*/
- @XmlElementDecl(namespace = "urn:apache-org:juddi_api_v3", name = "get_allPublisherDetail")
+ @XmlElementDecl(namespace = "urn:juddi-apache-org:api_v3", name = "get_allPublisherDetail")
public JAXBElement<GetAllPublisherDetail> createGetAllPublisherDetail(GetAllPublisherDetail value) {
return new JAXBElement<GetAllPublisherDetail>(_GetAllPublisherDetail_QNAME, GetAllPublisherDetail.class, null, value);
}
Modified: webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Publisher.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Publisher.java?rev=790994&r1=790993&r2=790994&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Publisher.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Publisher.java Fri Jul 3 19:21:22 2009
@@ -47,7 +47,8 @@
"maxBusinesses",
"maxServicePerBusiness",
"maxTModels",
- "signature"
+ "signature",
+ "authorizedName"
})
public class Publisher implements Serializable{
Modified: webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/package-info.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/package-info.java?rev=790994&r1=790993&r2=790994&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/package-info.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/package-info.java Fri Jul 3 19:21:22 2009
@@ -15,6 +15,6 @@
*
*/
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:apache-org:juddi_api_v3", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@javax.xml.bind.annotation.XmlSchema(namespace = "urn:juddi-apache-org:api_v3", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.apache.juddi.api_v3;
\ No newline at end of file
Modified: webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java?rev=790994&r1=790993&r2=790994&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java Fri Jul 3 19:21:22 2009
@@ -26,6 +26,7 @@
import javax.jws.WebResult;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
import org.apache.juddi.api_v3.DeletePublisher;
import org.apache.juddi.api_v3.GetAllPublisherDetail;
@@ -40,7 +41,13 @@
* This portType defines all of the jUDDI publisher operations.
*
*/
-@WebService(name = "JUDDI_Api_PortType", targetNamespace = "urn:apache-org:juddi_api_v3_portType")
+@WebService(name = "JUDDI_Api_PortType", targetNamespace = "urn:juddi-apache-org:api_v3_portType")
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+@XmlSeeAlso({
+ org.uddi.api_v3.ObjectFactory.class,
+ org.w3._2000._09.xmldsig_.ObjectFactory.class,
+ org.apache.juddi.api_v3.ObjectFactory.class
+})
public interface JUDDIApiPortType extends Remote{
/**
@@ -51,7 +58,7 @@
@WebMethod(operationName = "save_publisher", action = "save_publisher")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
public PublisherDetail savePublisher(
- @WebParam(name = "save_publisher", targetNamespace = "urn:apache-org:juddi_api_v3", partName = "body")
+ @WebParam(name = "save_publisher", targetNamespace = "urn:juddi-apache-org:api_v3", partName = "body")
SavePublisher body)
throws DispositionReportFaultMessage, RemoteException
;
@@ -64,7 +71,7 @@
@WebMethod(operationName = "delete_publisher", action = "delete_publisher")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
public void deletePublisher(
- @WebParam(name = "delete_publisher", targetNamespace = "urn:apache-org:juddi_api_v3", partName = "body")
+ @WebParam(name = "delete_publisher", targetNamespace = "urn:juddi-apache-org:api_v3", partName = "body")
DeletePublisher body)
throws DispositionReportFaultMessage, RemoteException
;
@@ -77,9 +84,9 @@
* @throws DispositionReportFaultMessage, RemoteException
*/
@WebMethod(operationName = "get_publisherDetail", action = "get_publisherDetail")
- @WebResult(name = "publisherDetail", targetNamespace = "urn:apache-org:juddi_api_v3", partName = "body")
+ @WebResult(name = "publisherDetail", targetNamespace = "urn:juddi-apache-org:api_v3", partName = "body")
public PublisherDetail getPublisherDetail(
- @WebParam(name = "get_publisherDetail", targetNamespace = "urn:apache-org:juddi_api_v3", partName = "body")
+ @WebParam(name = "get_publisherDetail", targetNamespace = "urn:juddi-apache-org:api_v3", partName = "body")
GetPublisherDetail body)
throws DispositionReportFaultMessage, RemoteException
;
@@ -88,14 +95,14 @@
*
* @param body
* @return
- * returns org.apache.juddi.api_v3.PublisherInfo
+ * returns org.apache.juddi.api_v3.PublisherDetail
* @throws DispositionReportFaultMessage, RemoteException
*/
@WebMethod(operationName = "get_allPublisherDetail", action = "get_allPublisherDetail")
- @WebResult(name = "publisherDetail", targetNamespace = "urn:apache-org:juddi_api_v3", partName = "body")
+ @WebResult(name = "publisherDetail", targetNamespace = "urn:juddi-apache-org:api_v3", partName = "body")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
public PublisherDetail getAllPublisherDetail(
- @WebParam(name = "get_allPublisherDetail", targetNamespace = "urn:apache-org:juddi_api_v3", partName = "body")
+ @WebParam(name = "get_allPublisherDetail", targetNamespace = "urn:juddi-apache-org:api_v3", partName = "body")
GetAllPublisherDetail body)
throws DispositionReportFaultMessage, RemoteException
;
@@ -109,7 +116,7 @@
@WebMethod(operationName = "adminDelete_tmodel", action = "adminDelete_tmodel")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
public void adminDeleteTModel(
- @WebParam(name = "adminDelete_tmodel", targetNamespace = "urn:apache-org:juddi_api_v3", partName = "body")
+ @WebParam(name = "adminDelete_tmodel", targetNamespace = "urn:juddi-apache-org:api_v3", partName = "body")
DeleteTModel body)
throws DispositionReportFaultMessage, RemoteException
;
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org