You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by mc...@apache.org on 2008/03/26 21:17:31 UTC

svn commit: r641542 - in /incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain: ./ management/ model/

Author: mcombellack
Date: Wed Mar 26 13:17:28 2008
New Revision: 641542

URL: http://svn.apache.org/viewvc?rev=641542&view=rev
Log:
Removed redundant modifiers from methods on interface

Modified:
    incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java
    incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java
    incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java
    incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java
    incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java
    incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java
    incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java
    incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java
    incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java
    incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java
    incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java
    incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java

Modified: incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java?rev=641542&r1=641541&r2=641542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java (original)
+++ incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java Wed Mar 26 13:17:28 2008
@@ -19,7 +19,6 @@
 
 package org.apache.tuscany.sca.domain;
 
-import org.apache.tuscany.sca.domain.DomainException;
 import org.osoa.sca.annotations.Remotable;
 
 
@@ -34,19 +33,19 @@
     /**
      * Start all of the services in the domain.
      */
-    public void start() 
+    void start() 
       throws DomainException;  
 
     /**
      * Stop all of the services in the domain.
      */
-    public void stop()
+    void stop()
       throws DomainException; 
 
     /**
      * Destroy the SCA domain.
      */
-    public void destroyDomain()
+    void destroyDomain()
       throws DomainException;
 
     /**
@@ -55,7 +54,7 @@
      * 
      * @return the URI of the SCA Domain
      */
-    public String getURI();
+    String getURI();
     
     /**
      * Add an SCA contribution to the domain.
@@ -64,7 +63,7 @@
      * @param contributionURL the URL of the contribution
      * @throws DomainException
      */  
-    public void addContribution(String contributionURI, String contributionURL)
+    void addContribution(String contributionURI, String contributionURL)
       throws DomainException;
     
     /**
@@ -74,7 +73,7 @@
      * @param contributionURL the URL of the contribution
      * @throws DomainException
      */  
-    public void updateContribution(String contributionURI, String contributionURL)
+    void updateContribution(String contributionURI, String contributionURL)
       throws DomainException;    
     
     /**
@@ -83,7 +82,7 @@
      * @param contributionURI the URI of the contribution
      * @throws DomainException
      */
-    public void removeContribution(String contributionURI)
+    void removeContribution(String contributionURI)
       throws DomainException; 
     
     /**
@@ -93,7 +92,7 @@
      * @param compositeXML the XML string of the composite 
      * @throws DomainException
      */
-    public void addDeploymentComposite(String contributionURI, String compositeXML)
+    void addDeploymentComposite(String contributionURI, String compositeXML)
       throws DomainException;
     
     /**
@@ -103,7 +102,7 @@
      * @param compositeXML the XML string of the composite 
      * @throws DomainException
      */
-    public void updateDeploymentComposite(String contributionURI, String compositeXML)
+    void updateDeploymentComposite(String contributionURI, String compositeXML)
       throws DomainException;    
 
     /**
@@ -112,7 +111,7 @@
      * @param compositeQName the QName of the composite
      * @throws DomainException     
      */
-    public void addToDomainLevelComposite(String compositeQName)
+    void addToDomainLevelComposite(String compositeQName)
       throws DomainException;
     
     /**
@@ -121,7 +120,7 @@
      * @param compositeQName the QName of the composite
      * @throws DomainException     
      */
-    public void removeFromDomainLevelComposite(String compositeQName)
+    void removeFromDomainLevelComposite(String compositeQName)
       throws DomainException; 
     
     /**
@@ -129,7 +128,7 @@
      * 
      * @return XML representing the domain level composite
      */
-    public String getDomainLevelComposite()
+    String getDomainLevelComposite()
       throws DomainException;
     
     /**
@@ -138,7 +137,7 @@
      * 
      * @return XML representing the specified artifact
      */
-    public String getQNameDefinition(String artifact)
+    String getQNameDefinition(String artifact)
       throws DomainException;
     
     /**
@@ -150,7 +149,7 @@
      * @param compositeQName The QName of the composite
      * @throws DomainException
      */
