You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/06/25 21:27:21 UTC

svn commit: r550580 - in /incubator/servicemix/trunk/core/servicemix-jbi: ./ src/main/java/javax/jbi/ src/main/java/javax/jbi/component/ src/main/java/javax/jbi/management/ src/main/java/javax/jbi/messaging/ src/main/java/javax/jbi/servicedesc/

Author: gnodet
Date: Mon Jun 25 12:27:19 2007
New Revision: 550580

URL: http://svn.apache.org/viewvc?view=rev&rev=550580
Log:
Fix checkstyle / pmd checks

Modified:
    incubator/servicemix/trunk/core/servicemix-jbi/pom.xml
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/JBIException.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/Bootstrap.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/Component.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/ComponentContext.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/ComponentLifeCycle.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/InstallationContext.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/ServiceUnitManager.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/AdminServiceMBean.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/ComponentLifeCycleMBean.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/DeploymentException.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/DeploymentServiceMBean.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/InstallationServiceMBean.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/InstallerMBean.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/LifeCycleMBean.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/MBeanNames.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/DeliveryChannel.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/ExchangeStatus.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/Fault.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/InOnly.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/InOptionalOut.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/InOut.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/MessageExchange.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/MessageExchangeFactory.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/MessagingException.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/NormalizedMessage.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/RobustInOnly.java
    incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/servicedesc/ServiceEndpoint.java

