Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyLifeCycle.java URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyLifeCycle.java?view=diff&rev=564374&r1=564373&r2=564374 ============================================================================== --- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyLifeCycle.java (original) +++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyLifeCycle.java Thu Aug 9 13:33:26 2007 @@ -36,6 +36,13 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.servicemix.jbi.container.ServiceAssemblyEnvironment; @@ -50,11 +57,6 @@ import org.apache.servicemix.jbi.management.MBeanInfoProvider; import org.apache.servicemix.jbi.management.OperationInfoHelper; import org.apache.servicemix.jbi.util.XmlPersistenceSupport; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; /** * ComponentConnector is used internally for message routing @@ -63,7 +65,7 @@ */ public class ServiceAssemblyLifeCycle implements ServiceAssemblyMBean, MBeanInfoProvider { - private static final Log log = LogFactory.getLog(ServiceAssemblyLifeCycle.class); + private static final Log LOG = LogFactory.getLog(ServiceAssemblyLifeCycle.class); private ServiceAssembly serviceAssembly; @@ -106,7 +108,7 @@ } public synchronized String start(boolean writeState) throws Exception { - log.info("Starting service assembly: " + getName()); + LOG.info("Starting service assembly: " + getName()); // Start connections try { startConnections(); @@ -156,7 +158,7 @@ } public synchronized String stop(boolean writeState, boolean forceInit) throws Exception { - log.info("Stopping service assembly: " + getName()); + LOG.info("Stopping service assembly: " + getName()); // Stop connections stopConnections(); // Stop service units @@ -202,7 +204,7 @@ } public synchronized String shutDown(boolean writeState) throws Exception { - log.info("Shutting down service assembly: " + getName()); + LOG.info("Shutting down service assembly: " + getName()); List<Element> componentFailures = new ArrayList<Element>(); for (int i = 0; i < sus.length; i++) { if (sus[i].isStarted()) { @@ -299,7 +301,7 @@ XmlPersistenceSupport.write(env.getStateFile(), props); } } catch (IOException e) { - log.error("Failed to write current running state for ServiceAssembly: " + getName(), e); + LOG.error("Failed to write current running state for ServiceAssembly: " + getName(), e); } } @@ -313,7 +315,7 @@ return props.getProperty("state", SHUTDOWN); } } catch (Exception e) { - log.error("Failed to read current running state for ServiceAssembly: " + getName(), e); + LOG.error("Failed to read current running state for ServiceAssembly: " + getName(), e); } return null; } @@ -339,8 +341,8 @@ } protected void startConnections() throws JBIException { - if (serviceAssembly.getConnections() == null || - serviceAssembly.getConnections().getConnections() == null) { + if (serviceAssembly.getConnections() == null + || serviceAssembly.getConnections().getConnections() == null) { return; } Connection[] connections = serviceAssembly.getConnections().getConnections(); @@ -378,8 +380,8 @@ } protected void stopConnections() { - if (serviceAssembly.getConnections() == null || - serviceAssembly.getConnections().getConnections() == null) { + if (serviceAssembly.getConnections() == null + || serviceAssembly.getConnections().getConnections() == null) { return; } Connection[] connections = serviceAssembly.getConnections().getConnections(); @@ -402,7 +404,7 @@ Document doc = parse(resultMsg); result = getElement(doc, "component-task-result"); } catch (Exception e) { - log.warn("Could not parse result exception", e); + LOG.warn("Could not parse result exception", e); } if (result == null) { result = ManagementSupport.createComponentFailure( @@ -457,11 +459,11 @@ return null; } - public void setPropertyChangeListener(PropertyChangeListener listener) { - this.listener = listener; + public void setPropertyChangeListener(PropertyChangeListener l) { + this.listener = l; } - protected void firePropertyChanged(String name,Object oldValue, Object newValue){ + protected void firePropertyChanged(String name, Object oldValue, Object newValue){ PropertyChangeListener l = listener; if (l != null){ PropertyChangeEvent event = new PropertyChangeEvent(this,name,oldValue,newValue);
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyMBean.java URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyMBean.java?view=diff&rev=564374&r1=564373&r2=564374 ============================================================================== --- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyMBean.java (original) +++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyMBean.java Thu Aug 9 13:33:26 2007 @@ -22,25 +22,26 @@ public interface ServiceAssemblyMBean { - public static final String STARTED = DeploymentServiceMBean.STARTED; + String STARTED = DeploymentServiceMBean.STARTED; - public static final String SHUTDOWN = DeploymentServiceMBean.SHUTDOWN; + String SHUTDOWN = DeploymentServiceMBean.SHUTDOWN; - public static final String STOPPED = DeploymentServiceMBean.STOPPED; + String STOPPED = DeploymentServiceMBean.STOPPED; - public String getName(); + String getName(); - public String getDescription(); + String getDescription(); - public String getCurrentState(); + String getCurrentState(); - public String getDescriptor(); + String getDescriptor(); - public ObjectName[] getServiceUnits(); + ObjectName[] getServiceUnits(); - public String start() throws Exception; + String start() throws Exception; - public String stop() throws Exception; + String stop() throws Exception; + + String shutDown() throws Exception; - public String shutDown() throws Exception; } Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyRegistry.java URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyRegistry.java?view=diff&rev=564374&r1=564373&r2=564374 ============================================================================== --- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyRegistry.java (original) +++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyRegistry.java Thu Aug 9 13:33:26 2007 @@ -41,9 +41,11 @@ * @version $Revision$ */ public class ServiceAssemblyRegistry { - - private static final Log log = LogFactory.getLog(ServiceAssemblyRegistry.class); + + private static final Log LOG = LogFactory.getLog(ServiceAssemblyRegistry.class); + private Map<String, ServiceAssemblyLifeCycle> serviceAssemblies = new ConcurrentHashMap<String, ServiceAssemblyLifeCycle>(); + private Registry registry; /** @@ -59,22 +61,21 @@ */ public void start() { } - + /** * Stop service assembilies */ - public void stop(){ + public void stop() { } - + /** * shutDown the service */ - public void shutDown(){ + public void shutDown() { } - public ServiceAssemblyLifeCycle register(ServiceAssembly sa, - String[] suKeys, - ServiceAssemblyEnvironment env) throws DeploymentException { + public ServiceAssemblyLifeCycle register(ServiceAssembly sa, String[] suKeys, ServiceAssemblyEnvironment env) + throws DeploymentException { String saName = sa.getIdentification().getName(); if (!serviceAssemblies.containsKey(saName)) { ServiceAssemblyLifeCycle salc = new ServiceAssemblyLifeCycle(sa, env, registry); @@ -88,30 +89,26 @@ ObjectName objectName = registry.getContainer().getManagementContext().createObjectName(salc); registry.getContainer().getManagementContext().registerMBean(objectName, salc, ServiceAssemblyMBean.class); } catch (JMException e) { - log.error("Could not register MBean for service assembly", e); + LOG.error("Could not register MBean for service assembly", e); } return salc; } return null; } - + public ServiceAssemblyLifeCycle register(ServiceAssembly sa, ServiceAssemblyEnvironment env) throws DeploymentException { List<String> sus = new ArrayList<String>(); if (sa.getServiceUnits() != null) { for (int i = 0; i < sa.getServiceUnits().length; i++) { - String suKey = registry.registerServiceUnit( - sa.getServiceUnits()[i], - sa.getIdentification().getName(), - env.getServiceUnitDirectory(sa.getServiceUnits()[i].getTarget().getComponentName(), - sa.getServiceUnits()[i].getIdentification().getName())); + String suKey = registry.registerServiceUnit(sa.getServiceUnits()[i], sa.getIdentification().getName(), env + .getServiceUnitDirectory(sa.getServiceUnits()[i].getTarget().getComponentName(), sa.getServiceUnits()[i] + .getIdentification().getName())); sus.add(suKey); } } - return register(sa, - sus.toArray(new String[sus.size()]), - env); + return register(sa, sus.toArray(new String[sus.size()]), env); } - + /** * unregister a service assembly * @param name @@ -129,14 +126,14 @@ } registry.getContainer().getManagementContext().unregisterMBean(salc); } catch (JBIException e) { - log.error("Unable to unregister MBean for service assembly", e); + LOG.error("Unable to unregister MBean for service assembly", e); } return true; } else { return false; } } - + /** * Get a named ServiceAssembly * @param name @@ -145,99 +142,98 @@ public ServiceAssemblyLifeCycle getServiceAssembly(String saName) { return serviceAssemblies.get(saName); } - - /** - * Returns a list of Service Assemblies deployed to the JBI enviroment. - * - * @return list of Service Assembly Name's. - */ - public String[] getDeployedServiceAssemblies() { - String[] result = null; - Set<String> keys = serviceAssemblies.keySet(); - result = new String[keys.size()]; - keys.toArray(result); - return result; - } - - /** - * Returns a list of Service Assemblies that contain SUs for the given component. - * - * @param componentName name of the component. - * @return list of Service Assembly names. - */ - public String[] getDeployedServiceAssembliesForComponent(String componentName) { - String[] result = null; - // iterate through the service assembilies - Set<String> tmpList = new HashSet<String>(); - for (ServiceAssemblyLifeCycle salc : serviceAssemblies.values()) { - ServiceUnit[] sus = salc.getServiceAssembly().getServiceUnits(); - if (sus != null) { - for (int i = 0;i < sus.length;i++) { - if (sus[i].getTarget().getComponentName().equals(componentName)) { - tmpList.add(salc.getServiceAssembly().getIdentification().getName()); - } - } - } - } - result = new String[tmpList.size()]; - tmpList.toArray(result); - return result; - } - - /** - * Returns a list of components(to which SUs are targeted for) in a Service Assembly. - * - * @param saName name of the service assembly. - * @return list of component names. - */ - public String[] getComponentsForDeployedServiceAssembly(String saName) { - String[] result = null; - Set<String> tmpList = new HashSet<String>(); - ServiceAssemblyLifeCycle sa = getServiceAssembly(saName); - if (sa != null) { - ServiceUnit[] sus = sa.getServiceAssembly().getServiceUnits(); - if (sus != null) { - for (int i = 0;i < sus.length;i++) { - tmpList.add(sus[i].getTarget().getComponentName()); - } - } - } - result = new String[tmpList.size()]; - tmpList.toArray(result); - return result; - } - - /** - * Returns a boolean value indicating whether the SU is currently deployed. - * - * @param componentName - name of component. - * @param suName - name of the Service Unit. - * @return boolean value indicating whether the SU is currently deployed. - */ - public boolean isDeployedServiceUnit(String componentName, String suName) { - boolean result = false; - for (ServiceAssemblyLifeCycle salc : serviceAssemblies.values()) { - ServiceUnit[] sus = salc.getServiceAssembly().getServiceUnits(); - if (sus != null) { - for (int i = 0;i < sus.length;i++) { - if (sus[i].getTarget().getComponentName().equals(componentName) - && sus[i].getIdentification().getName().equals(suName)) { - result = true; - break; - } - } - } - } - return result; - } - - /** - * Returns a list of service assemblies. - * - * @return list of service assemblies - */ - public Collection<ServiceAssemblyLifeCycle> getServiceAssemblies() { - return serviceAssemblies.values(); - } - + + /** + * Returns a list of Service Assemblies deployed to the JBI enviroment. + * + * @return list of Service Assembly Name's. + */ + public String[] getDeployedServiceAssemblies() { + String[] result = null; + Set<String> keys = serviceAssemblies.keySet(); + result = new String[keys.size()]; + keys.toArray(result); + return result; + } + + /** + * Returns a list of Service Assemblies that contain SUs for the given component. + * + * @param componentName name of the component. + * @return list of Service Assembly names. + */ + public String[] getDeployedServiceAssembliesForComponent(String componentName) { + String[] result = null; + // iterate through the service assembilies + Set<String> tmpList = new HashSet<String>(); + for (ServiceAssemblyLifeCycle salc : serviceAssemblies.values()) { + ServiceUnit[] sus = salc.getServiceAssembly().getServiceUnits(); + if (sus != null) { + for (int i = 0; i < sus.length; i++) { + if (sus[i].getTarget().getComponentName().equals(componentName)) { + tmpList.add(salc.getServiceAssembly().getIdentification().getName()); + } + } + } + } + result = new String[tmpList.size()]; + tmpList.toArray(result); + return result; + } + + /** + * Returns a list of components(to which SUs are targeted for) in a Service Assembly. + * + * @param saName name of the service assembly. + * @return list of component names. + */ + public String[] getComponentsForDeployedServiceAssembly(String saName) { + String[] result = null; + Set<String> tmpList = new HashSet<String>(); + ServiceAssemblyLifeCycle sa = getServiceAssembly(saName); + if (sa != null) { + ServiceUnit[] sus = sa.getServiceAssembly().getServiceUnits(); + if (sus != null) { + for (int i = 0; i < sus.length; i++) { + tmpList.add(sus[i].getTarget().getComponentName()); + } + } + } + result = new String[tmpList.size()]; + tmpList.toArray(result); + return result; + } + + /** + * Returns a boolean value indicating whether the SU is currently deployed. + * + * @param componentName - name of component. + * @param suName - name of the Service Unit. + * @return boolean value indicating whether the SU is currently deployed. + */ + public boolean isDeployedServiceUnit(String componentName, String suName) { + boolean result = false; + for (ServiceAssemblyLifeCycle salc : serviceAssemblies.values()) { + ServiceUnit[] sus = salc.getServiceAssembly().getServiceUnits(); + if (sus != null) { + for (int i = 0; i < sus.length; i++) { + if (sus[i].getTarget().getComponentName().equals(componentName) && sus[i].getIdentification().getName().equals(suName)) { + result = true; + break; + } + } + } + } + return result; + } + + /** + * Returns a list of service assemblies. + * + * @return list of service assemblies + */ + public Collection<ServiceAssemblyLifeCycle> getServiceAssemblies() { + return serviceAssemblies.values(); + } + } Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceUnitLifeCycle.java URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceUnitLifeCycle.java?view=diff&rev=564374&r1=564373&r2=564374 ============================================================================== --- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceUnitLifeCycle.java (original) +++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceUnitLifeCycle.java Thu Aug 9 13:33:26 2007 @@ -40,7 +40,7 @@ public class ServiceUnitLifeCycle implements ServiceUnitMBean, MBeanInfoProvider { - private static final Log log = LogFactory.getLog(ServiceUnitLifeCycle.class); + private static final Log LOG = LogFactory.getLog(ServiceUnitLifeCycle.class); private ServiceUnit serviceUnit; @@ -75,7 +75,7 @@ * @throws DeploymentException */ public void init() throws DeploymentException { - log.info("Initializing service unit: " + getName()); + LOG.info("Initializing service unit: " + getName()); checkComponentStarted("init"); ServiceUnitManager sum = getServiceUnitManager(); File path = getServiceUnitRootPath(); @@ -94,7 +94,7 @@ * @throws DeploymentException */ public void start() throws DeploymentException { - log.info("Starting service unit: " + getName()); + LOG.info("Starting service unit: " + getName()); checkComponentStarted("start"); ServiceUnitManager sum = getServiceUnitManager(); ClassLoader cl = Thread.currentThread().getContextClassLoader(); @@ -112,7 +112,7 @@ * @throws DeploymentException */ public void stop() throws DeploymentException { - log.info("Stopping service unit: " + getName()); + LOG.info("Stopping service unit: " + getName()); checkComponentStarted("stop"); ServiceUnitManager sum = getServiceUnitManager(); ClassLoader cl = Thread.currentThread().getContextClassLoader(); @@ -131,7 +131,7 @@ * @throws DeploymentException */ public void shutDown() throws DeploymentException { - log.info("Shutting down service unit: " + getName()); + LOG.info("Shutting down service unit: " + getName()); checkComponentStartedOrStopped("shutDown"); ServiceUnitManager sum = getServiceUnitManager(); ClassLoader cl = Thread.currentThread().getContextClassLoader(); Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceUnitMBean.java URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceUnitMBean.java?view=diff&rev=564374&r1=564373&r2=564374 ============================================================================== --- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceUnitMBean.java (original) +++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceUnitMBean.java Thu Aug 9 13:33:26 2007 @@ -20,21 +20,21 @@ public interface ServiceUnitMBean { - public String getName(); + String getName(); - public String getDescription(); + String getDescription(); - public String getComponentName(); + String getComponentName(); - public String getCurrentState(); + String getCurrentState(); - public String getServiceAssembly(); + String getServiceAssembly(); - public String getDescriptor(); + String getDescriptor(); - public static final String STARTED = DeploymentServiceMBean.STARTED; + String STARTED = DeploymentServiceMBean.STARTED; - public static final String SHUTDOWN = DeploymentServiceMBean.SHUTDOWN; + String SHUTDOWN = DeploymentServiceMBean.SHUTDOWN; - public static final String STOPPED = DeploymentServiceMBean.STOPPED; + String STOPPED = DeploymentServiceMBean.STOPPED; } Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/BytesSource.java URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/BytesSource.java?view=diff&rev=564374&r1=564373&r2=564374 ============================================================================== --- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/BytesSource.java (original) +++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/BytesSource.java Thu Aug 9 13:33:26 2007 @@ -16,13 +16,13 @@ */ package org.apache.servicemix.jbi.jaxp; -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; - import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; + +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamSource; /** * A helper class which provides a JAXP [EMAIL PROTECTED] Source} from a byte[] Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/ResourceSource.java URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/ResourceSource.java?view=diff&rev=564374&r1=564373&r2=564374 ============================================================================== --- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/ResourceSource.java (original) +++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/ResourceSource.java Thu Aug 9 13:33:26 2007 @@ -16,14 +16,14 @@ */ package org.apache.servicemix.jbi.jaxp; -import org.springframework.core.io.Resource; - -import javax.xml.transform.stream.StreamSource; - import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; + +import javax.xml.transform.stream.StreamSource; + +import org.springframework.core.io.Resource; /** * A JAXP [EMAIL PROTECTED] StreamSource} which uses a Spring [EMAIL PROTECTED] Resource} as the source of the input stream. Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/SourceMarshaler.java URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/SourceMarshaler.java?view=diff&rev=564374&r1=564373&r2=564374 ============================================================================== --- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/SourceMarshaler.java (original) +++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/SourceMarshaler.java Thu Aug 9 13:33:26 2007 @@ -16,16 +16,17 @@ */ package org.apache.servicemix.jbi.jaxp; +import java.io.StringWriter; + import javax.xml.transform.Source; import javax.xml.transform.TransformerException; import javax.xml.transform.stream.StreamResult; -import java.io.StringWriter; - /** * @version $Revision$ */ public class SourceMarshaler { + private SourceTransformer transformer = new SourceTransformer(); public Source asSource(String text) { Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/SourceTransformer.java URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/SourceTransformer.java?view=diff&rev=564374&r1=564373&r2=564374 ============================================================================== --- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/SourceTransformer.java (original) +++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/SourceTransformer.java Thu Aug 9 13:33:26 2007 @@ -45,6 +45,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; + import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/StAXSourceTransformer.java URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/StAXSourceTransformer.java?view=diff&rev=564374&r1=564373&r2=564374 ============================================================================== --- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/StAXSourceTransformer.java (original) +++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/StAXSourceTransformer.java Thu Aug 9 13:33:26 2007 @@ -16,10 +16,7 @@ */ package org.apache.servicemix.jbi.jaxp; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.xml.sax.SAXException; +import java.io.IOException; import javax.xml.parsers.ParserConfigurationException; import javax.xml.stream.XMLInputFactory; @@ -33,7 +30,11 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXSource; -import java.io.IOException; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +import org.xml.sax.SAXException; /** * An enhanced [EMAIL PROTECTED] org.apache.servicemix.jbi.jaxp.SourceTransformer} which adds support for converting from and to Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jmx/ConnectorServerFactoryBean.java URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jmx/ConnectorServerFactoryBean.java?view=diff&rev=564374&r1=564373&r2=564374 ============================================================================== --- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jmx/ConnectorServerFactoryBean.java (original) +++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jmx/ConnectorServerFactoryBean.java Thu Aug 9 13:33:26 2007 @@ -21,7 +21,6 @@ import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import javax.xml.namespace.QName; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java?view=diff&rev=564374&r1=564373&r2=564374 ============================================================================== --- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java (original) +++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java Thu Aug 9 13:33:26 2007 @@ -16,14 +16,16 @@ */ package org.apache.servicemix.jbi.messaging; -import org.apache.servicemix.client.Message; -import org.apache.servicemix.jbi.RuntimeJBIException; -import org.apache.servicemix.jbi.jaxp.BytesSource; -import org.apache.servicemix.jbi.jaxp.ResourceSource; -import org.apache.servicemix.jbi.jaxp.SourceTransformer; -import org.apache.servicemix.jbi.jaxp.StringSource; -import org.apache.servicemix.jbi.util.ByteArrayDataSource; -import org.apache.servicemix.jbi.util.FileUtil; +import java.io.ByteArrayOutputStream; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; import javax.activation.DataHandler; import javax.activation.DataSource; @@ -36,8 +38,15 @@ import javax.xml.transform.TransformerException; import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stream.StreamSource; -import java.io.*; -import java.util.*; + +import org.apache.servicemix.client.Message; +import org.apache.servicemix.jbi.RuntimeJBIException; +import org.apache.servicemix.jbi.jaxp.BytesSource; +import org.apache.servicemix.jbi.jaxp.ResourceSource; +import org.apache.servicemix.jbi.jaxp.SourceTransformer; +import org.apache.servicemix.jbi.jaxp.StringSource; +import org.apache.servicemix.jbi.util.ByteArrayDataSource; +import org.apache.servicemix.jbi.util.FileUtil; /** * Represents a JBI NormalizedMessage. Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageCopier.java URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageCopier.java?view=diff&rev=564374&r1=564373&r2=564374 ============================================================================== --- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageCopier.java (original) +++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageCopier.java Thu Aug 9 13:33:26 2007 @@ -26,9 +26,6 @@ import org.apache.servicemix.jbi.jaxp.SourceTransformer; import org.apache.servicemix.jbi.jaxp.StringSource; -import org.apache.servicemix.jbi.util.ByteArrayDataSource; -import org.apache.servicemix.jbi.util.FileUtil; -import org.apache.servicemix.jbi.util.MessageUtil; /** * A thread-safe copier for NormalizedMessage onjects. Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageUtil.java URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageUtil.java?view=diff&rev=564374&r1=564373&r2=564374 ============================================================================== --- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageUtil.java (original) +++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageUtil.java Thu Aug 9 13:33:26 2007 @@ -36,11 +36,10 @@ import javax.xml.transform.TransformerException; import javax.xml.transform.stream.StreamSource; +import org.xml.sax.SAXException; + import org.apache.servicemix.jbi.jaxp.SourceTransformer; import org.apache.servicemix.jbi.jaxp.StringSource; -import org.apache.servicemix.jbi.util.ByteArrayDataSource; -import org.apache.servicemix.jbi.util.FileUtil; -import org.xml.sax.SAXException; /** * @author gnodet