-    public void startComposite(String compositeQName)
+    void startComposite(String compositeQName)
       throws DomainException;
     
     /**
@@ -160,6 +159,6 @@
      * @param compositeQName The QName of the composite
      * @throws DomainException
      */
-    public void stopComposite(String compositeQName)
+    void stopComposite(String compositeQName)
       throws DomainException;
 }

Modified: incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java?rev=641542&r1=641541&r2=641542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java (original)
+++ incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java Wed Mar 26 13:17:28 2008
@@ -33,7 +33,7 @@
      * Returns the model of the domain
      * @return
      */
-    public DomainModel getDomainModel();
+    DomainModel getDomainModel();
     
     /**
      * Registers all of the services in the composite with the domain

Modified: incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java?rev=641542&r1=641541&r2=641542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java (original)
+++ incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/ContributionInfo.java Wed Mar 26 13:17:28 2008
@@ -38,30 +38,30 @@
      * 
      * @return contribution URI
      */
-    public String getContributionURI();
+    String getContributionURI();
     
     /**
      * Set the contribution URI
      * 
      * @param contributionURI
      */    
-    public void setContributionURI(String contributionURI);    
+    void setContributionURI(String contributionURI);    
     
     /**
      * Retrieve the contribution URL
      * 
      * @return contribution URL
      */    
-    public URL getContributionURL();
+    URL getContributionURL();
    
     /**
      * Set the contribution URL
      * 
      * @param contributionURL
      */    
-    public void setContributionURL(URL contributionURL);
+    void setContributionURL(URL contributionURL);
     
-    public List<QName> getComposites();       
-    public List<QName> getDeployableComposites();
+    List<QName> getComposites();       
+    List<QName> getDeployableComposites();
  
 }

Modified: incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java?rev=641542&r1=641541&r2=641542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java (original)
+++ incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/DomainInfo.java Wed Mar 26 13:17:28 2008
@@ -36,31 +36,31 @@
      * 
      * @return domain URI
      */
-    public String getDomainURI();
+    String getDomainURI();
     
     /**
      * Set the domain URI
      * 
      * @param domainURI
      */    
-    public void setDomainURI(String domainURI);    
+    void setDomainURI(String domainURI);    
     
     /**
      * Retrieve the domain URL
      * 
      * @return domain URL
      */    
-    public String  getDomainURL();
+    String  getDomainURL();
    
     /**
      * Set the domain URL
      * 
      * @param domainURL
      */    
-    public void setDomainURL(String domainURL);    
+    void setDomainURL(String domainURL);    
     
-    public List<String> getNodes();
-    public List<String> getContributions();
-    public List<QName> getDeployedComposites();
+    List<String> getNodes();
+    List<String> getContributions();
+    List<QName> getDeployedComposites();
  
 }

Modified: incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java?rev=641542&r1=641541&r2=641542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java (original)
+++ incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/NodeInfo.java Wed Mar 26 13:17:28 2008
@@ -36,31 +36,31 @@
      * 
      * @return node URI
      */
-    public String getNodeURI();
+    String getNodeURI();
     
     /**
      * Set the node URI
      * 
      * @param nodeURI
      */    
-    public void setNodeURI(String nodeURI);    
+    void setNodeURI(String nodeURI);    
     
     /**
      * Retrieve the node URL
      *
      * @return node URL
      */    
-    public String getNodeURL();
+    String getNodeURL();
    
     /**
      * Set the node URL
      * 
      * @param nodeURL
      */    
-    public void setNodeURL(String nodeURL);
+    void setNodeURL(String nodeURL);
    
-    public List<String> getContributions();
-    public List<QName> getDeployedComposites();
-    public List<String> getServices();
+    List<String> getContributions();
+    List<QName> getDeployedComposites();
+    List<String> getServices();
  
 }

Modified: incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java?rev=641542&r1=641541&r2=641542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java (original)
+++ incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java Wed Mar 26 13:17:28 2008
@@ -37,20 +37,20 @@
      * 
      * @param domain
      */
-    public void setDomain(SCADomain domain);
+    void setDomain(SCADomain domain);
      
     /**
      * Set the domain SPI object
      * 
      * @param domain
      */