Modified: incubator/servicemix/trunk/core/servicemix-jbi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/pom.xml?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/pom.xml (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/pom.xml Mon Jun 25 12:27:19 2007
@@ -23,7 +23,7 @@
 
   <parent>
     <groupId>org.apache.servicemix</groupId>
-    <artifactId>core</artifactId>
+    <artifactId>parent</artifactId>
     <version>3.2-incubating-SNAPSHOT</version>
   </parent>
 

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/JBIException.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/JBIException.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/JBIException.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/JBIException.java Mon Jun 25 12:27:19 2007
@@ -16,20 +16,16 @@
  */
 package javax.jbi;
 
-public class JBIException extends Exception
-{
-    public JBIException(String aMessage)
-    {
+public class JBIException extends Exception {
+    public JBIException(String aMessage) {
         super(aMessage);
     }
 
-    public JBIException(String aMessage, Throwable aCause)
-    {
+    public JBIException(String aMessage, Throwable aCause) {
         super(aMessage, aCause);
     }
 
-    public JBIException(Throwable aCause)
-    {
+    public JBIException(Throwable aCause) {
         super(aCause);
     }
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/Bootstrap.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/Bootstrap.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/Bootstrap.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/Bootstrap.java Mon Jun 25 12:27:19 2007
@@ -20,18 +20,14 @@
 
 import javax.management.ObjectName;
 
-public interface Bootstrap
-{
-    void init(InstallationContext installContext)
-        throws JBIException;
+public interface Bootstrap {
+    void init(InstallationContext installContext) throws JBIException;
 
     void cleanUp() throws JBIException;
 
     ObjectName getExtensionMBeanName();
 
-    void onInstall()
-        throws JBIException;
+    void onInstall() throws JBIException;
 
-    void onUninstall()
-        throws JBIException;
+    void onUninstall() throws JBIException;
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/Component.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/Component.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/Component.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/Component.java Mon Jun 25 12:27:19 2007
@@ -22,21 +22,16 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentFragment;
 
-public interface Component
-{
+public interface Component {
     ComponentLifeCycle getLifeCycle();
-    
+
     ServiceUnitManager getServiceUnitManager();
 
     Document getServiceDescription(ServiceEndpoint endpoint);
-    
-    boolean isExchangeWithConsumerOkay(
-        ServiceEndpoint endpoint,
-        MessageExchange exchange);
-    
-    boolean isExchangeWithProviderOkay(
-        ServiceEndpoint endpoint,
-        MessageExchange exchange);
-    
+
+    boolean isExchangeWithConsumerOkay(ServiceEndpoint endpoint, MessageExchange exchange);
+
+    boolean isExchangeWithProviderOkay(ServiceEndpoint endpoint, MessageExchange exchange);
+
     ServiceEndpoint resolveEndpointReference(DocumentFragment epr);
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/ComponentContext.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/ComponentContext.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/ComponentContext.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/ComponentContext.java Mon Jun 25 12:27:19 2007
@@ -27,33 +27,26 @@
 import javax.xml.namespace.QName;
 
 import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;   
+import org.w3c.dom.DocumentFragment;
 
-public interface ComponentContext
-{
-    ServiceEndpoint activateEndpoint(QName serviceName, String endpointName)
-        throws JBIException;
-    
-    void deactivateEndpoint(ServiceEndpoint endpoint)
-        throws JBIException;
+public interface ComponentContext {
+    ServiceEndpoint activateEndpoint(QName serviceName, String endpointName) throws JBIException;
 
-    void registerExternalEndpoint(ServiceEndpoint externalEndpoint)
-        throws JBIException;
+    void deactivateEndpoint(ServiceEndpoint endpoint) throws JBIException;
 
-    void deregisterExternalEndpoint(ServiceEndpoint externalEndpoint)
-        throws JBIException;
+    void registerExternalEndpoint(ServiceEndpoint externalEndpoint) throws JBIException;
+
+    void deregisterExternalEndpoint(ServiceEndpoint externalEndpoint) throws JBIException;
 
     ServiceEndpoint resolveEndpointReference(DocumentFragment epr);
 
     String getComponentName();
 
-    DeliveryChannel getDeliveryChannel()
-        throws MessagingException;
+    DeliveryChannel getDeliveryChannel() throws MessagingException;
 
     ServiceEndpoint getEndpoint(QName service, String name);
 
-    Document getEndpointDescriptor(ServiceEndpoint endpoint)
-        throws JBIException;
+    Document getEndpointDescriptor(ServiceEndpoint endpoint) throws JBIException;
 
     ServiceEndpoint[] getEndpoints(QName interfaceName);
 
@@ -65,8 +58,7 @@
 
     String getInstallRoot();
 
-    Logger getLogger(String suffix, String resourceBundleName)
-        throws MissingResourceException, JBIException;
+    Logger getLogger(String suffix, String resourceBundleName) throws MissingResourceException, JBIException;
 
     javax.jbi.management.MBeanNames getMBeanNames();
 

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/ComponentLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/ComponentLifeCycle.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/ComponentLifeCycle.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/ComponentLifeCycle.java Mon Jun 25 12:27:19 2007
@@ -17,23 +17,17 @@
 package javax.jbi.component;
 
 import javax.jbi.JBIException;
-import javax.jbi.component.ComponentContext;
 
 import javax.management.ObjectName;
 
-public interface ComponentLifeCycle
-{
+public interface ComponentLifeCycle {
     ObjectName getExtensionMBeanName();
 
-    void init(ComponentContext context)
-        throws JBIException;
+    void init(ComponentContext context) throws JBIException;
 
-    void shutDown()
-        throws JBIException;
+    void shutDown() throws JBIException;
 
-    void start()
-        throws JBIException;
+    void start() throws JBIException;
 
-    void stop()
-        throws JBIException;
+    void stop() throws JBIException;
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/InstallationContext.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/InstallationContext.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/InstallationContext.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/InstallationContext.java Mon Jun 25 12:27:19 2007
@@ -18,8 +18,7 @@
 
 import org.w3c.dom.DocumentFragment;
 
-public interface InstallationContext
-{
+public interface InstallationContext {
     String getComponentClassName();
 
     java.util.List getClassPathElements();

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/ServiceUnitManager.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/ServiceUnitManager.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/ServiceUnitManager.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/component/ServiceUnitManager.java Mon Jun 25 12:27:19 2007
@@ -18,23 +18,16 @@
 
 import javax.jbi.management.DeploymentException;
 
-public interface ServiceUnitManager
-{
-    String deploy(String serviceUnitName, String serviceUnitRootPath)
-        throws DeploymentException;
+public interface ServiceUnitManager {
+    String deploy(String serviceUnitName, String serviceUnitRootPath) throws DeploymentException;
 
-    void init(String serviceUnitName, String serviceUnitRootPath)
-        throws DeploymentException;
+    void init(String serviceUnitName, String serviceUnitRootPath) throws DeploymentException;
 
-    void start(String serviceUnitName)
-        throws DeploymentException;
+    void start(String serviceUnitName) throws DeploymentException;
 
-    void stop(String serviceUnitName)
-        throws DeploymentException;
+    void stop(String serviceUnitName) throws DeploymentException;
 
-    void shutDown(String serviceUnitName)
-        throws DeploymentException;
+    void shutDown(String serviceUnitName) throws DeploymentException;
 
-    String undeploy(String serviceUnitName, String serviceUnitRootPath)
-        throws DeploymentException;
+    String undeploy(String serviceUnitName, String serviceUnitRootPath) throws DeploymentException;
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/AdminServiceMBean.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/AdminServiceMBean.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/AdminServiceMBean.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/AdminServiceMBean.java Mon Jun 25 12:27:19 2007
@@ -18,8 +18,7 @@
 
 import javax.management.ObjectName;
 
-public interface AdminServiceMBean
-{
+public interface AdminServiceMBean {
     ObjectName[] getBindingComponents();
 
     ObjectName getComponentByName(String name);

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/ComponentLifeCycleMBean.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/ComponentLifeCycleMBean.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/ComponentLifeCycleMBean.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/ComponentLifeCycleMBean.java Mon Jun 25 12:27:19 2007
@@ -18,7 +18,6 @@
 
 import javax.management.ObjectName;
 
-public interface ComponentLifeCycleMBean extends LifeCycleMBean
-{
+public interface ComponentLifeCycleMBean extends LifeCycleMBean {
     ObjectName getExtensionMBeanName() throws javax.jbi.JBIException;
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/DeploymentException.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/DeploymentException.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/DeploymentException.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/DeploymentException.java Mon Jun 25 12:27:19 2007
@@ -16,20 +16,16 @@
  */
 package javax.jbi.management;
 
-public class DeploymentException extends javax.jbi.JBIException
-{
-    public DeploymentException(String aMessage)
-    {
+public class DeploymentException extends javax.jbi.JBIException {
+    public DeploymentException(String aMessage) {
         super(aMessage);
     }
 
-    public DeploymentException(String aMessage, Throwable aCause)
-    {
+    public DeploymentException(String aMessage, Throwable aCause) {
         super(aMessage, aCause);
     }
 
-    public DeploymentException(Throwable aCause)
-    {
+    public DeploymentException(Throwable aCause) {
         super(aCause);
     }
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/DeploymentServiceMBean.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/DeploymentServiceMBean.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/DeploymentServiceMBean.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/DeploymentServiceMBean.java Mon Jun 25 12:27:19 2007
@@ -16,39 +16,37 @@
  */
 package javax.jbi.management;
 
-public interface DeploymentServiceMBean
-{
-    
-    String deploy (String saZipURL) throws Exception;
-
-    String undeploy (String saName) throws Exception;
-
-    String[] getDeployedServiceUnitList (String componentName) throws Exception;
-
-    String[] getDeployedServiceAssemblies () throws Exception;
-    
-    String getServiceAssemblyDescriptor (String saName) throws Exception;
-   
-    String[] getDeployedServiceAssembliesForComponent (String componentName)
-        throws Exception;
-    
-    String[] getComponentsForDeployedServiceAssembly (String saName) throws Exception;
-    
-    boolean isDeployedServiceUnit (String componentName, String suName) throws Exception;
-    
-    boolean canDeployToComponent (String componentName);
-    
+public interface DeploymentServiceMBean {
+
+    String STARTED = "Started";
+
+    String SHUTDOWN = "Shutdown";
+
+    String STOPPED = "Stopped";
+
+    String deploy(String saZipURL) throws Exception;
+
+    String undeploy(String saName) throws Exception;
+
+    String[] getDeployedServiceUnitList(String componentName) throws Exception;
+
+    String[] getDeployedServiceAssemblies() throws Exception;
+
+    String getServiceAssemblyDescriptor(String saName) throws Exception;
+
+    String[] getDeployedServiceAssembliesForComponent(String componentName) throws Exception;
+
+    String[] getComponentsForDeployedServiceAssembly(String saName) throws Exception;
+
+    boolean isDeployedServiceUnit(String componentName, String suName) throws Exception;
+
+    boolean canDeployToComponent(String componentName);
+
     String start(String serviceAssemblyName) throws Exception;
-    
+
     String stop(String serviceAssemblyName) throws Exception;
-    
-    String shutDown(String serviceAssemblyName) throws Exception;
-    
-    String getState(String serviceAssemblyName) throws Exception;
 
-    static final String STARTED   = "Started";
-    
-    static final String SHUTDOWN = "Shutdown";
+    String shutDown(String serviceAssemblyName) throws Exception;
 
-    static final String STOPPED   = "Stopped";
+    String getState(String serviceAssemblyName) throws Exception;
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/InstallationServiceMBean.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/InstallationServiceMBean.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/InstallationServiceMBean.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/InstallationServiceMBean.java Mon Jun 25 12:27:19 2007
@@ -18,14 +18,12 @@
 
 import javax.management.ObjectName;
 
-public interface InstallationServiceMBean
-{
+public interface InstallationServiceMBean {
     ObjectName loadNewInstaller(String installJarURL);
 
     ObjectName loadInstaller(String aComponentName);
 
-    boolean
-    unloadInstaller(String aComponentName, boolean isToBeDeleted);
+    boolean unloadInstaller(String aComponentName, boolean isToBeDeleted);
 
     String installSharedLibrary(String aSharedLibURI);
 

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/InstallerMBean.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/InstallerMBean.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/InstallerMBean.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/InstallerMBean.java Mon Jun 25 12:27:19 2007
@@ -18,18 +18,14 @@
 
 import javax.management.ObjectName;
 
-public interface InstallerMBean
-{
+public interface InstallerMBean {
     String getInstallRoot();
 
-    ObjectName install()
-        throws javax.jbi.JBIException;
+    ObjectName install() throws javax.jbi.JBIException;
 
     boolean isInstalled();
 
-    void uninstall()
-        throws javax.jbi.JBIException;
+    void uninstall() throws javax.jbi.JBIException;
 
-    ObjectName getInstallerConfigurationMBean()
-        throws javax.jbi.JBIException;
+    ObjectName getInstallerConfigurationMBean() throws javax.jbi.JBIException;
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/LifeCycleMBean.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/LifeCycleMBean.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/LifeCycleMBean.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/LifeCycleMBean.java Mon Jun 25 12:27:19 2007
@@ -18,8 +18,16 @@
 
 import javax.jbi.JBIException;
 
-public interface LifeCycleMBean
-{
+public interface LifeCycleMBean {
+
+    String SHUTDOWN = "Shutdown";
+
+    String STOPPED = "Stopped";
+
+    String STARTED = "Started";
+
+    String UNKNOWN = "Unknown";
+
     void start() throws JBIException;
 
     void stop() throws JBIException;
@@ -28,11 +36,4 @@
 
     String getCurrentState();
 
-    final static String SHUTDOWN = "Shutdown";
-
-    final static String STOPPED  = "Stopped";
-
-    final static String STARTED  = "Started";
-
-    final static String UNKNOWN  = "Unknown";
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/MBeanNames.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/MBeanNames.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/MBeanNames.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/management/MBeanNames.java Mon Jun 25 12:27:19 2007
@@ -18,13 +18,13 @@
 
 import javax.management.ObjectName;
 
-public interface MBeanNames
-{
-    ObjectName createCustomComponentMBeanName(String customName);
+public interface MBeanNames {
+
+    String BOOTSTRAP_EXTENSION = "BootstrapExtension";
 
-    static final String BOOTSTRAP_EXTENSION = "BootstrapExtension";
+    String COMPONENT_LIFE_CYCLE_EXTENSION = "LifeCycleExtension";
 
-    static final String COMPONENT_LIFE_CYCLE_EXTENSION = "LifeCycleExtension";
+    ObjectName createCustomComponentMBeanName(String customName);
 
     String getJmxDomainName();
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/DeliveryChannel.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/DeliveryChannel.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/DeliveryChannel.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/DeliveryChannel.java Mon Jun 25 12:27:19 2007
@@ -20,31 +20,24 @@
 
 import javax.xml.namespace.QName;
 
-public interface DeliveryChannel
-{    
-    void close()
-        throws MessagingException;
-    
+public interface DeliveryChannel {
+    void close() throws MessagingException;
+
     MessageExchangeFactory createExchangeFactory();
-    
+
     MessageExchangeFactory createExchangeFactory(QName interfaceName);
-    
+
     MessageExchangeFactory createExchangeFactoryForService(QName serviceName);
-    
+
     MessageExchangeFactory createExchangeFactory(ServiceEndpoint endpoint);
-      
-    MessageExchange accept()
-        throws MessagingException;
-    
-    MessageExchange accept(long timeout)
-        throws MessagingException;   
-    
-    void send(MessageExchange exchange)
-        throws MessagingException;
-    
-    boolean sendSync(MessageExchange exchange)
-        throws MessagingException;
-    
-    boolean sendSync(MessageExchange exchange, long timeout)
-        throws MessagingException;    
+
+    MessageExchange accept() throws MessagingException;
+
+    MessageExchange accept(long timeout) throws MessagingException;
+
+    void send(MessageExchange exchange) throws MessagingException;
+
+    boolean sendSync(MessageExchange exchange) throws MessagingException;
+
+    boolean sendSync(MessageExchange exchange, long timeout) throws MessagingException;
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/ExchangeStatus.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/ExchangeStatus.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/ExchangeStatus.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/ExchangeStatus.java Mon Jun 25 12:27:19 2007
@@ -16,62 +16,48 @@
  */
 package javax.jbi.messaging;
 
-public final class ExchangeStatus
-{
-    
+public final class ExchangeStatus {
+
     public static final ExchangeStatus ACTIVE = new ExchangeStatus("Active");
-    
+
     public static final ExchangeStatus ERROR = new ExchangeStatus("Error");
-    
-    public static final ExchangeStatus DONE  = new ExchangeStatus("Done");
-    
+
+    public static final ExchangeStatus DONE = new ExchangeStatus("Done");
+
     private String mStatus;
-    
-    private ExchangeStatus(String status)
-    {
+
+    private ExchangeStatus(String status) {
         mStatus = status;
     }
-    
-    public String toString()
-    {
+
+    public String toString() {
         return mStatus;
     }
-    
-   
-    
-    public static ExchangeStatus valueOf(String status)
-    {
+
+    public static ExchangeStatus valueOf(String status) {
         ExchangeStatus instance;
-        
+
         //
         //  Convert symbolic name to object reference.
         //
-        if (status.equals(DONE.toString()))
-        {
+        if (status.equals(DONE.toString())) {
             instance = DONE;
-        }
-        else if (status.equals(ERROR.toString()))
-        {
+        } else if (status.equals(ERROR.toString())) {
             instance = ERROR;
-        }
-        else if (status.equals(ACTIVE.toString()))
-        {
+        } else if (status.equals(ACTIVE.toString())) {
             instance = ACTIVE;
-            
-        }
-        else
-        {
+
+        } else {
             //
             //  Someone has a problem.
             //
             throw new java.lang.IllegalArgumentException(status);
         }
-       
-        return (instance);
+
+        return instance;
     }
-    
-    public int hashCode()
-    {
+
+    public int hashCode() {
         return mStatus.hashCode();
     }
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/Fault.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/Fault.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/Fault.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/Fault.java Mon Jun 25 12:27:19 2007
@@ -16,7 +16,6 @@
  */
 package javax.jbi.messaging;
 
-public interface Fault extends NormalizedMessage
-{
-    
+public interface Fault extends NormalizedMessage {
+
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/InOnly.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/InOnly.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/InOnly.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/InOnly.java Mon Jun 25 12:27:19 2007
@@ -16,10 +16,8 @@
  */
 package javax.jbi.messaging;
 
-public interface InOnly extends MessageExchange
-{
+public interface InOnly extends MessageExchange {
     NormalizedMessage getInMessage();
-        
-    void setInMessage(NormalizedMessage msg)
-        throws MessagingException;
+
+    void setInMessage(NormalizedMessage msg) throws MessagingException;
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/InOptionalOut.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/InOptionalOut.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/InOptionalOut.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/InOptionalOut.java Mon Jun 25 12:27:19 2007
@@ -16,15 +16,12 @@
  */
 package javax.jbi.messaging;
 
-public interface InOptionalOut extends MessageExchange
-{
+public interface InOptionalOut extends MessageExchange {
     NormalizedMessage getInMessage();
-    
+
     NormalizedMessage getOutMessage();
-    
-    void setInMessage(NormalizedMessage msg)
-        throws MessagingException;
-    
-    void setOutMessage(NormalizedMessage msg)
-        throws MessagingException;
+
+    void setInMessage(NormalizedMessage msg) throws MessagingException;
+
+    void setOutMessage(NormalizedMessage msg) throws MessagingException;
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/InOut.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/InOut.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/InOut.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/InOut.java Mon Jun 25 12:27:19 2007
@@ -16,15 +16,12 @@
  */
 package javax.jbi.messaging;
 
-public interface InOut extends MessageExchange
-{   
+public interface InOut extends MessageExchange {
     NormalizedMessage getInMessage();
-    
+
     NormalizedMessage getOutMessage();
-        
-    void setInMessage(NormalizedMessage msg)
-        throws MessagingException;
-        
-    void setOutMessage(NormalizedMessage msg)
-        throws MessagingException;
+
+    void setInMessage(NormalizedMessage msg) throws MessagingException;
+
+    void setOutMessage(NormalizedMessage msg) throws MessagingException;
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/MessageExchange.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/MessageExchange.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/MessageExchange.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/MessageExchange.java Mon Jun 25 12:27:19 2007
@@ -22,73 +22,65 @@
 
 import javax.xml.namespace.QName;
 
-public interface MessageExchange
-{
+public interface MessageExchange {
     String JTA_TRANSACTION_PROPERTY_NAME = "javax.jbi.transaction.jta";
-    
+
     URI getPattern();
-    
+
     String getExchangeId();
-    
+
     ExchangeStatus getStatus();
-        
-    void setStatus(ExchangeStatus status)
-        throws MessagingException;
-        
+
+    void setStatus(ExchangeStatus status) throws MessagingException;
+
     void setError(Exception error);
-    
+
     Exception getError();
-    
+
     Fault getFault();
-        
-    void setFault(Fault fault)
-        throws MessagingException;
-    
-    NormalizedMessage createMessage()
-        throws MessagingException;
-    
-    Fault createFault()
-        throws MessagingException;
-        
+
+    void setFault(Fault fault) throws MessagingException;
+
+    NormalizedMessage createMessage() throws MessagingException;
+
+    Fault createFault() throws MessagingException;
+
     NormalizedMessage getMessage(String name);
-        
-    void setMessage(NormalizedMessage msg, String name)
-        throws MessagingException;
-    
+
+    void setMessage(NormalizedMessage msg, String name) throws MessagingException;
+
     Object getProperty(String name);
-    
+
     void setProperty(String name, Object obj);
-    
+
     void setEndpoint(ServiceEndpoint endpoint);
-    
+
     void setService(QName service);
-    
+
     void setInterfaceName(QName interfaceName);
-    
+
     void setOperation(QName name);
-    
+
     ServiceEndpoint getEndpoint();
-    
+
     QName getInterfaceName();
-    
+
     QName getService();
-    
+
     QName getOperation();
-    
+
     boolean isTransacted();
 
     Role getRole();
-        
+
     java.util.Set getPropertyNames();
 
-    public static final class Role
-    {
+    public static final class Role {
         public static final Role PROVIDER = new Role();
 
         public static final Role CONSUMER = new Role();
 
-        private Role()
-        {
+        private Role() {
         }
     }
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/MessageExchangeFactory.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/MessageExchangeFactory.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/MessageExchangeFactory.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/MessageExchangeFactory.java Mon Jun 25 12:27:19 2007
@@ -20,23 +20,16 @@
 
 import javax.xml.namespace.QName;
 
-public interface MessageExchangeFactory
-{
-    MessageExchange createExchange(QName serviceName, QName operationName)
-        throws MessagingException;
-    
-    MessageExchange createExchange(URI pattern)
-        throws MessagingException;
-        
-    InOnly createInOnlyExchange()
-        throws MessagingException;
-    
-    InOptionalOut createInOptionalOutExchange()
-        throws MessagingException;
-    
-    InOut createInOutExchange()
-        throws MessagingException;
-    
-    RobustInOnly createRobustInOnlyExchange()
-        throws MessagingException;    
+public interface MessageExchangeFactory {
+    MessageExchange createExchange(QName serviceName, QName operationName) throws MessagingException;
+
+    MessageExchange createExchange(URI pattern) throws MessagingException;
+
+    InOnly createInOnlyExchange() throws MessagingException;
+
+    InOptionalOut createInOptionalOutExchange() throws MessagingException;
+
+    InOut createInOutExchange() throws MessagingException;
+
+    RobustInOnly createRobustInOnlyExchange() throws MessagingException;
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/MessagingException.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/MessagingException.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/MessagingException.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/MessagingException.java Mon Jun 25 12:27:19 2007
@@ -16,20 +16,16 @@
  */
 package javax.jbi.messaging;
 
-public class MessagingException extends javax.jbi.JBIException
-{
-    public MessagingException(String msg)
-    {
+public class MessagingException extends javax.jbi.JBIException {
+    public MessagingException(String msg) {
         super(msg);
     }
-    
-    public MessagingException(String msg, Throwable cause)
-    {
+
+    public MessagingException(String msg, Throwable cause) {
         super(msg, cause);
     }
-    
-    public MessagingException(Throwable cause)
-    {
+
+    public MessagingException(Throwable cause) {
         super(cause);
     }
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/NormalizedMessage.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/NormalizedMessage.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/NormalizedMessage.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/NormalizedMessage.java Mon Jun 25 12:27:19 2007
@@ -22,30 +22,26 @@
 import javax.security.auth.Subject;
 import javax.xml.transform.Source;
 
-public interface NormalizedMessage
-{
-    void addAttachment(String id, DataHandler content)
-        throws MessagingException;
-    
+public interface NormalizedMessage {
+    void addAttachment(String id, DataHandler content) throws MessagingException;
+
     Source getContent();
-    
+
     DataHandler getAttachment(String id);
-    
+
     Set getAttachmentNames();
-    
-    void removeAttachment(String id)
-        throws MessagingException;
-    
-    void setContent(Source content)
-        throws MessagingException;
-    
+
+    void removeAttachment(String id) throws MessagingException;
+
+    void setContent(Source content) throws MessagingException;
+
     void setProperty(String name, Object value);
-    
+
     void setSecuritySubject(Subject subject);
-    
+
     Set getPropertyNames();
-        
+
     Object getProperty(String name);
-    
+
     Subject getSecuritySubject();
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/RobustInOnly.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/RobustInOnly.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/RobustInOnly.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/messaging/RobustInOnly.java Mon Jun 25 12:27:19 2007
@@ -16,10 +16,8 @@
  */
 package javax.jbi.messaging;
 
-public interface RobustInOnly extends MessageExchange
-{    
+public interface RobustInOnly extends MessageExchange {
     NormalizedMessage getInMessage();
-    
-    void setInMessage(NormalizedMessage msg)
-        throws MessagingException;
+
+    void setInMessage(NormalizedMessage msg) throws MessagingException;
 }

Modified: incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/servicedesc/ServiceEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/servicedesc/ServiceEndpoint.java?view=diff&rev=550580&r1=550579&r2=550580
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/servicedesc/ServiceEndpoint.java (original)
+++ incubator/servicemix/trunk/core/servicemix-jbi/src/main/java/javax/jbi/servicedesc/ServiceEndpoint.java Mon Jun 25 12:27:19 2007
@@ -18,8 +18,7 @@
 
 import javax.xml.namespace.QName;
 
-public interface ServiceEndpoint
-{
+public interface ServiceEndpoint {
     org.w3c.dom.DocumentFragment getAsReference(QName operationName);
 
     String getEndpointName();