Repository: juddi Updated Branches: refs/heads/master 6ea7ff250 -> 9c77acdf9
JUDDI-977 findbugs Project: http://git-wip-us.apache.org/repos/asf/juddi/repo Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/9c77acdf Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/9c77acdf Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/9c77acdf Branch: refs/heads/master Commit: 9c77acdf9f3d47accec70a6e91cabf6ad304a00c Parents: 6ea7ff2 Author: Alex O'Ree <[email protected]> Authored: Mon Oct 9 13:30:48 2017 -0400 Committer: Alex O'Ree <[email protected]> Committed: Mon Oct 9 13:30:48 2017 -0400 ---------------------------------------------------------------------- .gitignore | 1 + .../juddi/api/impl/AuthenticatedService.java | 19 ++++++-- .../org/apache/juddi/api/impl/JUDDIApiImpl.java | 9 ++-- .../juddi/api/impl/UDDICustodyTransferImpl.java | 2 +- .../juddi/api/impl/UDDIPublicationImpl.java | 51 ++++++++------------ .../juddi/api/impl/UDDIReplicationImpl.java | 37 +++++++------- .../java/org/apache/juddi/config/Install.java | 4 +- .../main/java/org/apache/juddi/model/Edge.java | 6 +-- .../juddi/replication/ReplicationNotifier.java | 2 +- .../juddi/rmi/UDDICustodyTransferService.java | 2 +- .../apache/juddi/rmi/UDDIInquiryService.java | 2 +- .../juddi/rmi/UDDIPublicationService.java | 2 +- .../apache/juddi/rmi/UDDISecurityService.java | 2 +- .../rmi/UDDISubscriptionListenerService.java | 2 +- .../juddi/rmi/UDDISubscriptionService.java | 2 +- .../juddi/subscription/notify/SMTPNotifier.java | 8 +-- 16 files changed, 76 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/juddi/blob/9c77acdf/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 944a733..63a8e6a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ docs/db/ddl/*.ddl *.ddl uddi-tck/pref-rpt-*.txt nb-configuration.xml +*.orig http://git-wip-us.apache.org/repos/asf/juddi/blob/9c77acdf/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java index 3fde39f..de25edc 100644 --- a/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java +++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java @@ -17,10 +17,14 @@ package org.apache.juddi.api.impl; import java.util.Date; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.annotation.Resource; import javax.persistence.EntityManager; import javax.servlet.http.HttpServletRequest; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; import javax.xml.ws.WebServiceContext; import javax.xml.ws.handler.MessageContext; @@ -50,7 +54,7 @@ public abstract class AuthenticatedService { /** * @return the node */ - public static String getNode() { + public String getNode() { return node; } @@ -61,9 +65,10 @@ public abstract class AuthenticatedService { /** * the node id of this server instance, as loaded from the config file */ - private static String node = "UNDEFINED_NODE_NAME"; + private String node = "UNDEFINED_NODE_NAME"; protected String baseUrlSSL = "UNDEFINED"; protected String baseUrl = "UNDEFINED"; + protected DatatypeFactory df = null; public AuthenticatedService() { try { @@ -74,6 +79,14 @@ public abstract class AuthenticatedService { } catch (ConfigurationException ex) { logger.fatal(null, ex); } + init(); + } + private synchronized void init() { + try { + df = DatatypeFactory.newInstance(); + } catch (DatatypeConfigurationException ex) { + logger.fatal(null, ex); + } } @Resource @@ -153,7 +166,7 @@ public abstract class AuthenticatedService { req = (HttpServletRequest) mc.get(MessageContext.SERVLET_REQUEST); } if (req != null - && modelAuthToken.getIPAddress() != null + && req.getRemoteAddr() != null && modelAuthToken.getIPAddress() != null && !modelAuthToken.getIPAddress().equalsIgnoreCase(req.getRemoteAddr())) { modelAuthToken.setTokenState(AUTHTOKEN_RETIRED); http://git-wip-us.apache.org/repos/asf/juddi/blob/9c77acdf/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java index 817c284..a4ea297 100644 --- a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java +++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java @@ -31,7 +31,6 @@ import javax.jws.WebService; import javax.persistence.EntityManager; import javax.persistence.EntityTransaction; import javax.persistence.Query; -import javax.xml.bind.JAXB; import javax.xml.bind.JAXBContext; import javax.xml.bind.Marshaller; import javax.xml.ws.Holder; @@ -448,13 +447,13 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.TModelNodeOwner", entityKey + " this node " + getNode() + " owning node " + obj.getNodeId())); } em.remove(obj); - changes.add(UDDIPublicationImpl.getChangeRecord_deleteTModelDelete(entityKey, getNode())); + changes.add(UDDIPublicationImpl.getChangeRecord_deleteTModelDelete(entityKey, getNode(), df)); } tx.commit(); for (ChangeRecord cr : changes) { - ReplicationNotifier.Enqueue(cr); + ReplicationNotifier.enqueue(cr); } long procTime = System.currentTimeMillis() - startTime; serviceCounter.update(JUDDIQuery.ADMIN_DELETE_TMODEL, @@ -788,7 +787,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy NodeDetail result = new NodeDetail(); - List<org.apache.juddi.api_v3.Node> apiNodeList = body.getNode();; + List<org.apache.juddi.api_v3.Node> apiNodeList = body.getNode(); for (org.apache.juddi.api_v3.Node apiNode : apiNodeList) { org.apache.juddi.model.Node modelNode = new org.apache.juddi.model.Node(); @@ -1404,7 +1403,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy } tx.commit(); - UDDIReplicationImpl.notifyConfigurationChange(oldConfig, replicationConfiguration); + UDDIReplicationImpl.notifyConfigurationChange(oldConfig, replicationConfiguration, this); long procTime = System.currentTimeMillis() - startTime; serviceCounter.update(JUDDIQuery.SET_REPLICATION_NODES, QueryStatus.SUCCESS, procTime); http://git-wip-us.apache.org/repos/asf/juddi/blob/9c77acdf/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDICustodyTransferImpl.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDICustodyTransferImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDICustodyTransferImpl.java index a05582e..bec809a 100644 --- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDICustodyTransferImpl.java +++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDICustodyTransferImpl.java @@ -326,7 +326,7 @@ public class UDDICustodyTransferImpl extends AuthenticatedService implements UDD c.setChangeID(new ChangeRecordIDType()); c.getChangeID().setNodeID(getNode()); c.getChangeID().setOriginatingUSN(null); - ReplicationNotifier.Enqueue(MappingApiToModel.mapChangeRecord(c)); + ReplicationNotifier.enqueue(MappingApiToModel.mapChangeRecord(c)); } catch (UnsupportedEncodingException ex) { logger.error("", ex); } http://git-wip-us.apache.org/repos/asf/juddi/blob/9c77acdf/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java index 8c74893..b6ace81 100644 --- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java +++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java @@ -108,18 +108,11 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub private static Log log = LogFactory.getLog(UDDIInquiryImpl.class); private UDDIServiceCounter serviceCounter; - private static DatatypeFactory df = null; - + public UDDIPublicationImpl() { super(); serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(UDDIPublicationImpl.class); - if (df == null) { - try { - df = DatatypeFactory.newInstance(); - } catch (DatatypeConfigurationException ex) { - logger.fatal(ex); - } - } + } @Override @@ -202,7 +195,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub tx.commit(); for (int i = 0; i < changes.size(); i++) { - ReplicationNotifier.Enqueue(changes.get(i)); + ReplicationNotifier.enqueue(changes.get(i)); } long procTime = System.currentTimeMillis() - startTime; @@ -241,7 +234,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub } tx.commit(); for (int i = 0; i < changes.size(); i++) { - ReplicationNotifier.Enqueue(changes.get(i)); + ReplicationNotifier.enqueue(changes.get(i)); } long procTime = System.currentTimeMillis() - startTime; @@ -301,7 +294,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub tx.commit(); for (int i = 0; i < changes.size(); i++) { - ReplicationNotifier.Enqueue(changes.get(i)); + ReplicationNotifier.enqueue(changes.get(i)); } long procTime = System.currentTimeMillis() - startTime; serviceCounter.update(PublicationQuery.DELETE_BUSINESS, QueryStatus.SUCCESS, procTime); @@ -383,7 +376,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub tx.commit(); for (int i = 0; i < changes.size(); i++) { - ReplicationNotifier.Enqueue(changes.get(i)); + ReplicationNotifier.enqueue(changes.get(i)); } long procTime = System.currentTimeMillis() - startTime; serviceCounter.update(PublicationQuery.DELETE_PUBLISHERASSERTIONS, @@ -468,7 +461,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub tx.commit(); for (int i = 0; i < changes.size(); i++) { - ReplicationNotifier.Enqueue(changes.get(i)); + ReplicationNotifier.enqueue(changes.get(i)); } long procTime = System.currentTimeMillis() - startTime; serviceCounter.update(PublicationQuery.DELETE_SERVICE, @@ -531,7 +524,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub tx.commit(); for (int i = 0; i < changes.size(); i++) { - ReplicationNotifier.Enqueue(changes.get(i)); + ReplicationNotifier.enqueue(changes.get(i)); } long procTime = System.currentTimeMillis() - startTime; serviceCounter.update(PublicationQuery.DELETE_TMODEL, QueryStatus.SUCCESS, procTime); @@ -767,7 +760,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub tx.commit(); for (int i = 0; i < changes.size(); i++) { - ReplicationNotifier.Enqueue(changes.get(i)); + ReplicationNotifier.enqueue(changes.get(i)); } long procTime = System.currentTimeMillis() - startTime; serviceCounter.update(PublicationQuery.SAVE_BINDING, @@ -794,9 +787,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub public BusinessDetail saveBusiness(SaveBusiness body) throws DispositionReportFaultMessage { long startTime = System.currentTimeMillis(); - if (!body.getBusinessEntity().isEmpty()) { - log.debug("Inbound save business request for key " + body.getBusinessEntity().get(0).getBusinessKey()); - } + EntityManager em = PersistenceManager.getEntityManager(); EntityTransaction tx = em.getTransaction(); try { @@ -831,7 +822,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub tx.commit(); for (int i = 0; i < changes.size(); i++) { - ReplicationNotifier.Enqueue(changes.get(i)); + ReplicationNotifier.enqueue(changes.get(i)); } long procTime = System.currentTimeMillis() - startTime; serviceCounter.update(PublicationQuery.SAVE_BUSINESS, @@ -900,7 +891,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub tx.commit(); for (int i = 0; i < changes.size(); i++) { - ReplicationNotifier.Enqueue(changes.get(i)); + ReplicationNotifier.enqueue(changes.get(i)); } long procTime = System.currentTimeMillis() - startTime; serviceCounter.update(PublicationQuery.SAVE_SERVICE, @@ -970,7 +961,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub tx.commit(); for (int i = 0; i < changes.size(); i++) { - ReplicationNotifier.Enqueue(changes.get(i)); + ReplicationNotifier.enqueue(changes.get(i)); } long procTime = System.currentTimeMillis() - startTime; serviceCounter.update(PublicationQuery.SAVE_TMODEL, @@ -1090,7 +1081,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub addPublisherAssertions(addPublisherAssertions); } for (int i = 0; i < changes.size(); i++) { - ReplicationNotifier.Enqueue(changes.get(i)); + ReplicationNotifier.enqueue(changes.get(i)); } long procTime = System.currentTimeMillis() - startTime; serviceCounter.update(PublicationQuery.SET_PUBLISHERASSERTIONS, @@ -1303,7 +1294,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub return cr; } - public static ChangeRecord getChangeRecord_deleteBusiness(String entityKey, String node) { + public ChangeRecord getChangeRecord_deleteBusiness(String entityKey, String node) { ChangeRecord cr = new ChangeRecord(); cr.setEntityKey(entityKey); cr.setNodeID(node); @@ -1325,7 +1316,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub return cr; } - public static ChangeRecord getChangeRecord_deleteService(String entityKey, String node) { + public ChangeRecord getChangeRecord_deleteService(String entityKey, String node) { ChangeRecord cr = new ChangeRecord(); cr.setEntityKey(entityKey); cr.setNodeID(node); @@ -1354,7 +1345,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub * @param node * @return */ - public static ChangeRecord getChangeRecord_deleteTModelHide(String entityKey, String node) { + public ChangeRecord getChangeRecord_deleteTModelHide(String entityKey, String node) { ChangeRecord cr = new ChangeRecord(); cr.setEntityKey(entityKey); cr.setNodeID(node); @@ -1384,7 +1375,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub * @param node * @return */ - public static ChangeRecord getChangeRecord_deleteTModelDelete(String entityKey, String node) { + public static ChangeRecord getChangeRecord_deleteTModelDelete(String entityKey, String node, DatatypeFactory df) { ChangeRecord cr = new ChangeRecord(); cr.setEntityKey(entityKey); cr.setNodeID(node); @@ -1455,7 +1446,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub return cr; } - public static ChangeRecord getChangeRecord_deleteBinding(String entityKey, String node) { + public ChangeRecord getChangeRecord_deleteBinding(String entityKey, String node) { ChangeRecord cr = new ChangeRecord(); cr.setEntityKey(entityKey); cr.setNodeID(node); @@ -1477,7 +1468,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub return cr; } - public static ChangeRecord getChangeRecord_deletePublisherAssertion(PublisherAssertion entity, String node, boolean ToBusinessDelete, boolean FromBusinessDelete, long timestamp) { + public ChangeRecord getChangeRecord_deletePublisherAssertion(PublisherAssertion entity, String node, boolean ToBusinessDelete, boolean FromBusinessDelete, long timestamp) { ChangeRecord cr = new ChangeRecord(); cr.setNodeID(node); @@ -1503,7 +1494,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub return cr; } - public static ChangeRecord getChangeRecord_NewAssertion(PublisherAssertion apiPubAssertion, org.apache.juddi.model.PublisherAssertion modelPubAssertion, String node) { + public ChangeRecord getChangeRecord_NewAssertion(PublisherAssertion apiPubAssertion, org.apache.juddi.model.PublisherAssertion modelPubAssertion, String node) { ChangeRecord cr = new ChangeRecord(); cr.setNodeID(node); http://git-wip-us.apache.org/repos/asf/juddi/blob/9c77acdf/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java index fcb1fd8..711ca18 100644 --- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java +++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java @@ -41,7 +41,6 @@ import javax.persistence.Query; import javax.xml.bind.JAXB; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.ws.BindingProvider; -import static org.apache.juddi.api.impl.AuthenticatedService.getNode; import org.apache.juddi.api.util.QueryStatus; import org.apache.juddi.api.util.ReplicationQuery; import org.apache.juddi.config.AppConfig; @@ -108,7 +107,7 @@ import org.uddi.v3_service.UDDIReplicationPortType; }) public class UDDIReplicationImpl extends AuthenticatedService implements UDDIReplicationPortType { - static void notifyConfigurationChange(ReplicationConfiguration oldConfig, ReplicationConfiguration newConfig) { + static void notifyConfigurationChange(ReplicationConfiguration oldConfig, ReplicationConfiguration newConfig, AuthenticatedService service) { //if the config is different Set<String> oldnodes = getNodes(oldConfig); @@ -119,8 +118,8 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep queue = new ConcurrentLinkedQueue<NotifyChangeRecordsAvailable>(); } for (String s : addedNodes) { - if (!s.equals(getNode())) { - logger.info("This node: " + getNode() + ". New replication node queue for synchronization: " + s); + if (!s.equals(service.getNode())) { + logger.info("This node: " + service.getNode() + ". New replication node queue for synchronization: " + s); HighWaterMarkVectorType highWaterMarkVectorType = new HighWaterMarkVectorType(); highWaterMarkVectorType.getHighWaterMark().add(new ChangeRecordIDType(s, 0L)); queue.add(new NotifyChangeRecordsAvailable(s, highWaterMarkVectorType)); @@ -365,18 +364,18 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getBindingKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getBindingKey())) { //delete a binding template UddiEntity ue = em.find(BindingTemplate.class, rec.getChangeRecordDelete().getBindingKey()); - ValidateNodeIdMisMatches(ue, getNode()); + validateNodeIdMisMatches(ue, getNode()); pub.deleteBinding(rec.getChangeRecordDelete().getBindingKey(), em); } if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getBusinessKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getBusinessKey())) { //delete a business UddiEntity ue = em.find(BusinessEntity.class, rec.getChangeRecordDelete().getBindingKey()); - ValidateNodeIdMisMatches(ue, getNode()); + validateNodeIdMisMatches(ue, getNode()); pub.deleteBusiness(rec.getChangeRecordDelete().getBusinessKey(), em); } if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getServiceKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getServiceKey())) { UddiEntity ue = em.find(BusinessService.class, rec.getChangeRecordDelete().getBindingKey()); - ValidateNodeIdMisMatches(ue, getNode()); + validateNodeIdMisMatches(ue, getNode()); //delete a service pub.deleteService(rec.getChangeRecordDelete().getServiceKey(), em); } @@ -394,7 +393,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep */ UddiEntity tm = em.find(Tmodel.class, rec.getChangeRecordDelete().getTModelKey()); if (tm != null) { - ValidateNodeIdMisMatches(tm, getNode()); + validateNodeIdMisMatches(tm, getNode()); em.remove(tm); } else { logger.error("failed to adminstratively delete tmodel because it doesn't exist. " + rec.getChangeRecordDelete().getTModelKey()); @@ -431,7 +430,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep if (model == null) { logger.error("Replication error, attempting to insert a binding where the service doesn't exist yet"); } else { - ValidateNodeIdMatches(rec.getChangeRecordNewData().getOperationalInfo().getNodeID(), model.getNodeId()); + validateNodeIdMatches(rec.getChangeRecordNewData().getOperationalInfo().getNodeID(), model.getNodeId()); org.apache.juddi.model.BindingTemplate bt = em.find(org.apache.juddi.model.BindingTemplate.class, rec.getChangeRecordNewData().getBindingTemplate().getBindingKey()); if (bt != null) { @@ -499,7 +498,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep org.apache.juddi.model.BusinessService model = null; model = em.find(org.apache.juddi.model.BusinessService.class, rec.getChangeRecordNewData().getBusinessService().getServiceKey()); if (model != null) { - ValidateNodeIdMatches(rec.getChangeRecordNewData().getOperationalInfo().getNodeID(), model.getNodeId()); + validateNodeIdMatches(rec.getChangeRecordNewData().getOperationalInfo().getNodeID(), model.getNodeId()); em.remove(model); } @@ -585,7 +584,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep logger.error("Unexpected delete/hide tmodel message received for non existing key " + key); } else { //no one else can delete/hide my tmodel - ValidateNodeIdMisMatches(existing, getNode()); + validateNodeIdMisMatches(existing, getNode()); existing.setDeleted(true); existing.setModified(rec.getChangeRecordHide().getModified().toGregorianCalendar().getTime()); existing.setModifiedIncludingChildren(rec.getChangeRecordHide().getModified().toGregorianCalendar().getTime()); @@ -659,7 +658,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep posack.setChangeRecordAcknowledgement(new ChangeRecordAcknowledgement()); posack.getChangeRecordAcknowledgement().setAcknowledgedChange(rec.getChangeID()); posack.setAcknowledgementRequested(false); - ReplicationNotifier.Enqueue(MappingApiToModel.mapChangeRecord(posack)); + ReplicationNotifier.enqueue(MappingApiToModel.mapChangeRecord(posack)); } if (rec.getChangeRecordNewDataConditional() != null) { @@ -684,7 +683,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep org.apache.juddi.model.BindingTemplate bt = em.find(org.apache.juddi.model.BindingTemplate.class, rec.getChangeRecordNewDataConditional().getChangeRecordNewData().getBindingTemplate().getBindingKey()); if (bt != null) { - ValidateNodeIdMatches(rec.getChangeRecordNewDataConditional().getChangeRecordNewData().getOperationalInfo().getNodeID(), bt.getNodeId()); + validateNodeIdMatches(rec.getChangeRecordNewDataConditional().getChangeRecordNewData().getOperationalInfo().getNodeID(), bt.getNodeId()); em.remove(bt); } @@ -699,7 +698,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep BusinessEntity model = em.find(org.apache.juddi.model.BusinessEntity.class, rec.getChangeRecordNewDataConditional().getChangeRecordNewData().getBusinessEntity().getBusinessKey()); if (model != null) { - ValidateNodeIdMatches(rec.getChangeRecordNewDataConditional().getChangeRecordNewData().getOperationalInfo().getNodeID(), model.getNodeId()); + validateNodeIdMatches(rec.getChangeRecordNewDataConditional().getChangeRecordNewData().getOperationalInfo().getNodeID(), model.getNodeId()); //TODO revisit access control rules em.remove(model); } @@ -721,7 +720,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep org.apache.juddi.model.BusinessService model = null; model = em.find(org.apache.juddi.model.BusinessService.class, rec.getChangeRecordNewDataConditional().getChangeRecordNewData().getBusinessService().getServiceKey()); if (model != null) { - ValidateNodeIdMatches(rec.getChangeRecordNewDataConditional().getChangeRecordNewData().getOperationalInfo().getNodeID(), model.getNodeId()); + validateNodeIdMatches(rec.getChangeRecordNewDataConditional().getChangeRecordNewData().getOperationalInfo().getNodeID(), model.getNodeId()); em.remove(model); } @@ -737,7 +736,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep Tmodel model = em.find(org.apache.juddi.model.Tmodel.class, rec.getChangeRecordNewDataConditional().getChangeRecordNewData().getTModel().getTModelKey()); if (model != null) { - ValidateNodeIdMatches(rec.getChangeRecordNewDataConditional().getChangeRecordNewData().getOperationalInfo().getNodeID(), model.getNodeId()); + validateNodeIdMatches(rec.getChangeRecordNewDataConditional().getChangeRecordNewData().getOperationalInfo().getNodeID(), model.getNodeId()); em.remove(model); } model = new Tmodel(); @@ -892,7 +891,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep * @param node * @throws Exception */ - private static void ValidateNodeIdMisMatches(UddiEntity ue, String node) throws Exception { + private static void validateNodeIdMisMatches(UddiEntity ue, String node) throws Exception { if (ue == null) { return;//object doesn't exist } @@ -909,7 +908,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep * @param currentOwningNode * @throws Exception */ - private static void ValidateNodeIdMatches(String newNodeId, String currentOwningNode) throws Exception { + private void validateNodeIdMatches(String newNodeId, String currentOwningNode) throws Exception { if (newNodeId == null || currentOwningNode == null) { throw new Exception("either the local node ID is null or the inbound replication data's node id is null"); } @@ -1308,7 +1307,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep c.setChangeID(new ChangeRecordIDType()); c.getChangeID().setNodeID(getNode()); c.getChangeID().setOriginatingUSN(null); - ReplicationNotifier.Enqueue(MappingApiToModel.mapChangeRecord(c)); + ReplicationNotifier.enqueue(MappingApiToModel.mapChangeRecord(c)); } catch (UnsupportedEncodingException ex) { logger.error("", ex); } http://git-wip-us.apache.org/repos/asf/juddi/blob/9c77acdf/juddi-core/src/main/java/org/apache/juddi/config/Install.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/config/Install.java b/juddi-core/src/main/java/org/apache/juddi/config/Install.java index 6d05519..f8cfef0 100644 --- a/juddi-core/src/main/java/org/apache/juddi/config/Install.java +++ b/juddi-core/src/main/java/org/apache/juddi/config/Install.java @@ -326,7 +326,7 @@ public class Install { em.persist(modelBusinessEntity); SaveBusiness sb = new SaveBusiness(); sb.getBusinessEntity().add(rootBusinessEntity); - ReplicationNotifier.Enqueue(UDDIPublicationImpl.getChangeRecord(modelBusinessEntity, rootBusinessEntity, modelBusinessEntity.getNodeId())); + ReplicationNotifier.enqueue(UDDIPublicationImpl.getChangeRecord(modelBusinessEntity, rootBusinessEntity, modelBusinessEntity.getNodeId())); return modelBusinessEntity.getEntityKey(); @@ -505,7 +505,7 @@ public class Install { SaveTModel stm = new SaveTModel(); stm.getTModel().add(apiTModel); - ReplicationNotifier.Enqueue(UDDIPublicationImpl.getChangeRecord(modelTModel, apiTModel, nodeId)); + ReplicationNotifier.enqueue(UDDIPublicationImpl.getChangeRecord(modelTModel, apiTModel, nodeId)); } } http://git-wip-us.apache.org/repos/asf/juddi/blob/9c77acdf/juddi-core/src/main/java/org/apache/juddi/model/Edge.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/model/Edge.java b/juddi-core/src/main/java/org/apache/juddi/model/Edge.java index 669a2a2..af625d6 100644 --- a/juddi-core/src/main/java/org/apache/juddi/model/Edge.java +++ b/juddi-core/src/main/java/org/apache/juddi/model/Edge.java @@ -15,10 +15,9 @@ */ package org.apache.juddi.model; +import java.io.Serializable; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Set; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; @@ -29,12 +28,11 @@ import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; -import javax.persistence.OneToOne; import javax.persistence.Table; @Entity @Table(name = "j3_edge") -public class Edge { +public class Edge implements Serializable{ private Long id; private List<ControlMessage> message; http://git-wip-us.apache.org/repos/asf/juddi/blob/9c77acdf/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java b/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java index 4426cc7..48ea677 100644 --- a/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java +++ b/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java @@ -98,7 +98,7 @@ public class ReplicationNotifier extends TimerTask { } //ReplicationNotifier.Enqueue(this); - public synchronized static void Enqueue(org.apache.juddi.model.ChangeRecord change) { + public synchronized static void enqueue(org.apache.juddi.model.ChangeRecord change) { if (queue == null) { queue = new ConcurrentLinkedQueue<org.apache.juddi.model.ChangeRecord>(); } http://git-wip-us.apache.org/repos/asf/juddi/blob/9c77acdf/juddi-core/src/main/java/org/apache/juddi/rmi/UDDICustodyTransferService.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDICustodyTransferService.java b/juddi-core/src/main/java/org/apache/juddi/rmi/UDDICustodyTransferService.java index cc880ca..535f5a6 100644 --- a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDICustodyTransferService.java +++ b/juddi-core/src/main/java/org/apache/juddi/rmi/UDDICustodyTransferService.java @@ -38,7 +38,7 @@ import org.uddi.v3_service.UDDICustodyTransferPortType; public class UDDICustodyTransferService extends UnicastRemoteObject implements UDDICustodyTransferPortType { private static final long serialVersionUID = 8900970766388210839L; - private UDDICustodyTransferPortType custodyTransfer = new UDDICustodyTransferImpl(); + private transient UDDICustodyTransferPortType custodyTransfer = new UDDICustodyTransferImpl(); protected UDDICustodyTransferService(int port) throws RemoteException { super(port); http://git-wip-us.apache.org/repos/asf/juddi/blob/9c77acdf/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIInquiryService.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIInquiryService.java b/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIInquiryService.java index 6a4c951..a9ecbc9 100644 --- a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIInquiryService.java +++ b/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIInquiryService.java @@ -49,7 +49,7 @@ import org.uddi.v3_service.UDDIInquiryPortType; public class UDDIInquiryService extends UnicastRemoteObject implements UDDIInquiryPortType { private static final long serialVersionUID = -8384112899703963130L; - private UDDIInquiryImpl inquiry = new UDDIInquiryImpl(); + private transient UDDIInquiryImpl inquiry = new UDDIInquiryImpl(); protected UDDIInquiryService(int port) throws RemoteException { super(port); http://git-wip-us.apache.org/repos/asf/juddi/blob/9c77acdf/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIPublicationService.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIPublicationService.java b/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIPublicationService.java index cf2494a..1646a94 100644 --- a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIPublicationService.java +++ b/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIPublicationService.java @@ -52,7 +52,7 @@ import org.uddi.v3_service.UDDIPublicationPortType; public class UDDIPublicationService extends UnicastRemoteObject implements UDDIPublicationPortType { private static final long serialVersionUID = 8342463046574333026L; - private UDDIPublicationPortType publication = new UDDIPublicationImpl(); + private transient UDDIPublicationPortType publication = new UDDIPublicationImpl(); protected UDDIPublicationService(int port) throws RemoteException { super(port); http://git-wip-us.apache.org/repos/asf/juddi/blob/9c77acdf/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISecurityService.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISecurityService.java b/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISecurityService.java index 128d53b..5812a5b 100644 --- a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISecurityService.java +++ b/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISecurityService.java @@ -34,7 +34,7 @@ import org.uddi.v3_service.UDDISecurityPortType; public class UDDISecurityService extends UnicastRemoteObject implements UDDISecurityPortType { private static final long serialVersionUID = -7931578658303681458L; - private UDDISecurityPortType security = new UDDISecurityImpl(); + private transient UDDISecurityPortType security = new UDDISecurityImpl(); protected UDDISecurityService(int port) throws RemoteException { super(port); http://git-wip-us.apache.org/repos/asf/juddi/blob/9c77acdf/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISubscriptionListenerService.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISubscriptionListenerService.java b/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISubscriptionListenerService.java index 953e8c3..183a728 100644 --- a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISubscriptionListenerService.java +++ b/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISubscriptionListenerService.java @@ -34,7 +34,7 @@ import org.uddi.v3_service.UDDISubscriptionListenerPortType; public class UDDISubscriptionListenerService extends UnicastRemoteObject implements UDDISubscriptionListenerPortType { private static final long serialVersionUID = -5103095115366760255L; - private UDDISubscriptionListenerPortType subscriptionListener = new UDDISubscriptionListenerImpl(); + private transient UDDISubscriptionListenerPortType subscriptionListener = new UDDISubscriptionListenerImpl(); protected UDDISubscriptionListenerService(int port) throws RemoteException { super(port); http://git-wip-us.apache.org/repos/asf/juddi/blob/9c77acdf/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISubscriptionService.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISubscriptionService.java b/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISubscriptionService.java index 48f98fa..bf3b052 100644 --- a/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISubscriptionService.java +++ b/juddi-core/src/main/java/org/apache/juddi/rmi/UDDISubscriptionService.java @@ -39,7 +39,7 @@ import org.uddi.v3_service.UDDISubscriptionPortType; public class UDDISubscriptionService extends UnicastRemoteObject implements UDDISubscriptionPortType { private static final long serialVersionUID = 3534214581063707293L; - private UDDISubscriptionPortType subscription = new UDDISubscriptionImpl(); + private transient UDDISubscriptionPortType subscription = new UDDISubscriptionImpl(); protected UDDISubscriptionService(int port) throws RemoteException { super(port); http://git-wip-us.apache.org/repos/asf/juddi/blob/9c77acdf/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java b/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java index 1b5138c..70a2d46 100644 --- a/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java +++ b/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java @@ -64,11 +64,11 @@ import org.uddi.v3_service.DispositionReportFaultMessage; */ public class SMTPNotifier implements Notifier { - static final Log log = LogFactory.getLog(SMTPNotifier.class); - String notificationEmailAddress = null; + protected static final Log log = LogFactory.getLog(SMTPNotifier.class); + protected String notificationEmailAddress = null; //String from = null; - Session session = null; - Properties properties = null; + protected Session session = null; + protected Properties properties = null; protected final static String[] mailProps = {"mail.smtp.from", "mail.smtp.host", "mail.smtp.port", "mail.smtp.socketFactory.class", "mail.smtp.socketFactory.fallback", "mail.smtp.starttls.enable", --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