-    public void setDomainSPI(SCADomainSPI domainSPI);
+    void setDomainSPI(SCADomainSPI domainSPI);
     
     /**
      * Set the domain event object
      * 
      * @param domain
      */
-    public void setDomainEventService(SCADomainEventService domainEventService);    
+    void setDomainEventService(SCADomainEventService domainEventService);    
     
 }

Modified: incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java?rev=641542&r1=641541&r2=641542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java (original)
+++ incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/CompositeModel.java Wed Mar 26 13:17:28 2008
@@ -37,27 +37,27 @@
      * 
      * @return composite QName
      */
-    public QName getCompositeQName();
+    QName getCompositeQName();
     
     /**
      * Set the composite QName
      * 
      * @param compositeQName
      */    
-    public void setCompositeQName(QName compositeQName);  
+    void setCompositeQName(QName compositeQName);  
     
     /**
      * Retrieve the assembly composite object
      * 
      * @return composite
      */
-    public Composite getComposite();
+    Composite getComposite();
     
     /** 
      * Set the assembly composite object
      * 
      * @param composite
      */
-    public void setComposite(Composite composite);
+    void setComposite(Composite composite);
  
 }

Modified: incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java?rev=641542&r1=641541&r2=641542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java (original)
+++ incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ContributionModel.java Wed Mar 26 13:17:28 2008
@@ -37,44 +37,44 @@
      * 
      * @return contribution 
      */
-    public Contribution getContribution();
+    Contribution getContribution();
     
     /**
      * Set the contribution object
      * 
      * @param contribution
      */    
-    public void setContribution(Contribution contribution);        
+    void setContribution(Contribution contribution);        
     
     /**
      * Retrieve the contribution URI
      * 
      * @return contribution URI
      */
-    public String getContributionURI();
+    String getContributionURI();
     
     /**
      * Set the contribution URI
      * 
      * @param contributionURI
      */    
-    public void setContributionURI(String contributionURI);    
+    void setContributionURI(String contributionURI);    
     
     /**
      * Retrieve the contribution URL
      * 
      * @return contribution URL
      */    
-    public String getContributionURL();
+    String getContributionURL();
    
     /**
      * Set the contribution URL
      * 
      * @param contributionURL
      */    
-    public void setContributionURL(String contributionURL);
+    void setContributionURL(String contributionURL);
     
-    public Map<QName, CompositeModel> getComposites();       
-    public Map<QName, CompositeModel> getDeployableComposites(); 
-    public Map<QName, CompositeModel> getDeployedComposites(); 
+    Map<QName, CompositeModel> getComposites();       
+    Map<QName, CompositeModel> getDeployableComposites(); 
+    Map<QName, CompositeModel> getDeployedComposites(); 
 }

Modified: incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java?rev=641542&r1=641541&r2=641542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java (original)
+++ incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModel.java Wed Mar 26 13:17:28 2008
@@ -39,28 +39,28 @@
      * 
      * @return domain URI
      */
-    public String getDomainURI();
+    String getDomainURI();
     
     /**
      * Set the domain URI
      * 
      * @param domainURI
      */    
-    public void setDomainURI(String domainURI);    
+    void setDomainURI(String domainURI);    
     
     /**
      * Retrieve the domain URL
      * 
      * @return domain URL
      */    
-    public String  getDomainURL();
+    String  getDomainURL();
    
     /**
      * Set the domain URL
      * 
      * @param domainURL
      */    
-    public void setDomainURL(String domainURL);
+    void setDomainURL(String domainURL);
     
     
     /**
@@ -68,16 +68,16 @@
      * 
      * @param domainLevelComposite
      */    
-    public void setDomainLeveComposite(Composite domainLevelComposite);
+    void setDomainLeveComposite(Composite domainLevelComposite);
     
     /**
      * Retrieve the domain level composite
      * 
      * @return domainLevelComposite 
      */    
-    public Composite getDomainLevelComposite();   
+    Composite getDomainLevelComposite();   
    
-    public Map<String, NodeModel> getNodes();
-    public Map<String, ContributionModel> getContributions();
-    public Map<QName, CompositeModel> getDeployedComposites();
+    Map<String, NodeModel> getNodes();
+    Map<String, ContributionModel> getContributions();
+    Map<QName, CompositeModel> getDeployedComposites();
 }

