You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2013/12/07 00:39:12 UTC
svn commit: r1548758 [3/3] - in /juddi/branches/juddi-3.3.x:
juddi-client.net/example/AspnetServiceLifeCycle/
juddi-client.net/example/WcfServiceLifeCycle/
juddi-client.net/juddi-client.net-integration.test/resource/
juddi-client.net/juddi-client.net-s...
Modified: juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValueSetValidation.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValueSetValidation.java?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValueSetValidation.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValueSetValidation.java Fri Dec 6 23:39:10 2013
@@ -14,18 +14,150 @@
* limitations under the License.
*
*/
+package org.apache.juddi.validation;
- package org.apache.juddi.validation;
-
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.api_v3.ValidValues;
+import org.apache.juddi.config.PersistenceManager;
+import org.apache.juddi.mapping.MappingModelToApi;
+import org.apache.juddi.model.Tmodel;
import org.apache.juddi.model.UddiEntityPublisher;
+import org.apache.juddi.v3.error.ErrorMessage;
+import org.apache.juddi.v3.error.ValueNotAllowedException;
+import org.uddi.api_v3.TModel;
+import org.uddi.v3_service.DispositionReportFaultMessage;
/**
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
*/
public class ValidateValueSetValidation extends ValidateUDDIApi {
- public ValidateValueSetValidation(UddiEntityPublisher publisher) {
- super(publisher);
- }
+ private static Log log = LogFactory.getLog(ValidateValueSetValidation.class);
+
+ public ValidateValueSetValidation(UddiEntityPublisher publisher) {
+ super(publisher);
+ }
+
+ /**
+ * called from jUDDI API SetAllValidValues
+ *
+ * @param values
+ */
+ public void validateSetAllValidValues(List<ValidValues> values) throws ValueNotAllowedException {
+ if (values == null || values.isEmpty()) {
+ throw new ValueNotAllowedException(new ErrorMessage("errors.NullInput"));
+ }
+
+ for (int i = 0; i < values.size(); i++) {
+ String key = values.get(i).getTModekKey();
+ if (key == null || key.trim().length() == 0) {
+ throw new ValueNotAllowedException(new ErrorMessage("errors.NullInput", "tModel key"));
+ }
+ //ensure tmodel exists
+ Tmodel tm = GetTModel_MODEL_IfExists(values.get(i).getTModekKey());
+
+ if (tm == null) {
+ throw new ValueNotAllowedException(new ErrorMessage("errors.invalidkey.TModelNotFound", key));
+ }
+ //ensure caller owns the tModel
+ if (this.publisher.isOwner(tm)) {
+ throw new ValueNotAllowedException(new ErrorMessage("errors.usermismatch.InvalidOwner", key));
+ }
+
+ //if we have no values, it may be to simply unset any values
+
+ /*//validate that we have values
+ if (values.get(i).getValue() == null || values.get(i).getValue().isEmpty()) {
+ throw new ValueNotAllowedException(new ErrorMessage("errors.NullInput", "value[]"));
+ }
+ //and that they aren't empty
+ for (int k = 0; k < values.get(i).getValue().size(); k++) {
+ if (values.get(i).getValue().get(k) == null || values.get(i).getValue().get(k).trim().length() == 0) {
+ throw new ValueNotAllowedException(new ErrorMessage("errors.NullInput", "value[" + i + "].value"));
+ }
+ }*/
+ }
+ }
+
+ /**
+ * return the publisher
+ *
+ * @param tmodelKey
+ * @return
+ * @throws ValueNotAllowedException
+ */
+ public static TModel GetTModel_API_IfExists(String tmodelKey) throws ValueNotAllowedException {
+ EntityManager em = PersistenceManager.getEntityManager();
+
+ TModel apitmodel = null;
+ if (em == null) {
+ //this is normally the Install class firing up
+ log.warn(new ErrorMessage("errors.tmodel.ReferentialIntegrityNullEM"));
+ return null;
+ } else {
+
+
+ EntityTransaction tx = em.getTransaction();
+ try {
+ Tmodel modelTModel = null;
+ tx.begin();
+ modelTModel = em.find(org.apache.juddi.model.Tmodel.class, tmodelKey);
+ if (modelTModel != null) {
+ apitmodel = new TModel();
+ try {
+ MappingModelToApi.mapTModel(modelTModel, apitmodel);
+ } catch (DispositionReportFaultMessage ex) {
+ log.warn(ex);
+ apitmodel=null;
+ }
+
+
+ }
+ tx.commit();
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+
+ }
+ return apitmodel;
+ }
+
+
+ public static Tmodel GetTModel_MODEL_IfExists(String tmodelKey) throws ValueNotAllowedException {
+ EntityManager em = PersistenceManager.getEntityManager();
+
+ Tmodel model = null;
+ if (em == null) {
+ //this is normally the Install class firing up
+ log.warn(new ErrorMessage("errors.tmodel.ReferentialIntegrityNullEM"));
+ return null;
+ } else {
+
+
+ EntityTransaction tx = em.getTransaction();
+ try {
+
+ tx.begin();
+ model = em.find(org.apache.juddi.model.Tmodel.class, tmodelKey);
+ tx.commit();
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ }
+ return model;
+ }
}
Added: juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValuesFromWebService.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValuesFromWebService.java?rev=1548758&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValuesFromWebService.java (added)
+++ juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValuesFromWebService.java Fri Dec 6 23:39:10 2013
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2013 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.validation;
+
+import javax.xml.ws.Binding;
+import javax.xml.ws.BindingProvider;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.v3.client.UDDIService;
+import org.apache.juddi.v3.error.ErrorMessage;
+import org.apache.juddi.v3.error.ValueNotAllowedException;
+import org.uddi.api_v3.DispositionReport;
+import org.uddi.api_v3.TModel;
+import org.uddi.v3_service.UDDIValueSetValidationPortType;
+import org.uddi.vs_v3.ValidateValues;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class ValidateValuesFromWebService {
+
+ static final Log log = LogFactory.getLog(ValidateValuesFromWebService.class);
+ public static void Validate(String url, Object tm) throws ValueNotAllowedException{
+ UDDIService svc = new UDDIService();
+ UDDIValueSetValidationPortType vsv = svc.getUDDIValueSetValidationPort();
+ ((BindingProvider)vsv).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, url);
+ ValidateValues req = new ValidateValues();
+ //req.getTModel().add(tm);
+ //TODO finish this
+ try {
+ DispositionReport validateValues = vsv.validateValues(req);
+ } catch (Exception ex) {
+ log.warn(ex);
+ ValueNotAllowedException x = new ValueNotAllowedException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", ex.getMessage()));
+ }
+ }
+
+
+}
Modified: juddi/branches/juddi-3.3.x/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml (original)
+++ juddi/branches/juddi-3.3.x/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml Fri Dec 6 23:39:10 2013
@@ -82,6 +82,13 @@
<keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
</categoryBag>
</bindingTemplate>
+ <bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-inquiry-rest" serviceKey="uddi:juddi.apache.org:services-inquiry">
+ <description>UDDI Inquiry API V3 REST</description>
+ <accessPoint useType="wadlDeployment">${juddi.server.baseurl}/services/inquiryRest?_wadl</accessPoint>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wadl" keyValue="wadlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
</bindingTemplates>
</businessService>
<businessService serviceKey="uddi:juddi.apache.org:services-publish" businessKey="uddi:juddi.apache.org:businesses-asf">
Modified: juddi/branches/juddi-3.3.x/juddi-core/src/main/resources/messages.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core/src/main/resources/messages.properties?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-core/src/main/resources/messages.properties (original)
+++ juddi/branches/juddi-3.3.x/juddi-core/src/main/resources/messages.properties Fri Dec 6 23:39:10 2013
@@ -206,6 +206,7 @@ errors.getsubscriptionresult.NonMatching
errors.getsubscriptionresult.ExpiredChunkToken=The provided chunk token has expired
errors.subscriptionnotifier.client=Client did not receive notification data
errors.getregisteredinfo.NoInfoSelection=The infoSelection argument is required
+errors.valuesetvalidation.invalidcontent=The content for tModel value is invalid according to the valid value set defined.
#-- jUDDI-specific API messages
errors.AdminReqd=An account must have administrative privileges to perform this function
Modified: juddi/branches/juddi-3.3.x/juddi-core/src/test/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core/src/test/resources/META-INF/uddi.xml?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-core/src/test/resources/META-INF/uddi.xml (original)
+++ juddi/branches/juddi-3.3.x/juddi-core/src/test/resources/META-INF/uddi.xml Fri Dec 6 23:39:10 2013
@@ -20,6 +20,7 @@
<proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
<custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
<inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
<publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl>
<securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl>
<subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl>
Modified: juddi/branches/juddi-3.3.x/juddi-examples/create-partition/src/main/resources/META-INF/partition-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/create-partition/src/main/resources/META-INF/partition-uddi.xml?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/create-partition/src/main/resources/META-INF/partition-uddi.xml (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/create-partition/src/main/resources/META-INF/partition-uddi.xml Fri Dec 6 23:39:10 2013
@@ -20,6 +20,7 @@
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
<publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
<securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
Modified: juddi/branches/juddi-3.3.x/juddi-examples/hello-world-embedded/src/main/resources/META-INF/embedded-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/hello-world-embedded/src/main/resources/META-INF/embedded-uddi.xml?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/hello-world-embedded/src/main/resources/META-INF/embedded-uddi.xml (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/hello-world-embedded/src/main/resources/META-INF/embedded-uddi.xml Fri Dec 6 23:39:10 2013
@@ -11,6 +11,7 @@
<proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
<custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
<inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
<publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl>
<securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl>
<subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl>
Modified: juddi/branches/juddi-3.3.x/juddi-examples/hello-world/src/main/resources/META-INF/hello-world-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/hello-world/src/main/resources/META-INF/hello-world-uddi.xml?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/hello-world/src/main/resources/META-INF/hello-world-uddi.xml (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/hello-world/src/main/resources/META-INF/hello-world-uddi.xml Fri Dec 6 23:39:10 2013
@@ -20,6 +20,7 @@
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl</inquiryUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
<publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish?wsdl</publishUrl>
<securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security?wsdl</securityUrl>
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl</subscriptionUrl>
Modified: juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/resources/META-INF/simple-publish-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/resources/META-INF/simple-publish-uddi.xml?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/resources/META-INF/simple-publish-uddi.xml (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/resources/META-INF/simple-publish-uddi.xml Fri Dec 6 23:39:10 2013
@@ -21,6 +21,7 @@
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
<publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
<securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
Modified: juddi/branches/juddi-3.3.x/juddi-examples/service-version/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/service-version/src/main/resources/META-INF/uddi.xml?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/service-version/src/main/resources/META-INF/uddi.xml (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/service-version/src/main/resources/META-INF/uddi.xml Fri Dec 6 23:39:10 2013
@@ -20,6 +20,7 @@
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl</inquiryUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
<publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish?wsdl</publishUrl>
<securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security?wsdl</securityUrl>
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl</subscriptionUrl>
Modified: juddi/branches/juddi-3.3.x/juddi-examples/simple-browse/src/main/resources/META-INF/simple-browse-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/simple-browse/src/main/resources/META-INF/simple-browse-uddi.xml?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/simple-browse/src/main/resources/META-INF/simple-browse-uddi.xml (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/simple-browse/src/main/resources/META-INF/simple-browse-uddi.xml Fri Dec 6 23:39:10 2013
@@ -20,6 +20,7 @@
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
<publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
<securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
Modified: juddi/branches/juddi-3.3.x/juddi-examples/simple-publish/src/main/resources/META-INF/simple-publish-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/simple-publish/src/main/resources/META-INF/simple-publish-uddi.xml?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/simple-publish/src/main/resources/META-INF/simple-publish-uddi.xml (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/simple-publish/src/main/resources/META-INF/simple-publish-uddi.xml Fri Dec 6 23:39:10 2013
@@ -21,6 +21,7 @@
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
<publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
<securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
Modified: juddi/branches/juddi-3.3.x/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml Fri Dec 6 23:39:10 2013
@@ -20,6 +20,7 @@
<proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
<custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
<inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
<publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl>
<securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl>
<subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl>
Modified: juddi/branches/juddi-3.3.x/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml Fri Dec 6 23:39:10 2013
@@ -20,6 +20,7 @@
<proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
<custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
<inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
<publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl>
<securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl>
<subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl>
Modified: juddi/branches/juddi-3.3.x/juddi-examples/wsdl2uddi-lifecyle/src/main/resources/META-INF/wsdl2uddi-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/wsdl2uddi-lifecyle/src/main/resources/META-INF/wsdl2uddi-uddi.xml?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/wsdl2uddi-lifecyle/src/main/resources/META-INF/wsdl2uddi-uddi.xml (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/wsdl2uddi-lifecyle/src/main/resources/META-INF/wsdl2uddi-uddi.xml Fri Dec 6 23:39:10 2013
@@ -20,6 +20,7 @@
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
<publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
<securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
Modified: juddi/branches/juddi-3.3.x/juddi-examples/wsdl2uddi/src/main/resources/META-INF/wsdl2uddi-uddi.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/wsdl2uddi/src/main/resources/META-INF/wsdl2uddi-uddi.xml?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/wsdl2uddi/src/main/resources/META-INF/wsdl2uddi-uddi.xml (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/wsdl2uddi/src/main/resources/META-INF/wsdl2uddi-uddi.xml Fri Dec 6 23:39:10 2013
@@ -21,6 +21,7 @@
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
<publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
<securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
Modified: juddi/branches/juddi-3.3.x/juddi-gui/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-gui/src/main/resources/META-INF/uddi.xml?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-gui/src/main/resources/META-INF/uddi.xml (original)
+++ juddi/branches/juddi-3.3.x/juddi-gui/src/main/resources/META-INF/uddi.xml Fri Dec 6 23:39:10 2013
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+This config is for the juddi-gui.
+It currently does not use the ValueSet, jUDDI, Replication, or REST APIs
+-->
<uddi>
<reloadDelay>5000</reloadDelay>
<client name="juddigui">
Modified: juddi/branches/juddi-3.3.x/juddi-gui/src/main/webapp/businessEditor2.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-gui/src/main/webapp/businessEditor2.jsp?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-gui/src/main/webapp/businessEditor2.jsp (original)
+++ juddi/branches/juddi-3.3.x/juddi-gui/src/main/webapp/businessEditor2.jsp Fri Dec 6 23:39:10 2013
@@ -616,10 +616,7 @@
<%
if (bd.getSignature().isEmpty()) {
%>
- <a class="btn btn-primary " href="javascript:saveBusiness();"><i class="icon-save icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.s e
-
-
- )%></a>
+ <a class="btn btn-primary " href="javascript:saveBusiness();"><i class="icon-save icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.save")%></a>
<% } else {
%>
<a href="#confirmDialog" role="button" class="btn btn-primary" data-toggle="modal"><i class="icon-save icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.save")%></a>
Modified: juddi/branches/juddi-3.3.x/juddi-migration-tool/src/main/resources/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-migration-tool/src/main/resources/uddi.xml?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-migration-tool/src/main/resources/uddi.xml (original)
+++ juddi/branches/juddi-3.3.x/juddi-migration-tool/src/main/resources/uddi.xml Fri Dec 6 23:39:10 2013
@@ -21,6 +21,7 @@
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
<publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
<securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
Modified: juddi/branches/juddi-3.3.x/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java Fri Dec 6 23:39:10 2013
@@ -290,12 +290,43 @@ public class UDDIInquiryJAXRS {
public List<URI> getEndpointsByServiceXML(@PathParam("id") String id) throws WebApplicationException {
return getEndpointsByService(id);
}
-
+
+ /**
+ * 6.5 HTTP GET Services for UDDI Data Structures
+A node may offer an HTTP GET service for access to the XML representations of UDDI data structures. If a node offers this service, the URLs should be in a format that is predictable and uses the entity key as a URL parameter.
+
+The RECOMMENDED syntax for the URLs for such a service is as follows:
+
+If a UDDI nodeâs base URI is http://uddi.example.org/mybase, then the URI http://uddi.example.org/mybase?<entity>Key=uddiKey would retrieve the XML for the data structure whose type is <entity> and whose key is uddiKey. For example, the XML representation of a tModel whose key is "uddi:tempuri.com:fish:interface" can be retrieved by using the URL http://uddi.example.org/mybase?tModelKey=uddi:tempuri.com:fish:interface.
+
+In the case of businessEntities, the node MAY add these URIs to the businessEntityâs discoveryURLs structure, though this is NOT RECOMMENDED behavior as it complicates the use of digital signatures.
+
+
+
+ * @param id
+ * @return
+ * @throws WebApplicationException
+ */
+ @GET
+ @Path("/base?{entity}Key={key}")
+ @Produces("application/xml")
+ @org.apache.cxf.jaxrs.model.wadl.Description("Returns the selected UDDI entity as XML per section 6.5 of the UDDIv3 specification. Use businessKey, tmodelKey, bindingKey or serviceKey ")
+ public Object getEntityAsXML(@PathParam("entity") String entity,@PathParam("key") String key) throws WebApplicationException {
+ if (entity.equalsIgnoreCase("business"))
+ return getBusinessDetailXML(key);
+ if (entity.equalsIgnoreCase("tmodel"))
+ return getTModelDetailXML(key);
+ if (entity.equalsIgnoreCase("binding"))
+ return getBindingDetailXML(key);
+ if (entity.equalsIgnoreCase("service"))
+ return getServiceDetailXML(key);
+ throw new WebApplicationException(400);
+ }
+
private List<URI> getEndpointsByService(String id) throws WebApplicationException {
List<URI> ret = new ArrayList<URI>();
GetServiceDetail fs = new GetServiceDetail();
- //TODO fs.setAuthInfo(rootAuthToken.getAuthInfo());
-
+
fs.getServiceKey().add(id);
try {
ServiceDetail serviceDetail = inquiry.getServiceDetail(fs);
@@ -310,6 +341,8 @@ public class UDDIInquiryJAXRS {
}
return ret;
}
+
+
private List<URI> GetEndpoints(ServiceDetail serviceDetail, String authInfo) throws DispositionReportFaultMessage {
List<URI> items = new ArrayList<URI>();
Modified: juddi/branches/juddi-3.3.x/juddiv3-war/JAX-WS/CXF/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddiv3-war/JAX-WS/CXF/WEB-INF/beans.xml?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddiv3-war/JAX-WS/CXF/WEB-INF/beans.xml (original)
+++ juddi/branches/juddi-3.3.x/juddiv3-war/JAX-WS/CXF/WEB-INF/beans.xml Fri Dec 6 23:39:10 2013
@@ -95,11 +95,13 @@
</jaxws:properties>
</jaxws:endpoint>
- <jaxrs:server id="inquiryRestService" address="/inquiryRest">
+ <jaxrs:server id="inquiryRestService" address="/inquiryRest">
<jaxrs:serviceBeans>
<ref bean="inquiryRest" />
</jaxrs:serviceBeans>
</jaxrs:server>
<bean id="inquiryRest" class="org.apache.juddi.api.impl.rest.UDDIInquiryJAXRS" />
-
+ <bean id="jaxbProvider" class="org.apache.cxf.jaxrs.provider.json.JSONProvider">
+ <property name="ignoreNamespaces" value="true"/>
+ </bean>
</beans>
Modified: juddi/branches/juddi-3.3.x/juddiv3-war/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddiv3-war/src/main/resources/META-INF/uddi.xml?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddiv3-war/src/main/resources/META-INF/uddi.xml (original)
+++ juddi/branches/juddi-3.3.x/juddiv3-war/src/main/resources/META-INF/uddi.xml Fri Dec 6 23:39:10 2013
@@ -11,6 +11,7 @@
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>http://localhost:8080/juddiv3/services/custody-transfer</custodyTransferUrl>
<inquiryUrl>http://localhost:8080/juddiv3/services/inquiry</inquiryUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
<publishUrl>http://localhost:8080/juddiv3/services/publish</publishUrl>
<securityUrl>http://localhost:8080/juddiv3/services/security</securityUrl>
<subscriptionUrl>http://localhost:8080/juddiv3/services/subscription</subscriptionUrl>
Modified: juddi/branches/juddi-3.3.x/qa/juddi-xlt/src/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/qa/juddi-xlt/src/META-INF/uddi.xml?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/qa/juddi-xlt/src/META-INF/uddi.xml (original)
+++ juddi/branches/juddi-3.3.x/qa/juddi-xlt/src/META-INF/uddi.xml Fri Dec 6 23:39:10 2013
@@ -36,6 +36,7 @@
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl</inquiryUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
<publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish?wsdl</publishUrl>
<securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security?wsdl</securityUrl>
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl</subscriptionUrl>
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java Fri Dec 6 23:39:10 2013
@@ -40,7 +40,8 @@ public class TckTModel
final static String JOE_PUBLISHER_TMODEL_XML = "uddi_data/joepublisher/tModelKeyGen.xml";
public static String JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3 = "uddi_data/joepublisher/FindTmodelTest.xml";
public static String JOE_PUBLISHER_TMODEL_SUBSCRIPTION3_TMODEL_KEY="uddi:uddi.joepublisher.com:tmodelone";
-
+ /**"uddi:uddi.joepublisher.com:"*/
+ public final static String JOE_PUBLISHER_KEY_PREFIX= "uddi:uddi.joepublisher.com:";
final static String JOE_PUBLISHER_TMODEL_KEY = "uddi:uddi.joepublisher.com:keygenerator";
final static String MARY_PUBLISHER_TMODEL_XML = "uddi_data/marypublisher/tModelKeyGen.xml";
final static String MARY_PUBLISHER_TMODEL_KEY = "uddi:uddi.marypublisher.com:keygenerator";
Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/main/resources/META-INF/uddi.xml?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/main/resources/META-INF/uddi.xml (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/main/resources/META-INF/uddi.xml Fri Dec 6 23:39:10 2013
@@ -27,6 +27,7 @@
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
<publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
<securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
Added: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_020_RESTIntergrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_020_RESTIntergrationTest.java?rev=1548758&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_020_RESTIntergrationTest.java (added)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_020_RESTIntergrationTest.java Fri Dec 6 23:39:10 2013
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2013 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.v3.tck;
+
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.juddi.v3.client.config.UDDIClient;
+import org.apache.juddi.v3.client.transport.Transport;
+import org.apache.juddi.v3_service.JUDDIApiPortType;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.uddi.api_v3.GetAuthToken;
+import org.uddi.v3_service.UDDISecurityPortType;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class JUDDI_020_RESTIntergrationTest {
+
+ private static UDDISecurityPortType security = null;
+ private static JUDDIApiPortType publisher = null;
+ private static Log logger = LogFactory.getLog(JUDDI_100_ClientSubscriptionInfoTest.class);
+ private static String authInfo = null;
+ private static UDDIClient manager;
+
+ @BeforeClass
+ public static void startRegistry() throws ConfigurationException {
+
+ manager = new UDDIClient();
+ manager.start();
+
+
+ logger.debug("Getting auth tokens..");
+ try {
+ Transport transport = manager.getTransport();
+
+ security = transport.getUDDISecurityService();
+ GetAuthToken getAuthToken = new GetAuthToken();
+ getAuthToken.setUserID(TckPublisher.getRootPublisherId());
+ getAuthToken.setCred(TckPublisher.getRootPassword());
+ authInfo = security.getAuthToken(getAuthToken).getAuthInfo();
+
+ publisher = transport.getJUDDIApiService();
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("Could not obtain authInfo token.");
+ }
+ }
+
+ @AfterClass
+ public static void stopRegistry() throws ConfigurationException {
+ manager.stop();
+ }
+
+ @Test
+ public void BusinessREST_GET() throws Exception {
+ String url = manager.getClientConfig().getHomeNode().getInquiry_REST_Url();
+ Assume.assumeNotNull(url);
+ HttpClient client = new DefaultHttpClient();
+ HttpGet httpGet = new HttpGet(url + "?wadl");
+ HttpResponse response = client.execute(httpGet);
+
+ }
+}
Modified: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/uddi/api_v3/TModel.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/uddi/api_v3/TModel.java?rev=1548758&r1=1548757&r2=1548758&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/uddi/api_v3/TModel.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/uddi/api_v3/TModel.java Fri Dec 6 23:39:10 2013
@@ -14,8 +14,6 @@
* limitations under the License.
*
*/
-
-
package org.uddi.api_v3;
import java.io.Serializable;
@@ -30,12 +28,12 @@ import javax.xml.bind.annotation.XmlTran
import javax.xml.bind.annotation.XmlType;
import org.w3._2000._09.xmldsig_.SignatureType;
-
/**
* <p>Java class for tModel complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
+ *
+ * <p>The following schema fragment specifies the expected content contained
+ * within this class.
+ *
* <pre>
* <complexType name="tModel">
* <complexContent>
@@ -54,245 +52,225 @@ import org.w3._2000._09.xmldsig_.Signatu
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "tModel", propOrder = {
- "name",
- "description",
- "overviewDoc",
- "identifierBag",
- "categoryBag",
- "signature"
+ "name",
+ "description",
+ "overviewDoc",
+ "identifierBag",
+ "categoryBag",
+ "signature"
})
@XmlRootElement()
-public class TModel implements Serializable{
- @XmlTransient
- private static final long serialVersionUID = -6854071436459289470L;
- @XmlElement(required = true)
- protected Name name;
- protected List<Description> description;
- protected List<OverviewDoc> overviewDoc;
- protected IdentifierBag identifierBag;
- protected CategoryBag categoryBag;
- @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
- protected List<SignatureType> signature;
- @XmlAttribute
- protected String tModelKey;
- @XmlAttribute
- protected Boolean deleted;
-
- /**
- * Gets the value of the name property.
- *
- * @return
- * possible object is
- * {@link Name }
- *
- */
- public Name getName() {
- return name;
- }
-
- /**
- * Sets the value of the name property.
- *
- * @param value
- * allowed object is
- * {@link Name }
- *
- */
- public void setName(Name value) {
- this.name = value;
- }
-
- /**
- * Gets the value of the description property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the description property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDescription().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
+public class TModel implements Serializable {
+
+ @XmlTransient
+ private static final long serialVersionUID = -6854071436459289470L;
+ @XmlElement(required = true)
+ protected Name name;
+ protected List<Description> description;
+ protected List<OverviewDoc> overviewDoc;
+ protected IdentifierBag identifierBag;
+ protected CategoryBag categoryBag;
+ @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
+ protected List<SignatureType> signature;
+ @XmlAttribute
+ protected String tModelKey;
+ @XmlAttribute
+ protected Boolean deleted;
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return possible object is {@link Name }
+ *
+ */
+ public Name getName() {
+ return name;
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value allowed object is {@link Name }
+ *
+ */
+ public void setName(Name value) {
+ this.name = value;
+ }
+
+ /**
+ * Gets the value of the description property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list, not a
+ * snapshot. Therefore any modification you make to the returned list
+ * will be present inside the JAXB object. This is why there is not a
+ * <CODE>set</CODE> method for the description property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getDescription().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
* {@link Description }
- *
- *
- */
- public List<Description> getDescription() {
- if (description == null) {
- description = new ArrayList<Description>();
- }
- return this.description;
- }
-
- /**
- * Gets the value of the overviewDoc property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the overviewDoc property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getOverviewDoc().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
+ *
+ *
+ */
+ public List<Description> getDescription() {
+ if (description == null) {
+ description = new ArrayList<Description>();
+ }
+ return this.description;
+ }
+
+ /**
+ * Gets the value of the overviewDoc property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list, not a
+ * snapshot. Therefore any modification you make to the returned list
+ * will be present inside the JAXB object. This is why there is not a
+ * <CODE>set</CODE> method for the overviewDoc property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getOverviewDoc().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
* {@link OverviewDoc }
- *
- *
- */
- public List<OverviewDoc> getOverviewDoc() {
- if (overviewDoc == null) {
- overviewDoc = new ArrayList<OverviewDoc>();
- }
- return this.overviewDoc;
- }
-
- /**
- * Gets the value of the identifierBag property.
- *
- * @return
- * possible object is
- * {@link IdentifierBag }
- *
- */
- public IdentifierBag getIdentifierBag() {
- return identifierBag;
- }
-
- /**
- * Sets the value of the identifierBag property.
- *
- * @param value
- * allowed object is
- * {@link IdentifierBag }
- *
- */
- public void setIdentifierBag(IdentifierBag value) {
- this.identifierBag = value;
- }
-
- /**
- * Gets the value of the categoryBag property.
- *
- * @return
- * possible object is
- * {@link CategoryBag }
- *
- */
- public CategoryBag getCategoryBag() {
- return categoryBag;
- }
-
- /**
- * Sets the value of the categoryBag property.
- *
- * @param value
- * allowed object is
- * {@link CategoryBag }
- *
- */
- public void setCategoryBag(CategoryBag value) {
- this.categoryBag = value;
- }
-
- /**
- * Gets the value of the signature property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the signature property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getSignature().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
+ *
+ *
+ */
+ public List<OverviewDoc> getOverviewDoc() {
+ if (overviewDoc == null) {
+ overviewDoc = new ArrayList<OverviewDoc>();
+ }
+ return this.overviewDoc;
+ }
+
+ /**
+ * Gets the value of the identifierBag property.
+ *
+ * @return possible object is {@link IdentifierBag }
+ *
+ */
+ public IdentifierBag getIdentifierBag() {
+ return identifierBag;
+ }
+
+ /**
+ * Sets the value of the identifierBag property.
+ *
+ * @param value allowed object is {@link IdentifierBag }
+ *
+ */
+ public void setIdentifierBag(IdentifierBag value) {
+ this.identifierBag = value;
+ }
+
+ /**
+ * Gets the value of the categoryBag property.
+ *
+ * @return possible object is {@link CategoryBag }
+ *
+ */
+ public CategoryBag getCategoryBag() {
+ return categoryBag;
+ }
+
+ /**
+ * Sets the value of the categoryBag property.
+ *
+ * @param value allowed object is {@link CategoryBag }
+ *
+ */
+ public void setCategoryBag(CategoryBag value) {
+ this.categoryBag = value;
+ }
+
+ /**
+ * Gets the value of the signature property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list, not a
+ * snapshot. Therefore any modification you make to the returned list
+ * will be present inside the JAXB object. This is why there is not a
+ * <CODE>set</CODE> method for the signature property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getSignature().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
* {@link SignatureType }
- *
- *
- */
- public List<SignatureType> getSignature() {
- if (signature == null) {
- signature = new ArrayList<SignatureType>();
- }
- return this.signature;
- }
-
- /**
- * Gets the value of the tModelKey property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getTModelKey() {
- return tModelKey;
- }
-
- /**
- * Sets the value of the tModelKey property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setTModelKey(String value) {
- this.tModelKey = value;
- }
-
- /**
- * Gets the value of the deleted property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public boolean isDeleted() {
- if (deleted == null) {
- return false;
- } else {
- return deleted;
- }
- }
-
- /**
- * Sets the value of the deleted property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setDeleted(Boolean value) {
- this.deleted = value;
- }
+ *
+ *
+ */
+ public List<SignatureType> getSignature() {
+ if (signature == null) {
+ signature = new ArrayList<SignatureType>();
+ }
+ return this.signature;
+ }
+
+ /**
+ * Gets the value of the tModelKey property.
+ *
+ * @return possible object is {@link String }
+ *
+ */
+ public String getTModelKey() {
+ return tModelKey;
+ }
+
+ /**
+ * Sets the value of the tModelKey property.
+ *
+ * @param value allowed object is {@link String }
+ *
+ */
+ public void setTModelKey(String value) {
+ this.tModelKey = value;
+ }
+
+ /**
+ * Gets the value of the deleted property.
+ *
+ * @return possible object is {@link Boolean }
+ *
+ */
+ public boolean isDeleted() {
+ if (deleted == null) {
+ return false;
+ } else {
+ return deleted;
+ }
+ }
+ /**
+ * Sets the value of the deleted property.
+ *
+ * @param value allowed object is {@link Boolean }
+ *
+ */
+ public void setDeleted(Boolean value) {
+ this.deleted = value;
+ }
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org