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 2008/12/16 17:34:06 UTC
svn commit: r727078 - in /webservices/juddi/branches/v3_trunk: ./
juddi-core/src/main/java/org/apache/juddi/mapping/
juddi-core/src/main/java/org/apache/juddi/model/
juddi-core/src/test/java/org/apache/juddi/api/impl/
Author: kstam
Date: Tue Dec 16 08:34:05 2008
New Revision: 727078
URL: http://svn.apache.org/viewvc?rev=727078&view=rev
Log:
JUDDI-145, adding handling of OverviewDoc
Added:
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/OverviewDoc.java (contents, props changed)
- copied, changed from r726781, webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelOverview.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/OverviewDocDescr.java (contents, props changed)
- copied, changed from r726781, webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDocDescr.java
Removed:
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDocDescr.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelOverview.java
Modified:
webservices/juddi/branches/v3_trunk/ (props changed)
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfo.java
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java
Propchange: webservices/juddi/branches/v3_trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Dec 16 08:34:05 2008
@@ -3,3 +3,4 @@
test-output
temp-testng-customsuite.xml
target
+juddi-derby-test-db
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java?rev=727078&r1=727077&r2=727078&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java Tue Dec 16 08:34:05 2008
@@ -373,8 +373,8 @@
for (org.uddi.api_v3.TModelInstanceInfo apiTModelInstInfo : apiTModelInstInfoList) {
org.apache.juddi.model.TmodelInstanceInfo modelTModelInstInfo = new org.apache.juddi.model.TmodelInstanceInfo(modelBindingTemplate, apiTModelInstInfo.getTModelKey());
- mapTModelInstanceInfoDescriptions(apiTModelInstInfo.getDescription(), modelTModelInstInfo.getTmodelInstanceInfoDescrs(), modelTModelInstInfo, modelBindingTemplate.getEntityKey());
- mapInstanceDetails(apiTModelInstInfo.getInstanceDetails(), modelTModelInstInfo, modelBindingTemplate.getEntityKey());
+ mapTModelInstanceInfoDescriptions(apiTModelInstInfo.getDescription(), modelTModelInstInfo.getTmodelInstanceInfoDescrs(), modelTModelInstInfo);
+ mapInstanceDetails(apiTModelInstInfo.getInstanceDetails(), modelTModelInstInfo);
modelTModelInstInfoList.add(modelTModelInstInfo);
}
@@ -383,8 +383,7 @@
public static void mapTModelInstanceInfoDescriptions(List<org.uddi.api_v3.Description> apiDescList,
List<org.apache.juddi.model.TmodelInstanceInfoDescr> modelDescList,
- org.apache.juddi.model.TmodelInstanceInfo modelTModelInstInfo,
- String bindingKey)
+ org.apache.juddi.model.TmodelInstanceInfo modelTModelInstInfo)
throws DispositionReportFaultMessage {
modelDescList.clear();
@@ -394,32 +393,54 @@
}
public static void mapInstanceDetails(org.uddi.api_v3.InstanceDetails apiInstanceDetails,
- org.apache.juddi.model.TmodelInstanceInfo modelTModelInstInfo,
- String bindingKey)
+ org.apache.juddi.model.TmodelInstanceInfo modelTModelInstInfo)
throws DispositionReportFaultMessage {
modelTModelInstInfo.getInstanceDetailsDescrs().clear();
if (apiInstanceDetails != null) {
List<JAXBElement<?>> apiInstanceDetailsContent = apiInstanceDetails.getContent();
- int docId = 0;
- int descId = 0;
for (JAXBElement<?> elem : apiInstanceDetailsContent) {
- if (elem.getValue() instanceof org.uddi.api_v3.OverviewDoc) {
- org.uddi.api_v3.OverviewDoc apiOverviewDoc = (org.uddi.api_v3.OverviewDoc)elem.getValue();
- // TODO: OverviewDoc is not mapped properly in the model.
- }
- else if (elem.getValue() instanceof org.uddi.api_v3.Description) {
+ if (elem.getValue() instanceof org.uddi.api_v3.Description) {
org.uddi.api_v3.Description apiDesc = (org.uddi.api_v3.Description)elem.getValue();
-
- modelTModelInstInfo.getInstanceDetailsDescrs().add(new org.apache.juddi.model.InstanceDetailsDescr(modelTModelInstInfo, apiDesc.getLang(), apiDesc.getValue()));
- }
- else if (elem.getValue() instanceof String) {
+ org.apache.juddi.model.InstanceDetailsDescr modelInstanceDetailsDescr =
+ new org.apache.juddi.model.InstanceDetailsDescr(
+ modelTModelInstInfo, apiDesc.getLang(), apiDesc.getValue());
+ modelTModelInstInfo.getInstanceDetailsDescrs().add(modelInstanceDetailsDescr);
+ } else if (elem.getValue() instanceof org.uddi.api_v3.OverviewDoc) {
+ org.uddi.api_v3.OverviewDoc apiOverviewDoc = (org.uddi.api_v3.OverviewDoc)elem.getValue();
+ org.apache.juddi.model.OverviewDoc modelOverviewDoc = new org.apache.juddi.model.OverviewDoc(modelTModelInstInfo);
+ mapOverviewDoc(apiOverviewDoc, modelOverviewDoc);
+ } else if (elem.getValue() instanceof String) {
modelTModelInstInfo.setInstanceParms((String)elem.getValue());
}
}
}
}
+ public static void mapOverviewDoc(org.uddi.api_v3.OverviewDoc apiOverviewDoc,
+ org.apache.juddi.model.OverviewDoc modelOverviewDoc)
+ throws DispositionReportFaultMessage {
+ if (apiOverviewDoc != null) {
+
+ List<JAXBElement<?>> apiOverviewDocContent = apiOverviewDoc.getContent();
+ for (JAXBElement<?> elem : apiOverviewDocContent) {
+ if (elem.getValue() instanceof org.uddi.api_v3.AccessPoint) {
+ org.uddi.api_v3.AccessPoint accessPoint = (org.uddi.api_v3.AccessPoint) elem.getValue();
+ modelOverviewDoc.setOverviewUrl(accessPoint.getValue());
+ modelOverviewDoc.setOverviewUrlUseType(accessPoint.getUseType());
+ } else if (elem.getValue() instanceof org.uddi.api_v3.Description) {
+ org.uddi.api_v3.Description description = (org.uddi.api_v3.Description) elem.getValue();
+ org.apache.juddi.model.OverviewDocDescr modelOverviewDocDescr
+ = new org.apache.juddi.model.OverviewDocDescr(
+ modelOverviewDoc, description.getLang(), description.getValue());
+ modelOverviewDoc.getOverviewDocDescrs().add(modelOverviewDocDescr);
+ }
+ }
+ }
+ }
+
+
+
public static void mapTModel(org.uddi.api_v3.TModel apiTModel,
org.apache.juddi.model.Tmodel modelTModel)
throws DispositionReportFaultMessage {
@@ -435,8 +456,7 @@
modelTModel.setCategoryBag(new org.apache.juddi.model.TmodelCategoryBag(modelTModel));
mapCategoryBag(apiTModel.getCategoryBag(), modelTModel.getCategoryBag());
}
- //TODO: OverviewDoc - model doesn't have logical mapping
-
+ mapTModelOverviewDocs(apiTModel.getOverviewDoc(), modelTModel.getOverviewDocs(), modelTModel);
}
public static void mapTModelDescriptions(List<org.uddi.api_v3.Description> apiDescList,
@@ -464,6 +484,18 @@
}
}
+ public static void mapTModelOverviewDocs(List<org.uddi.api_v3.OverviewDoc> apiOverviewDocList,
+ List<org.apache.juddi.model.OverviewDoc> modelOverviewDocList,
+ org.apache.juddi.model.Tmodel modelTModel)
+ throws DispositionReportFaultMessage {
+ modelOverviewDocList.clear();
+
+ for (org.uddi.api_v3.OverviewDoc apiOverviewDoc : apiOverviewDocList) {
+ org.apache.juddi.model.OverviewDoc modelOverviewDoc = new org.apache.juddi.model.OverviewDoc(modelTModel);
+ mapOverviewDoc(apiOverviewDoc, modelOverviewDoc);
+ }
+ }
+
public static void mapPublisherAssertion(org.uddi.api_v3.PublisherAssertion apiPubAssertion,
org.apache.juddi.model.PublisherAssertion modelPubAssertion)
throws DispositionReportFaultMessage {
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java?rev=727078&r1=727077&r2=727078&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java Tue Dec 16 08:34:05 2008
@@ -40,13 +40,14 @@
private static final long serialVersionUID = 1L;
private BusinessService businessService;
+ private List<BindingDescr> bindingDescrs = new ArrayList<BindingDescr>(0);
+
private String accessPointType;
private String accessPointUrl;
private String hostingRedirector;
private BindingCategoryBag categoryBag;
private List<TmodelInstanceInfo> tmodelInstanceInfos = new ArrayList<TmodelInstanceInfo>(0);
- private List<BindingDescr> bindingDescrs = new ArrayList<BindingDescr>(0);
-
+
public BindingTemplate() {
}
Copied: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/OverviewDoc.java (from r726781, webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelOverview.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/OverviewDoc.java?p2=webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/OverviewDoc.java&p1=webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelOverview.java&r1=726781&r2=727078&rev=727078&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelOverview.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/OverviewDoc.java Tue Dec 16 08:34:05 2008
@@ -36,27 +36,35 @@
* @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
*/
@Entity
-@Table(name = "tmodel_overview")
-public class TmodelOverview implements java.io.Serializable {
+@Table(name = "overview_doc")
+public class OverviewDoc implements java.io.Serializable {
private static final long serialVersionUID = 1L;
private Long id;
+ private TmodelInstanceInfo tmodelInstanceInfo;
private Tmodel tmodel;
private String overviewUrl;
- private List<TmodelDocDescr> docDescrs = new ArrayList<TmodelDocDescr>(0);
+ private String overviewUrlUseType;
+ private List<OverviewDocDescr> overviewDocDescrs = new ArrayList<OverviewDocDescr>(0);
- public TmodelOverview() {
+ public OverviewDoc() {
}
- public TmodelOverview(Tmodel tmodel) {
+ public OverviewDoc(TmodelInstanceInfo tmodelInstanceInfo) {
+ this.tmodelInstanceInfo = tmodelInstanceInfo;
+ }
+
+ public OverviewDoc(Tmodel tmodel) {
this.tmodel = tmodel;
}
- public TmodelOverview(Tmodel tmodel,
- String overviewUrl, List<TmodelDocDescr> docDescrs) {
+ public OverviewDoc(TmodelInstanceInfo tmodelInstanceInfo, Tmodel tmodel,
+ String overviewUrl, String overviewUrlUseType, List<OverviewDocDescr> overviewDocDescrs) {
+ this.tmodelInstanceInfo = tmodelInstanceInfo;
this.tmodel = tmodel;
this.overviewUrl = overviewUrl;
- this.docDescrs = docDescrs;
+ this.overviewUrlUseType = overviewUrlUseType;
+ this.overviewDocDescrs = overviewDocDescrs;
}
@Id
@@ -70,7 +78,17 @@
}
@ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "entity_key", nullable = false)
+ @JoinColumn(name = "tomodel_instance_info_id", nullable = true)
+ public TmodelInstanceInfo getTmodelInstanceInfo() {
+ return this.tmodelInstanceInfo;
+ }
+
+ public void setTmodelInstanceInfo(TmodelInstanceInfo tmodelInstanceInfo) {
+ this.tmodelInstanceInfo = tmodelInstanceInfo;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "tmodel_id", nullable = true)
public Tmodel getTmodel() {
return this.tmodel;
}
@@ -79,7 +97,7 @@
this.tmodel = tmodel;
}
- @Column(name = "overview_url")
+ @Column(name = "overview_url", nullable = false)
public String getOverviewUrl() {
return this.overviewUrl;
}
@@ -87,14 +105,23 @@
public void setOverviewUrl(String overviewUrl) {
this.overviewUrl = overviewUrl;
}
+
+ @Column(name = "overview_url_use_type", nullable = true)
+ public String getOverviewUrlUseType() {
+ return this.overviewUrlUseType;
+ }
+
+ public void setOverviewUrlUseType(String overviewUrlUseType) {
+ this.overviewUrlUseType = overviewUrlUseType;
+ }
- @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tmodeloverview")
+ @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "overviewDoc")
@OrderBy
- public List<TmodelDocDescr> getDocDescriptions() {
- return this.docDescrs;
+ public List<OverviewDocDescr> getOverviewDocDescrs() {
+ return this.overviewDocDescrs;
}
- public void setDocDescriptions(List<TmodelDocDescr> docDescrs) {
- this.docDescrs = docDescrs;
+ public void setOverviewDocDescrs(List<OverviewDocDescr> overviewDocDescrs) {
+ this.overviewDocDescrs = overviewDocDescrs;
}
}
Propchange: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/OverviewDoc.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/OverviewDocDescr.java (from r726781, webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDocDescr.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/OverviewDocDescr.java?p2=webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/OverviewDocDescr.java&p1=webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDocDescr.java&r1=726781&r2=727078&rev=727078&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDocDescr.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/OverviewDocDescr.java Tue Dec 16 08:34:05 2008
@@ -31,29 +31,26 @@
* @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
*/
@Entity
-@Table(name = "tmodel_doc_descr")
-public class TmodelDocDescr implements java.io.Serializable {
+@Table(name = "overview_doc_descr")
+public class OverviewDocDescr implements java.io.Serializable {
private static final long serialVersionUID = 1L;
private Long id;
- private Tmodel tmodel;
- private TmodelOverview tmodeloverview;
+ private OverviewDoc overviewDoc;
private String langCode;
private String descr;
- public TmodelDocDescr() {
+ public OverviewDocDescr() {
}
- public TmodelDocDescr(Tmodel tmodel, TmodelOverview tmodeloverview, String descr) {
- this.tmodel = tmodel;
- this.tmodeloverview = tmodeloverview;
+ public OverviewDocDescr(OverviewDoc overviewDoc, String descr) {
+ this.overviewDoc = overviewDoc;
this.descr = descr;
}
- public TmodelDocDescr(Tmodel tmodel, TmodelOverview tmodeloverview, String langCode,
+ public OverviewDocDescr(OverviewDoc overviewDoc, String langCode,
String descr) {
- this.tmodel = tmodel;
- this.tmodeloverview = tmodeloverview;
+ this.overviewDoc = overviewDoc;
this.langCode = langCode;
this.descr = descr;
}
@@ -68,21 +65,12 @@
}
@ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "tmodel_key", nullable = false)
- public Tmodel getTmodel() {
- return this.tmodel;
+ @JoinColumn(name = "overview_doc_id", nullable = true)
+ public OverviewDoc getOverviewDoc() {
+ return this.overviewDoc;
}
- public void setTmodel(Tmodel tmodel) {
- this.tmodel = tmodel;
- }
-
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "tmodel_doc_descr", nullable = false, insertable = false, updatable = false)
- public TmodelOverview getTmodeloverview() {
- return this.tmodeloverview;
- }
- public void setTmodeloverview(TmodelOverview tmodeloverview) {
- this.tmodeloverview = tmodeloverview;
+ public void setOverviewDoc(OverviewDoc overviewDoc) {
+ this.overviewDoc = overviewDoc;
}
@Column(name = "lang_code", length = 5)
Propchange: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/OverviewDocDescr.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java?rev=727078&r1=727077&r2=727078&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java Tue Dec 16 08:34:05 2008
@@ -44,9 +44,8 @@
private String name;
private String langCode;
private boolean deleted;
- private List<TmodelOverview> overviewDocs = new ArrayList<TmodelOverview>(0);
+ private List<OverviewDoc> overviewDocs = new ArrayList<OverviewDoc>(0);
private List<TmodelDescr> tmodelDescrs = new ArrayList<TmodelDescr>(0);
- private List<TmodelDocDescr> tmodelDocDescrs = new ArrayList<TmodelDocDescr>(0);
private List<TmodelIdentifier> tmodelIdentifiers = new ArrayList<TmodelIdentifier>(0);
private TmodelCategoryBag categoryBag;
@@ -60,8 +59,8 @@
}
public Tmodel(String entityKey, String authorizedName, UddiEntityPublisher publisher, String operator,
String name, String langCode, boolean deleted, Date lastUpdate,
- List<TmodelOverview> overviewDocs,
- List<TmodelDescr> tmodelDescrs, List<TmodelDocDescr> tmodelDocDescrs,
+ List<OverviewDoc> overviewDocs,
+ List<TmodelDescr> tmodelDescrs,
List<TmodelIdentifier> tmodelIdentifiers,
TmodelCategoryBag categoryBag) {
this.entityKey = entityKey;
@@ -72,7 +71,6 @@
this.lastUpdate = lastUpdate;
this.overviewDocs = overviewDocs;
this.tmodelDescrs = tmodelDescrs;
- this.tmodelDocDescrs = tmodelDocDescrs;
this.tmodelIdentifiers = tmodelIdentifiers;
this.categoryBag = categoryBag;
}
@@ -112,11 +110,11 @@
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tmodel")
@OrderBy
- public List<TmodelOverview> getOverviewDocs() {
+ public List<OverviewDoc> getOverviewDocs() {
return this.overviewDocs;
}
- public void setOverviewDocs(List<TmodelOverview> overviewDocs) {
+ public void setOverviewDocs(List<OverviewDoc> overviewDocs) {
this.overviewDocs = overviewDocs;
}
@@ -131,15 +129,6 @@
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tmodel")
@OrderBy
- public List<TmodelDocDescr> getTmodelDocDescrs() {
- return this.tmodelDocDescrs;
- }
- public void setTmodelDocDescrs(List<TmodelDocDescr> tmodelDocDescrs) {
- this.tmodelDocDescrs = tmodelDocDescrs;
- }
-
- @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tmodel")
- @OrderBy
public List<TmodelIdentifier> getTmodelIdentifiers() {
return this.tmodelIdentifiers;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfo.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfo.java?rev=727078&r1=727077&r2=727078&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfo.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfo.java Tue Dec 16 08:34:05 2008
@@ -43,11 +43,12 @@
private Long id;
private BindingTemplate bindingTemplate;
private String tmodelKey;
- private String instanceParms;
- private List<InstanceDetailsDocDescr> instanceDetailsDocDescrs = new ArrayList<InstanceDetailsDocDescr>(0);
- private List<InstanceDetailsDescr> instanceDetailsDescrs = new ArrayList<InstanceDetailsDescr>(0);
private List<TmodelInstanceInfoDescr> tmodelInstanceInfoDescrs = new ArrayList<TmodelInstanceInfoDescr>(0);
+ private String instanceParms;
+ private List<OverviewDoc> overviewDocs = new ArrayList<OverviewDoc>(0);
+ private List<InstanceDetailsDescr> instanceDetailsDescrs = new ArrayList<InstanceDetailsDescr>(0);
+
public TmodelInstanceInfo() {
}
@@ -57,13 +58,13 @@
}
public TmodelInstanceInfo(BindingTemplate bindingTemplate, String tmodelKey,
String instanceParms,
- List<InstanceDetailsDocDescr> instanceDetailsDocDescrs,
+ List<OverviewDoc> overviewDocs,
List<InstanceDetailsDescr> instanceDetailsDescrs,
List<TmodelInstanceInfoDescr> tmodelInstanceInfoDescrs) {
this.bindingTemplate = bindingTemplate;
this.tmodelKey = tmodelKey;
this.instanceParms = instanceParms;
- this.instanceDetailsDocDescrs = instanceDetailsDocDescrs;
+ this.overviewDocs = overviewDocs;
this.instanceDetailsDescrs = instanceDetailsDescrs;
this.tmodelInstanceInfoDescrs = tmodelInstanceInfoDescrs;
}
@@ -104,12 +105,12 @@
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tmodelInstanceInfo")
@OrderBy
- public List<InstanceDetailsDocDescr> getInstanceDetailsDocDescrs() {
- return this.instanceDetailsDocDescrs;
+ public List<OverviewDoc> getOverviewDocs() {
+ return this.overviewDocs;
}
- public void setInstanceDetailsDocDescrs(
- List<InstanceDetailsDocDescr> instanceDetailsDocDescrs) {
- this.instanceDetailsDocDescrs = instanceDetailsDocDescrs;
+ public void setOverviewDocs(
+ List<OverviewDoc> overviewDocs) {
+ this.overviewDocs = overviewDocs;
}
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tmodelInstanceInfo")
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java?rev=727078&r1=727077&r2=727078&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java Tue Dec 16 08:34:05 2008
@@ -66,7 +66,7 @@
public void savePublisher(String publisherId, String publisherXML) {
try {
- logger.info("Getting auth token..");
+ logger.debug("Getting auth token..");
String authInfo = UDDIApiTestHelper.getAuthToken(Constants.ROOT_PUBLISHER);
logger.debug("Saving new publisher: " + publisherXML);
@@ -93,7 +93,7 @@
assertEquals(pubIn.getMaxServicePerBusiness(), pubOut.getMaxServicePerBusiness());
assertEquals(pubIn.getMaxTModels(), pubOut.getMaxTModels());
- logger.info("Querying for publisher: " + publisherXML);
+ 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;
@@ -112,10 +112,10 @@
public void deletePublisher(String publisherId) {
try {
- logger.info("Getting auth token..");
+ logger.debug("Getting auth token..");
String authInfo = UDDIApiTestHelper.getAuthToken(Constants.ROOT_PUBLISHER);
- logger.info("Delete publisher: " + publisherId);
+ logger.debug("Delete publisher: " + publisherId);
//Now deleting this publisher
DeletePublisher dp = new DeletePublisher();
dp.setAuthInfo(authInfo);
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java?rev=727078&r1=727077&r2=727078&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java Tue Dec 16 08:34:05 2008
@@ -73,7 +73,7 @@
// Add the tModel
try {
- logger.info("Getting auth token..");
+ logger.debug("Getting auth token..");
String authInfo = UDDIApiTestHelper.getAuthToken(publisherId);
SaveTModel st = new SaveTModel();
@@ -105,7 +105,7 @@
public void deleteTModel(String publisherId, String tModelXml, String tModelKey) {
try {
- logger.info("Getting auth token..");
+ logger.debug("Getting auth token..");
String authInfo = UDDIApiTestHelper.getAuthToken(publisherId);
//Now deleting the TModel
// Delete the entity and make sure it is removed
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org