Modified: incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java?rev=641542&r1=641541&r2=641542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java (original)
+++ incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/DomainModelFactory.java Wed Mar 26 13:17:28 2008
@@ -31,34 +31,34 @@
      * 
      * @return new domain model
      */
-    public DomainModel createDomain();
+    DomainModel createDomain();
    
     /**
      * Create a new node model
      * 
      * @return new node model
      */
-    public NodeModel createNode();  
+    NodeModel createNode();  
     
     /**
      * Create a new contribution model
      * 
      * @return new contribution model
      */
-    public ContributionModel createContribution();    
+    ContributionModel createContribution();    
     
     /**
      * Create a new composite model
      * 
      * @return new composite model
      */
-    public CompositeModel createComposite();   
+    CompositeModel createComposite();   
     
     /**
      * Create a new service model
      * 
      * @return new service model
      */
-    public ServiceModel createService();     
+    ServiceModel createService();     
 
 }

Modified: incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java?rev=641542&r1=641541&r2=641542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java (original)
+++ incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/NodeModel.java Wed Mar 26 13:17:28 2008
@@ -38,58 +38,58 @@
      * 
      * @return node URI
      */
-    public String getNodeURI();
+    String getNodeURI();
     
     /**
      * Set the node URI
      * 
      * @param nodeURI
      */    
-    public void setNodeURI(String nodeURI);    
+    void setNodeURI(String nodeURI);    
     
     /**
      * Retrieve the node URL
      *
      * @return node URL
      */    
-    public String getNodeURL();
+    String getNodeURL();
    
     /**
      * Set the node URL
      * 
      * @param nodeURL
      */    
-    public void setNodeURL(String nodeURL);
+    void setNodeURL(String nodeURL);
     
     /**
      * Returns the state of the node
      *
      * @return state
      */    
-    public LifecyleState getLifecycleState();
+    LifecyleState getLifecycleState();
    
     /**
      * Set the state of the node
      * 
      * @param state
      */    
-    public void setLifecycleState(LifecyleState state);    
+    void setLifecycleState(LifecyleState state);    
     
     /**
      * Retrieve the node manager reference
      *
      * @return node manager reference
      */    
-    public Externalizable getNodeManagerReference();
+    Externalizable getNodeManagerReference();
    
     /**
      * Set the node URL
      * 
      * @param nodeURL
      */    
-    public void setNodeManagerReference(Externalizable nodeManagerReference);    
+    void setNodeManagerReference(Externalizable nodeManagerReference);    
    
-    public Map<String, ContributionModel> getContributions();
-    public Map<QName, CompositeModel> getDeployedComposites();
-    public Map<String, ServiceModel> getServices();
+    Map<String, ContributionModel> getContributions();
+    Map<QName, CompositeModel> getDeployedComposites();
+    Map<String, ServiceModel> getServices();
 }

Modified: incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java?rev=641542&r1=641541&r2=641542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java (original)
+++ incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/model/ServiceModel.java Wed Mar 26 13:17:28 2008
@@ -32,28 +32,28 @@
      * 
      * @return service URI
      */
-    public String getServiceURI();
+    String getServiceURI();
     
     /**
      * Set the service URI
      * 
      * @param serviceURI
      */    
-    public void setServiceURI(String serviceURI);    
+    void setServiceURI(String serviceURI);    
     
     /**
      * Retrieve the service URL
      * 
      * @return service URL
      */    
-    public String getServiceURL();
+    String getServiceURL();
    
     /**
      * Set the service URL
      * 
      * @param serviceURL
      */    
-    public void setServiceURL(String serviceURL);
+    void setServiceURL(String serviceURL);
     
    
     /**
@@ -61,12 +61,12 @@
      * 
      * @return service binding
      */    
-    public String getServiceBinding();
+    String getServiceBinding();
    
     /**
      * Set the service binding
      * 
      * @param serviceBinding
      */    
-    public void setServiceBinding(String serviceBinding);    
+    void setServiceBinding(String serviceBinding);    
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org