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 16:29:19 UTC
svn commit: r726470 - in /webservices/juddi/branches/v3_trunk:
juddi-axis/src/main/webapp/ juddi-core/
juddi-core/src/main/java/org/apache/juddi/config/
juddi-core/src/main/java/org/apache/juddi/mapping/
juddi-core/src/main/java/org/apache/juddi/model/...
Author: kstam
Date: Sun Dec 14 07:29:18 2008
New Revision: 726470
URL: http://svn.apache.org/viewvc?rev=726470&view=rev
Log:
Code Review / Code cleanup
Added:
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Constants.java (contents, props changed)
- copied, changed from r726358, webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/Constants.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java (contents, props changed)
- copied, changed from r726358, webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/Install.java
Removed:
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/Constants.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/Install.java
Modified:
webservices/juddi/branches/v3_trunk/juddi-axis/src/main/webapp/happyjuddi.jsp
webservices/juddi/branches/v3_trunk/juddi-core/pom.xml
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/BindingCategoryBag.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessCategoryBag.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceCategoryBag.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelCategoryBag.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/JPAUtil.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/version/Release.java.template
Modified: webservices/juddi/branches/v3_trunk/juddi-axis/src/main/webapp/happyjuddi.jsp
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-axis/src/main/webapp/happyjuddi.jsp?rev=726470&r1=726469&r2=726470&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-axis/src/main/webapp/happyjuddi.jsp (original)
+++ webservices/juddi/branches/v3_trunk/juddi-axis/src/main/webapp/happyjuddi.jsp Sun Dec 14 07:29:18 2008
@@ -162,8 +162,8 @@
<h4>jUDDI Version Information</h4>
<pre>
-<b>jUDDI Version:</b> <%= org.apache.juddi.util.Release.getRegistryVersion() %>
-<b>UDDI Version:</b> <%= org.apache.juddi.util.Release.getUDDIVersion() %>
+<b>jUDDI Version:</b> <%=org.apache.juddi.config.Release.getRegistryVersion()%>
+<b>UDDI Version:</b> <%=org.apache.juddi.config.Release.getUDDIVersion()%>
</pre>
<h4>jUDDI Dependencies: Class Files & Libraries</h4>
Modified: webservices/juddi/branches/v3_trunk/juddi-core/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/pom.xml?rev=726470&r1=726469&r2=726470&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/pom.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/pom.xml Sun Dec 14 07:29:18 2008
@@ -67,7 +67,7 @@
<version>2.4.2</version>
<configuration>
<suiteXmlFiles>
- <suiteXmlFile>src/test/resources/suite-init.xml,src/test/resources/suite-subscribe.xml,src/test/resources/suite-clean.xml</suiteXmlFile>
+ <suiteXmlFile>src/test/resources/suite-subscribe.xml</suiteXmlFile>
</suiteXmlFiles>
</configuration>
</plugin>
@@ -80,7 +80,7 @@
<configuration>
<tasks>
<copy file="src/main/resources/version/Release.java.template"
- tofile="src/main/java/org/apache/juddi/util/Release.java"
+ tofile="src/main/java/org/apache/juddi/config/Release.java"
overwrite="true">
<filterset>
<filter token="juddi.version" value="${project.version}"/>
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=726470&r1=726469&r2=726470&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 Sun Dec 14 07:29:18 2008
@@ -34,8 +34,6 @@
import org.apache.juddi.model.KeyGeneratorKey;
import org.apache.juddi.model.UddiEntityPublisher;
import org.apache.juddi.query.PersistenceManager;
-import org.apache.juddi.util.Constants;
-import org.apache.juddi.util.Install;
import org.apache.log4j.Logger;
import org.uddi.v3_service.DispositionReportFaultMessage;
@@ -104,11 +102,9 @@
try {
Install.install();
} catch (JAXBException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ throw new ConfigurationException(e);
} catch (DispositionReportFaultMessage e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ throw new ConfigurationException(e);
}
}
tx.commit();
Copied: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Constants.java (from r726358, webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/Constants.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Constants.java?p2=webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Constants.java&p1=webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/Constants.java&r1=726358&r2=726470&rev=726470&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/Constants.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Constants.java Sun Dec 14 07:29:18 2008
@@ -15,7 +15,7 @@
*
*/
-package org.apache.juddi.util;
+package org.apache.juddi.config;
/**
* Contains all the system constants
Propchange: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Constants.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Constants.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java (from r726358, webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/Install.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java?p2=webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java&p1=webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/Install.java&r1=726358&r2=726470&rev=726470&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/Install.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java Sun Dec 14 07:29:18 2008
@@ -15,7 +15,7 @@
*
*/
-package org.apache.juddi.util;
+package org.apache.juddi.config;
import java.io.IOException;
import java.io.InputStream;
Propchange: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
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=726470&r1=726469&r2=726470&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 Sun Dec 14 07:29:18 2008
@@ -60,8 +60,7 @@
mapContacts(apiBusinessEntity.getContacts(), modelBusinessEntity.getContacts(), modelBusinessEntity);
mapBusinessIdentifiers(apiBusinessEntity.getIdentifierBag(), modelBusinessEntity.getBusinessIdentifiers(), modelBusinessEntity);
if (apiBusinessEntity.getCategoryBag()!=null) {
- modelBusinessEntity.setCategoryBag(new org.apache.juddi.model.BusinessCategoryBag());
- modelBusinessEntity.getCategoryBag().setBusinessEntity(modelBusinessEntity);
+ modelBusinessEntity.setCategoryBag(new org.apache.juddi.model.BusinessCategoryBag(modelBusinessEntity));
mapCategoryBag(apiBusinessEntity.getCategoryBag(), modelBusinessEntity.getCategoryBag());
}
@@ -253,8 +252,7 @@
mapServiceNames(apiBusinessService.getName(), modelBusinessService.getServiceNames(), modelBusinessService);
mapServiceDescriptions(apiBusinessService.getDescription(), modelBusinessService.getServiceDescrs(), modelBusinessService);
if (apiBusinessService.getCategoryBag()!=null) {
- modelBusinessService.setCategoryBag(new org.apache.juddi.model.ServiceCategoryBag());
- modelBusinessEntity.getCategoryBag().setBusinessEntity(modelBusinessEntity);
+ modelBusinessService.setCategoryBag(new org.apache.juddi.model.ServiceCategoryBag(modelBusinessService));
mapCategoryBag(apiBusinessService.getCategoryBag(), modelBusinessService.getCategoryBag());
}
@@ -316,8 +314,7 @@
mapBindingDescriptions(apiBindingTemplate.getDescription(), modelBindingTemplate.getBindingDescrs(), modelBindingTemplate);
if (apiBindingTemplate.getCategoryBag()!=null) {
- modelBindingTemplate.setCategoryBag(new org.apache.juddi.model.BindingCategoryBag());
- modelBindingTemplate.getCategoryBag().setBindingTemplate(modelBindingTemplate);
+ modelBindingTemplate.setCategoryBag(new org.apache.juddi.model.BindingCategoryBag(modelBindingTemplate));
mapCategoryBag(apiBindingTemplate.getCategoryBag(), modelBindingTemplate.getCategoryBag());
}
mapTModelInstanceDetails(apiBindingTemplate.getTModelInstanceDetails(), modelBindingTemplate.getTmodelInstanceInfos(), modelBindingTemplate);
@@ -436,8 +433,7 @@
mapTModelDescriptions(apiTModel.getDescription(), modelTModel.getTmodelDescrs(), modelTModel);
mapTModelIdentifiers(apiTModel.getIdentifierBag(), modelTModel.getTmodelIdentifiers(), modelTModel);
if (apiTModel.getCategoryBag()!=null) {
- modelTModel.setCategoryBag(new org.apache.juddi.model.TmodelCategoryBag());
- modelTModel.getCategoryBag().setTmodel(modelTModel);
+ modelTModel.setCategoryBag(new org.apache.juddi.model.TmodelCategoryBag(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/BindingCategoryBag.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingCategoryBag.java?rev=726470&r1=726469&r2=726470&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingCategoryBag.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingCategoryBag.java Sun Dec 14 07:29:18 2008
@@ -30,6 +30,11 @@
private static final long serialVersionUID = 1L;
private BindingTemplate bindingTemplate;
+ public BindingCategoryBag(BindingTemplate bindingTemplate) {
+ super();
+ this.bindingTemplate = bindingTemplate;
+ }
+
@OneToOne(optional=false)
@JoinColumn(name = "binding_template_id")
public BindingTemplate getBindingTemplate() {
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessCategoryBag.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessCategoryBag.java?rev=726470&r1=726469&r2=726470&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessCategoryBag.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessCategoryBag.java Sun Dec 14 07:29:18 2008
@@ -30,6 +30,11 @@
private static final long serialVersionUID = 1L;
private BusinessEntity businessEntity;
+ public BusinessCategoryBag(BusinessEntity businessEntity) {
+ super();
+ this.businessEntity = businessEntity;
+ }
+
@OneToOne(optional=false)
@JoinColumn(name = "business_entity_id")
public BusinessEntity getBusinessEntity() {
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceCategoryBag.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceCategoryBag.java?rev=726470&r1=726469&r2=726470&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceCategoryBag.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceCategoryBag.java Sun Dec 14 07:29:18 2008
@@ -30,6 +30,11 @@
private static final long serialVersionUID = 1L;
private BusinessService businessService;
+ public ServiceCategoryBag(BusinessService businessService) {
+ super();
+ this.businessService = businessService;
+ }
+
@OneToOne(optional=false)
@JoinColumn(name = "business_service_id")
public BusinessService getBusinessService() {
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelCategoryBag.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelCategoryBag.java?rev=726470&r1=726469&r2=726470&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelCategoryBag.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelCategoryBag.java Sun Dec 14 07:29:18 2008
@@ -30,6 +30,11 @@
private static final long serialVersionUID = 1L;
private Tmodel tmodel;
+ public TmodelCategoryBag(Tmodel tmodel) {
+ super();
+ this.tmodel = tmodel;
+ }
+
@OneToOne(optional=false)
@JoinColumn(name = "tmodel_id")
public Tmodel getTmodel() {
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryQuery.java?rev=726470&r1=726469&r2=726470&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryQuery.java Sun Dec 14 07:29:18 2008
@@ -22,9 +22,9 @@
import javax.persistence.Query;
import javax.xml.bind.JAXBElement;
+import org.apache.juddi.config.Constants;
import org.apache.juddi.query.util.DynamicQuery;
import org.apache.juddi.query.util.FindQualifiers;
-import org.apache.juddi.util.Constants;
import org.uddi.api_v3.CategoryBag;
import org.uddi.api_v3.KeyedReference;
import org.uddi.api_v3.KeyedReferenceGroup;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java?rev=726470&r1=726469&r2=726470&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java Sun Dec 14 07:29:18 2008
@@ -21,10 +21,10 @@
import java.util.Collections;
import javax.persistence.EntityManager;
+import org.apache.juddi.config.Constants;
import org.apache.juddi.query.util.DynamicQuery;
import org.apache.juddi.query.util.FindQualifiers;
import org.apache.juddi.query.util.KeyedRefTModelComparator;
-import org.apache.juddi.util.Constants;
import org.apache.log4j.Logger;
import org.uddi.api_v3.IdentifierBag;
import org.uddi.api_v3.KeyedReference;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/JPAUtil.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/JPAUtil.java?rev=726470&r1=726469&r2=726470&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/JPAUtil.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/JPAUtil.java Sun Dec 14 07:29:18 2008
@@ -17,9 +17,7 @@
package org.apache.juddi.util;
-import javax.persistence.EntityManagerFactory;
import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -31,6 +29,7 @@
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
public class JPAUtil {
+ //TODO Comment from Code Review: This class does not seem to be in use. Do we need it?
public static void persistEntity(Object uddiEntity, Object entityKey) {
EntityManager em = PersistenceManager.getEntityManager();
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java?rev=726470&r1=726469&r2=726470&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java Sun Dec 14 07:29:18 2008
@@ -37,13 +37,13 @@
import org.uddi.v3_service.DispositionReportFaultMessage;
import org.apache.juddi.api.datatype.SavePublisher;
import org.apache.juddi.api.datatype.DeletePublisher;
+import org.apache.juddi.config.Constants;
import org.apache.juddi.keygen.KeyGeneratorFactory;
import org.apache.juddi.keygen.KeyGenerator;
import org.apache.juddi.model.UddiEntityPublisher;
import org.apache.juddi.model.Publisher;
import org.apache.juddi.model.UddiEntity;
-import org.apache.juddi.util.Constants;
import org.apache.juddi.error.ErrorMessage;
import org.apache.juddi.error.FatalErrorException;
import org.apache.juddi.error.InvalidKeyPassedException;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/version/Release.java.template
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/version/Release.java.template?rev=726470&r1=726469&r2=726470&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/version/Release.java.template (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/resources/version/Release.java.template Sun Dec 14 07:29:18 2008
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi.util;
+package org.apache.juddi.config;
public class Release {
private static final String REGISTRY_VERSION = "@juddi.version@";
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org