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/14 07:33:48 UTC
svn commit: r726384 - in /webservices/juddi/branches/v3_trunk/juddi-core/src:
main/java/org/apache/juddi/config/ main/java/org/apache/juddi/mapping/
main/java/org/apache/juddi/model/ test/java/org/apache/juddi/config/
Author: kstam
Date: Sat Dec 13 22:33:48 2008
New Revision: 726384
URL: http://svn.apache.org/viewvc?rev=726384&view=rev
Log:
JUDDI-145, adding KeyedReferenceGroup mapping back in.
Modified:
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
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/CategoryBag.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReference.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/config/ApplicationConfigurationTest.java
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java?rev=726384&r1=726383&r2=726384&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java Sat Dec 13 22:33:48 2008
@@ -111,6 +111,9 @@
e.printStackTrace();
}
}
+ tx.commit();
+ tx.begin();
+ rootPublisher = em.find(UddiEntityPublisher.class, Constants.ROOT_PUBLISHER);
Set<KeyGeneratorKey> rootKeyGenList = rootPublisher.getKeyGeneratorKeys();
if (rootKeyGenList == null || rootKeyGenList.size() == 0)
throw new ConfigurationException("The 'root' publisher key generator was not found. Please make sure that the application is properly installed.");
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=726384&r1=726383&r2=726384&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 Sat Dec 13 22:33:48 2008
@@ -61,6 +61,7 @@
mapBusinessIdentifiers(apiBusinessEntity.getIdentifierBag(), modelBusinessEntity.getBusinessIdentifiers(), modelBusinessEntity);
if (apiBusinessEntity.getCategoryBag()!=null) {
modelBusinessEntity.setCategoryBag(new org.apache.juddi.model.BusinessCategoryBag());
+ modelBusinessEntity.getCategoryBag().setBusinessEntity(modelBusinessEntity);
mapCategoryBag(apiBusinessEntity.getCategoryBag(), modelBusinessEntity.getCategoryBag());
}
@@ -253,6 +254,7 @@
mapServiceDescriptions(apiBusinessService.getDescription(), modelBusinessService.getServiceDescrs(), modelBusinessService);
if (apiBusinessService.getCategoryBag()!=null) {
modelBusinessService.setCategoryBag(new org.apache.juddi.model.ServiceCategoryBag());
+ modelBusinessEntity.getCategoryBag().setBusinessEntity(modelBusinessEntity);
mapCategoryBag(apiBusinessService.getCategoryBag(), modelBusinessService.getCategoryBag());
}
@@ -315,6 +317,7 @@
mapBindingDescriptions(apiBindingTemplate.getDescription(), modelBindingTemplate.getBindingDescrs(), modelBindingTemplate);
if (apiBindingTemplate.getCategoryBag()!=null) {
modelBindingTemplate.setCategoryBag(new org.apache.juddi.model.BindingCategoryBag());
+ modelBindingTemplate.getCategoryBag().setBindingTemplate(modelBindingTemplate);
mapCategoryBag(apiBindingTemplate.getCategoryBag(), modelBindingTemplate.getCategoryBag());
}
mapTModelInstanceDetails(apiBindingTemplate.getTModelInstanceDetails(), modelBindingTemplate.getTmodelInstanceInfos(), modelBindingTemplate);
@@ -434,6 +437,7 @@
mapTModelIdentifiers(apiTModel.getIdentifierBag(), modelTModel.getTmodelIdentifiers(), modelTModel);
if (apiTModel.getCategoryBag()!=null) {
modelTModel.setCategoryBag(new org.apache.juddi.model.TmodelCategoryBag());
+ modelTModel.getCategoryBag().setTmodel(modelTModel);
mapCategoryBag(apiTModel.getCategoryBag(), modelTModel.getCategoryBag());
}
//TODO: OverviewDoc - model doesn't have logical mapping
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=726384&r1=726383&r2=726384&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 Sat Dec 13 22:33:48 2008
@@ -42,7 +42,7 @@
private String accessPointType;
private String accessPointUrl;
private String hostingRedirector;
- private BindingCategoryBag categoryBag = new BindingCategoryBag();
+ private BindingCategoryBag categoryBag;
private Set<TmodelInstanceInfo> tmodelInstanceInfos = new HashSet<TmodelInstanceInfo>(0);
private Set<BindingDescr> bindingDescrs = new HashSet<BindingDescr>(0);
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/CategoryBag.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/CategoryBag.java?rev=726384&r1=726383&r2=726384&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/CategoryBag.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/CategoryBag.java Sat Dec 13 22:33:48 2008
@@ -46,10 +46,6 @@
public CategoryBag() {
}
- public CategoryBag(Long id) {
- this.id = id;
- }
-
@Id
@GeneratedValue(strategy=GenerationType.AUTO)
public Long getId() {
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReference.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReference.java?rev=726384&r1=726383&r2=726384&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReference.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReference.java Sat Dec 13 22:33:48 2008
@@ -50,7 +50,7 @@
public KeyedReference(KeyedReferenceGroup keyedReferenceGroup, String tmodelKeyRef,
String keyName, String keyValue) {
- this.keyedReferenceGroup = keyedReferenceGroup;
+ //this.keyedReferenceGroup = keyedReferenceGroup;
this.tmodelKeyRef = tmodelKeyRef;
this.keyName = keyName;
this.keyValue = keyValue;
@@ -58,7 +58,7 @@
public KeyedReference(CategoryBag categoryBag, String tmodelKeyRef,
String keyName, String keyValue) {
- this.categoryBag = categoryBag;
+ //this.categoryBag = categoryBag;
this.tmodelKeyRef = tmodelKeyRef;
this.keyName = keyName;
this.keyValue = keyValue;
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=726384&r1=726383&r2=726384&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 Sat Dec 13 22:33:48 2008
@@ -77,7 +77,7 @@
}
@ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "entity_key", nullable = false, insertable = false, updatable = false)
+ @JoinColumn(name = "entity_key", nullable = false)
public BindingTemplate getBindingTemplate() {
return this.bindingTemplate;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/config/ApplicationConfigurationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/config/ApplicationConfigurationTest.java?rev=726384&r1=726383&r2=726384&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/config/ApplicationConfigurationTest.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/config/ApplicationConfigurationTest.java Sat Dec 13 22:33:48 2008
@@ -1,6 +1,7 @@
package org.apache.juddi.config;
import org.apache.commons.configuration.ConfigurationException;
+import org.junit.Assert;
import org.junit.Test;
public class ApplicationConfigurationTest
@@ -8,14 +9,24 @@
@Test
public void readPropertyFromFile() throws ConfigurationException
{
- long refreshDelay = AppConfig.getConfiguration().getLong(Property.JUDDI_CONFIGURATION_RELOAD_DELAY);
- System.out.println(refreshDelay);
+ try {
+ long refreshDelay = AppConfig.getConfiguration().getLong(Property.JUDDI_CONFIGURATION_RELOAD_DELAY);
+ System.out.println(refreshDelay);
+ } catch (Exception e) {
+ e.printStackTrace();
+ Assert.fail();
+ }
}
@Test
public void readNonExistingProperty() throws ConfigurationException
{
- long nonexisting = AppConfig.getConfiguration().getLong("nonexisting.property",3000l);
- System.out.println(nonexisting);
+ try {
+ long nonexisting = AppConfig.getConfiguration().getLong("nonexisting.property",3000l);
+ System.out.println(nonexisting);
+ } catch (Exception e) {
+ e.printStackTrace();
+ Assert.fail();
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org