openbus-cvs-commits — CVS commits for OpenBus

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/examples/inout ConsumerEngineDefinition.wsdl,1.1,1.2 SoapBinding.java,1.3,1.4 ConsumerEngine.java,1.3,1.4

[Diego E. <er...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/examples/inout
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10508/src/test/org/openbus/jbi/messaging/examples/inout

Modified Files:
	ConsumerEngineDefinition.wsdl SoapBinding.java 
	ConsumerEngine.java 
Log Message:
fixed log.error

Index: SoapBinding.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/examples/inout/SoapBinding.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SoapBinding.java	19 Jul 2005 03:06:55 -0000	1.3
--- SoapBinding.java	28 Jul 2005 04:00:00 -0000	1.4
***************
*** 85,91 ****
  				sb.succeed = true;
  			} catch (MessagingException e) {
! 				log.error(e);
  			} catch (InterruptedException e) {
! 				log.error(e);
  			} finally {
  				sb.finished = true;
--- 85,91 ----
  				sb.succeed = true;
  			} catch (MessagingException e) {
! 				log.error("", e);
  			} catch (InterruptedException e) {
! 				log.error("", e);
  			} finally {
  				sb.finished = true;

Index: ConsumerEngine.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/examples/inout/ConsumerEngine.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ConsumerEngine.java	17 Jul 2005 21:19:28 -0000	1.3
--- ConsumerEngine.java	28 Jul 2005 04:00:00 -0000	1.4
***************
*** 72,76 ****
  			succeed = true;
  		} catch (InterruptedException e) {
! 			log.error(e);
  		} finally {
  			finished = true;
--- 72,76 ----
  			succeed = true;
  		} catch (InterruptedException e) {
! 			log.warn(e);
  		} finally {
  			finished = true;
***************
*** 137,143 ****
  				parser.parse(new InputSource(is));
  			} catch (SAXException e) {
! 				log.error(e);
  			} catch (IOException e) {
! 				log.error(e);
  			}
  			result = parser.getDocument();
--- 137,143 ----
  				parser.parse(new InputSource(is));
  			} catch (SAXException e) {
! 				log.error("", e);
  			} catch (IOException e) {
! 				log.error("", e);
  			}
  			result = parser.getDocument();

Index: ConsumerEngineDefinition.wsdl
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/examples/inout/ConsumerEngineDefinition.wsdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConsumerEngineDefinition.wsdl	17 Jul 2005 21:19:28 -0000	1.1
--- ConsumerEngineDefinition.wsdl	28 Jul 2005 04:00:00 -0000	1.2
***************
*** 1,45 ****
  <?xml version="1.0"?>
! 	<definitions name="service1"
! 	targetNamespace="http://abc.com/services"
  	xmlns:tns="http://abc.com/services"
  	xmlns="http://schemas.xmlsoap.org/wsdl/"
  	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
! 	
  	<message name="getQuoteInput">
! 		<part name="symbol" type="xsd:string"/>
  	</message>
  	<message name="getQuoteOutput">
! 		<part name="quote" type="xsd:float"/>
  	</message>
! 	
  	<portType name="GetQuote">
  		<operation name="updateStatus">
! 			<input message="tns:getQuoteInput"/>
! 			<output message="tns:getQuoteOutput"/>
  		</operation>
  	</portType>
! 	
! 	<binding name="GetQuoteConsumerEngine" type="tns:GetQuote">
! 		<soap:binding style="rpc"
! 			transport="http://schemas.xmlsoap.org/soap/http"/>
! 		<operation name="updateStatus">
! 			<soap:operation soapAction=""/>
! 			<input>
! 				<soap:body use="encoded"
! 					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
! 					namespace="urn:xmltoday-delayed-quotes"/>
! 			</input>
! 			<output>
! 				<soap:body use="encoded"
! 					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
! 					namespace="urn:xmltoday-delayed-quotes"/>
! 			</output>
  		</operation>
  	</binding>
! 	
  	<service name="service2">
! 		<port name="StockQuotePort" binding="tns:GetQuoteConsumerEngine">
! 			<soap:address location="http://www.fremantle.org/soap/servlet/rpcrouter"/>
  		</port>
  	</service>
--- 1,33 ----
  <?xml version="1.0"?>
! <definitions name="service1" targetNamespace="http://abc.com/services"
  	xmlns:tns="http://abc.com/services"
  	xmlns="http://schemas.xmlsoap.org/wsdl/"
  	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
! 
  	<message name="getQuoteInput">
! 		<part name="symbol" type="xsd:string" />
  	</message>
  	<message name="getQuoteOutput">
! 		<part name="quote" type="xsd:float" />
  	</message>
! 
  	<portType name="GetQuote">
  		<operation name="updateStatus">
! 			<input message="tns:getQuoteInput" />
! 			<output message="tns:getQuoteOutput" />
  		</operation>
  	</portType>
! 
! 	<binding name="GetQuoteConsumerEngine" type="tns:GetQuote">

				<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/><operation name="updateStatus">

						<soap:operation soapAction="http://abc.com/services/updateStatus"/><input>

							<soap:body use="encoded" namespace="http://abc.com/services" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></input>
! 			<output>

							<soap:body use="encoded" namespace="http://abc.com/services" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></output>
  		</operation>
  	</binding>
! 
  	<service name="service2">
! 		<port name="StockQuotePort"
! 			binding="tns:GetQuoteConsumerEngine">
! 			<soap:address
! 				location="http://www.fremantle.org/soap/servlet/rpcrouter" />
  		</port>
  	</service>

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/examples/inonly SoapBindingDefinition.wsdl,1.1,1.2 SoapBinding.java,1.7,1.8

[Diego E. <er...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/examples/inonly
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10508/src/test/org/openbus/jbi/messaging/examples/inonly

Modified Files:
	SoapBindingDefinition.wsdl SoapBinding.java 
Log Message:
fixed log.error

Index: SoapBinding.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/examples/inonly/SoapBinding.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SoapBinding.java	17 Jul 2005 21:19:28 -0000	1.7
--- SoapBinding.java	28 Jul 2005 04:00:00 -0000	1.8
***************
*** 90,96 ****
  					succeed = true;
  				} catch (MessagingException e) {
! 					log.error(e);
  				} catch (InterruptedException e) {
! 					log.error(e);
  				} finally {
  					finished = true;
--- 90,96 ----
  					succeed = true;
  				} catch (MessagingException e) {
! 					log.error("", e);
  				} catch (InterruptedException e) {
! 					log.error("", e);
  				} finally {
  					finished = true;
***************
*** 177,183 ****
  				parser.parse(new InputSource(is));
  			} catch (SAXException e) {
! 				log.error(e);
  			} catch (IOException e) {
! 				log.error(e);
  			}
  			result = parser.getDocument();
--- 177,183 ----
  				parser.parse(new InputSource(is));
  			} catch (SAXException e) {
! 				log.error("", e);
  			} catch (IOException e) {
! 				log.error("", e);
  			}
  			result = parser.getDocument();

Index: SoapBindingDefinition.wsdl
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/examples/inonly/SoapBindingDefinition.wsdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SoapBindingDefinition.wsdl	17 Jul 2005 21:19:28 -0000	1.1
--- SoapBindingDefinition.wsdl	28 Jul 2005 04:00:00 -0000	1.2
***************
*** 1,45 ****
  <?xml version="1.0"?>
! 	<definitions name="service1"
! 	targetNamespace="http://abc.com/services"
  	xmlns:tns="http://abc.com/services"
  	xmlns="http://schemas.xmlsoap.org/wsdl/"
  	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
! 	
  	<message name="getQuoteInput">
! 		<part name="symbol" type="xsd:string"/>
  	</message>
  	<message name="getQuoteOutput">
! 		<part name="quote" type="xsd:float"/>
  	</message>
! 	
  	<portType name="GetQuote">
  		<operation name="updateStatus">
! 			<input message="tns:getQuoteInput"/>
! 			<output message="tns:getQuoteOutput"/>
  		</operation>
  	</portType>
! 	
! 	<binding name="GetQuoteSoapBinding" type="tns:GetQuote">
! 		<soap:binding style="rpc"
! 			transport="http://schemas.xmlsoap.org/soap/http"/>
! 		<operation name="updateStatus">
! 			<soap:operation soapAction=""/>
! 			<input>
! 				<soap:body use="encoded"
! 					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
! 					namespace="urn:xmltoday-delayed-quotes"/>
! 			</input>
! 			<output>
! 				<soap:body use="encoded"
! 					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
! 					namespace="urn:xmltoday-delayed-quotes"/>
! 			</output>
  		</operation>
  	</binding>
! 	
  	<service name="service1">
  		<port name="StockQuotePort" binding="tns:GetQuoteSoapBinding">
! 			<soap:address location="http://www.fremantle.org/soap/servlet/rpcrouter"/>
  		</port>
  	</service>
--- 1,40 ----
  <?xml version="1.0"?>
! <definitions name="service1" targetNamespace="http://abc.com/services"
  	xmlns:tns="http://abc.com/services"
  	xmlns="http://schemas.xmlsoap.org/wsdl/"
  	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
! 
  	<message name="getQuoteInput">
! 		<part name="symbol" type="xsd:string" />
  	</message>
  	<message name="getQuoteOutput">
! 		<part name="quote" type="xsd:float" />
  	</message>
! 
  	<portType name="GetQuote">
  		<operation name="updateStatus">
! 			<input message="tns:getQuoteInput" />
! 			<output message="tns:getQuoteOutput" />
  		</operation>
  	</portType>
! 
! 	<binding name="GetQuoteSoapBinding" type="tns:GetQuote">
!         <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
!         <operation name="updateStatus">
!             <soap:operation soapAction="http://abc.com/services/updateStatus"/>
!             <input>
!                 <soap:body use="encoded" namespace="http://abc.com/services" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
!             </input>
! 			<output>
!                 <soap:body use="encoded" namespace="http://abc.com/services" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
!             </output>
  		</operation>
  	</binding>
! 
  	<service name="service1">
  		<port name="StockQuotePort" binding="tns:GetQuoteSoapBinding">
! 			<soap:address
! 				location="http://www.fremantle.org/soap/servlet/rpcrouter" />
  		</port>
  	</service>

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/java/org/openbus/jbi/messaging DeliveryChannelImpl.java,1.14,1.15

[Diego E. <er...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/messaging
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10508/src/java/org/openbus/jbi/messaging

Modified Files:
	DeliveryChannelImpl.java 
Log Message:
fixed log.error

Index: DeliveryChannelImpl.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/messaging/DeliveryChannelImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** DeliveryChannelImpl.java	19 Jul 2005 03:07:14 -0000	1.14
--- DeliveryChannelImpl.java	28 Jul 2005 04:00:00 -0000	1.15
***************
*** 254,258 ****
  		} catch (JMSException e) {
  			// TODO i18n
! 			log.error(e);
  			throw new MessagingException(new OpenbusException(
  					"error while sending the message", e));
--- 254,258 ----
  		} catch (JMSException e) {
  			// TODO i18n
! 			log.error("", e);
  			throw new MessagingException(new OpenbusException(
  					"error while sending the message", e));

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/java/org/openbus/jbi/framework ComponentRuntimeInfo.java,NONE,1.1 SharedLibraryInfo.java,NONE,1.1 JBIRegistry.java,1.3,1.4 JBIRepository.java,1.4,1.5 ComponentConfig.java,1.1,NONE SharedLibrary.java,1.2,NONE

[Esteban S. <es...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/framework
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23990/src/java/org/openbus/jbi/framework

Modified Files:
	JBIRegistry.java JBIRepository.java 
Added Files:
	ComponentRuntimeInfo.java SharedLibraryInfo.java 
Removed Files:
	ComponentConfig.java SharedLibrary.java 
Log Message:
Adding more installation code

--- SharedLibrary.java DELETED ---

Index: JBIRegistry.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/framework/JBIRegistry.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JBIRegistry.java	14 Jul 2005 23:10:58 -0000	1.3
--- JBIRegistry.java	27 Jul 2005 00:22:49 -0000	1.4
***************
*** 32,36 ****
       * @return The shared library or null if it doesn't exist
       */
!     SharedLibrary getSharedLibrary(String libraryName_);
  
      /**
--- 32,36 ----
       * @return The shared library or null if it doesn't exist
       */
!     SharedLibraryInfo getSharedLibrary(String libraryName_);
  
      /**
***************
*** 40,44 ****
       * @return The shared library or null if it doesn't exist
       */
!     SharedLibrary getSharedLibrary(String libraryName_, String version_);
  
      /**
--- 40,44 ----
       * @return The shared library or null if it doesn't exist
       */
!     SharedLibraryInfo getSharedLibrary(String libraryName_, String version_);
  
      /**
***************
*** 52,56 ****
      boolean isSharedLibraryInstalled(String libraryName_, String version_);
  
!     void addSharedLibrary(SharedLibrary library_) throws FrameworkException;
  
      void removeSharedLibrary(String libraryName_, String version_)
--- 52,56 ----
      boolean isSharedLibraryInstalled(String libraryName_, String version_);
  
!     void addSharedLibrary(SharedLibraryInfo library_) throws FrameworkException;
  
      void removeSharedLibrary(String libraryName_, String version_)
***************
*** 61,65 ****
      boolean isComponentInstalled(String componentName_);
  
!     ComponentConfig getComponentConfig(String componentName_);
  
      /**
--- 61,65 ----
      boolean isComponentInstalled(String componentName_);
  
!     ComponentRuntimeInfo getComponentRuntimeInfo(String componentName_);
  
      /**
***************
*** 67,77 ****
       * @return An inmutable collection with all the installed components
       */
!     Collection getComponents();
  
!     void addComponent(ComponentConfig component_) throws FrameworkException;
  
      void removeComponent(String componentName_) throws FrameworkException;
      
!     Component getComponent(String component);
      
  }
\ No newline at end of file
--- 67,78 ----
       * @return An inmutable collection with all the installed components
       */
!     Collection getInstalledComponents();
  
!     Component addComponent(ComponentRuntimeInfo componentInfo_) throws FrameworkException;
  
      void removeComponent(String componentName_) throws FrameworkException;
      
!     Component getComponent(String component) throws FrameworkException;
      
+     void recoverComponents() throws FrameworkException;
  }
\ No newline at end of file

Index: JBIRepository.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/framework/JBIRepository.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JBIRepository.java	14 Jul 2005 23:10:58 -0000	1.4
--- JBIRepository.java	27 Jul 2005 00:22:49 -0000	1.5
***************
*** 28,44 ****
      void removeRegistry() throws FrameworkException;
  
!     String storeComponent(ComponentConfig component_, String zipFile_)
              throws FrameworkException;
  
!     void removeComponent(ComponentConfig component_) throws FrameworkException;
  
!     boolean isComponentStored(ComponentConfig component_) throws FrameworkException;
  
!     String storeSharedLibrary(SharedLibrary library_, String zipFile_)
              throws FrameworkException;
  
!     void removeSharedLibrary(SharedLibrary library_) throws FrameworkException;
  
!     boolean isSharedLibraryStored(SharedLibrary library_)
              throws FrameworkException;
  }
\ No newline at end of file
--- 28,44 ----
      void removeRegistry() throws FrameworkException;
  
!     String storeComponent(ComponentRuntimeInfo component_, String zipFile_)
              throws FrameworkException;
  
!     void removeComponent(ComponentRuntimeInfo component_) throws FrameworkException;
  
!     boolean isComponentStored(ComponentRuntimeInfo component_) throws FrameworkException;
  
!     String storeSharedLibrary(SharedLibraryInfo library_, String zipFile_)
              throws FrameworkException;
  
!     void removeSharedLibrary(SharedLibraryInfo library_) throws FrameworkException;
  
!     boolean isSharedLibraryStored(SharedLibraryInfo library_)
              throws FrameworkException;
  }
\ No newline at end of file

--- NEW FILE: SharedLibraryInfo.java ---
/*
 * Copyright 2001-2005 The Apache Software Foundation.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 *      http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.openbus.jbi.framework;

import java.io.Serializable;

import org.openbus.jbi.descriptor.SharedLibraryDesc;

/**
 * 
 * 
 * @author <a href="mailto:es...@op...">Esteban Sancho </a>
 */
public class SharedLibraryInfo implements Serializable {
    public static final String STATUS_NEW = "new";
    public static final String STATUS_INSTALLED = "installed";
    private static final String DEFAULT_LIB_VERSION = "default";

    SharedLibraryDesc descriptor;
    private String installRoot;
    private String status;

    public SharedLibraryInfo(SharedLibraryDesc descriptor_) {
        setDescriptor(descriptor_);
        status = STATUS_NEW;
    }

    public String getStatus() {
        return status;
    }

    public void setStatus(String status_) {
        if (!status_.equals(STATUS_NEW) || !status_.equals(STATUS_INSTALLED)) {
            // @todo i18n
            throw new IllegalArgumentException(
                    "Parameter status_ can only be SharedLibrary.STATUS_NEW "
                            + "or SharedLibrary.STATUS_INSTALLED");
        }
        status = status_;
    }

    public String getUniqueName() {
        return getDescriptor().getIdentification().getName();
    }

    public String getVersion() {
        String version = getDescriptor().getVersion(); 
        return (version != null) ? version : DEFAULT_LIB_VERSION;
    }

    public String getInstallRoot() {
        return installRoot;
    }

    public void setInstallRoot(String installRoot_) {
        installRoot = installRoot_;
    }

    public boolean equals(Object obj_) {
        boolean equals = false;
        if (obj_ instanceof SharedLibraryInfo) {
            SharedLibraryInfo theOther = (SharedLibraryInfo) obj_;
            equals = getUniqueName().equals(theOther.getUniqueName())
                    && getVersion().equals(theOther.getVersion());
        }
        return equals;
    }

    public int hashCode() {
        return 13 + getUniqueName().hashCode() + getVersion().hashCode();
    }
    
    public SharedLibraryDesc getDescriptor() {
        return descriptor;
    }
    
    public void setDescriptor(SharedLibraryDesc descriptor_) {
        descriptor = descriptor_;
    }
}
--- NEW FILE: ComponentRuntimeInfo.java ---
/*
 * Copyright 2001-2005 The Apache Software Foundation.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 *      http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.openbus.jbi.framework;

import java.io.Serializable;
import java.util.Collection;

import org.openbus.jbi.descriptor.ComponentDesc;

/**
 * 
 * 
 * @author <a href="mailto:es...@op...">Esteban Sancho </a>
 */
public class ComponentRuntimeInfo implements Serializable {

	private ComponentDesc descriptor;

	private String installRoot;
	
	

	public ComponentRuntimeInfo(ComponentDesc descriptor_) {
		setDescriptor(descriptor_);
	}

	public String getUniqueName() {
		return getDescriptor().getIdentification().getName();
	}

	public Collection getDependencies() {
		return getDescriptor().getRequiredLibraries();
	}

	public ComponentDesc getDescriptor() {
		return descriptor;
	}

	public void setDescriptor(ComponentDesc descriptor_) {
		descriptor = descriptor_;
	}

	public String getInstallRoot() {
		return installRoot;
	}

	public void setInstallRoot(String installRoot_) {
		installRoot = installRoot_;
	}
}
--- ComponentConfig.java DELETED ---

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/test/org/openbus/jbi/framework/impl HashmapJBIRegistryImplTest.java,1.3,1.4 FileSystemRepositoryImplTest.java,1.3,1.4

[Esteban S. <es...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/framework/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23990/src/test/org/openbus/jbi/framework/impl

Modified Files:
	HashmapJBIRegistryImplTest.java 
	FileSystemRepositoryImplTest.java 
Log Message:
Adding more installation code

Index: FileSystemRepositoryImplTest.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/framework/impl/FileSystemRepositoryImplTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FileSystemRepositoryImplTest.java	14 Jul 2005 23:10:59 -0000	1.3
--- FileSystemRepositoryImplTest.java	27 Jul 2005 00:22:49 -0000	1.4
***************
*** 22,28 ****
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
! import org.openbus.jbi.framework.ComponentConfig;
  import org.openbus.jbi.framework.JBIRegistry;
! import org.openbus.jbi.framework.SharedLibrary;
  
  /**
--- 22,28 ----
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
! import org.openbus.jbi.framework.ComponentRuntimeInfo;
  import org.openbus.jbi.framework.JBIRegistry;
! import org.openbus.jbi.framework.SharedLibraryInfo;
  
  /**
***************
*** 52,60 ****
              JBIRegistry reg = repository.retrieveRegistry();
              // add a library
!             SharedLibrary lib1 = new SharedLibrary(getLibraryDescription(
                      "Lib 1", "4.2"));
              reg.addSharedLibrary(lib1);
              // add a component
!             ComponentConfig comp1 = new ComponentConfig(getComponentDescription("Comp 1"));
              reg.addComponent(comp1);
              repository.storeRegistry(reg);
--- 52,60 ----
              JBIRegistry reg = repository.retrieveRegistry();
              // add a library
!             SharedLibraryInfo lib1 = new SharedLibraryInfo(getLibraryDescription(
                      "Lib 1", "4.2"));
              reg.addSharedLibrary(lib1);
              // add a component
!             ComponentRuntimeInfo comp1 = new ComponentRuntimeInfo(getComponentDescription("Comp 1"));
              reg.addComponent(comp1);
              repository.storeRegistry(reg);
***************
*** 86,90 ****
                      "UTF-8");
              log.debug("Zip name: " + zipName);
!             ComponentConfig comp1 = new ComponentConfig(getComponentDescription("Comp 1"));
              File compRoot = new File(repository.getComponentsPath(), comp1
                      .getUniqueName());
--- 86,90 ----
                      "UTF-8");
              log.debug("Zip name: " + zipName);
!             ComponentRuntimeInfo comp1 = new ComponentRuntimeInfo(getComponentDescription("Comp 1"));
              File compRoot = new File(repository.getComponentsPath(), comp1
                      .getUniqueName());
***************
*** 120,124 ****
                      .getFile(), "UTF-8");
              log.debug("Zip name: " + zipName);
!             SharedLibrary lib = new SharedLibrary(getLibraryDescription(
                      "BPEL Lib", "4.7"));
              File libRoot = new File(repository.getLibrariesPath(), "BPEL Lib"
--- 120,124 ----
                      .getFile(), "UTF-8");
              log.debug("Zip name: " + zipName);
!             SharedLibraryInfo lib = new SharedLibraryInfo(getLibraryDescription(
                      "BPEL Lib", "4.7"));
              File libRoot = new File(repository.getLibrariesPath(), "BPEL Lib"

Index: HashmapJBIRegistryImplTest.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/framework/impl/HashmapJBIRegistryImplTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HashmapJBIRegistryImplTest.java	14 Jul 2005 23:10:59 -0000	1.3
--- HashmapJBIRegistryImplTest.java	27 Jul 2005 00:22:49 -0000	1.4
***************
*** 18,25 ****
  import org.apache.commons.lang.SerializationUtils;
  import org.openbus.jbi.descriptor.SharedLibraryDesc;
! import org.openbus.jbi.framework.ComponentConfig;
  import org.openbus.jbi.framework.FrameworkException;
  import org.openbus.jbi.framework.JBIRegistry;
! import org.openbus.jbi.framework.SharedLibrary;
  
  /**
--- 18,25 ----
  import org.apache.commons.lang.SerializationUtils;
  import org.openbus.jbi.descriptor.SharedLibraryDesc;
! import org.openbus.jbi.framework.ComponentRuntimeInfo;
  import org.openbus.jbi.framework.FrameworkException;
  import org.openbus.jbi.framework.JBIRegistry;
! import org.openbus.jbi.framework.SharedLibraryInfo;
  
  /**
***************
*** 33,37 ****
              JBIRegistry reg = new HashmapJBIRegistryImpl();
              // add 1st library
!             SharedLibrary lib1 = new SharedLibrary(getLibraryDescription(
                      "Lib 1", "4.2"));
              reg.addSharedLibrary(lib1);
--- 33,37 ----
              JBIRegistry reg = new HashmapJBIRegistryImpl();
              // add 1st library
!             SharedLibraryInfo lib1 = new SharedLibraryInfo(getLibraryDescription(
                      "Lib 1", "4.2"));
              reg.addSharedLibrary(lib1);
***************
*** 47,51 ****
              // add 2nd lib with null version
              SharedLibraryDesc desc2 = getLibraryDescription("Lib 2", null);
!             SharedLibrary lib2 = new SharedLibrary(desc2);
              reg.addSharedLibrary(lib2);
              assertEquals(2, reg.getSharedLibraries().size());
--- 47,51 ----
              // add 2nd lib with null version
              SharedLibraryDesc desc2 = getLibraryDescription("Lib 2", null);
!             SharedLibraryInfo lib2 = new SharedLibraryInfo(desc2);
              reg.addSharedLibrary(lib2);
              assertEquals(2, reg.getSharedLibraries().size());
***************
*** 56,60 ****
              // add 3rd lib
              SharedLibraryDesc desc3 = getLibraryDescription("Lib 3", "3.2");
!             SharedLibrary lib3 = new SharedLibrary(desc3);
              reg.addSharedLibrary(lib3);
              assertEquals(4, reg.getSharedLibraries().size());
--- 56,60 ----
              // add 3rd lib
              SharedLibraryDesc desc3 = getLibraryDescription("Lib 3", "3.2");
!             SharedLibraryInfo lib3 = new SharedLibraryInfo(desc3);
              reg.addSharedLibrary(lib3);
              assertEquals(4, reg.getSharedLibraries().size());
***************
*** 74,78 ****
              // add 1st library
              SharedLibraryDesc desc1 = getLibraryDescription("Lib 1", "4.2");
!             SharedLibrary lib1 = new SharedLibrary(desc1);
              reg.addSharedLibrary(lib1);
              assertEquals(1, reg.getSharedLibraries().size());
--- 74,78 ----
              // add 1st library
              SharedLibraryDesc desc1 = getLibraryDescription("Lib 1", "4.2");
!             SharedLibraryInfo lib1 = new SharedLibraryInfo(desc1);
              reg.addSharedLibrary(lib1);
              assertEquals(1, reg.getSharedLibraries().size());
***************
*** 83,87 ****
              // add 2nd lib with null version
              SharedLibraryDesc desc2 = getLibraryDescription("Lib 2", null);
!             SharedLibrary lib2 = new SharedLibrary(desc2);
              reg.addSharedLibrary(lib2);
              assertEquals(3, reg.getSharedLibraries().size());
--- 83,87 ----
              // add 2nd lib with null version
              SharedLibraryDesc desc2 = getLibraryDescription("Lib 2", null);
!             SharedLibraryInfo lib2 = new SharedLibraryInfo(desc2);
              reg.addSharedLibrary(lib2);
              assertEquals(3, reg.getSharedLibraries().size());
***************
*** 120,126 ****
              JBIRegistry reg = new HashmapJBIRegistryImpl();
              // add 1st library
!             ComponentConfig comp1 = new ComponentConfig(getComponentDescription("Comp 1"));
              reg.addComponent(comp1);
!             assertEquals(1, reg.getComponents().size());
              // add duplicate component
              try {
--- 120,126 ----
              JBIRegistry reg = new HashmapJBIRegistryImpl();
              // add 1st library
!             ComponentRuntimeInfo comp1 = new ComponentRuntimeInfo(getComponentDescription("Comp 1"));
              reg.addComponent(comp1);
!             assertEquals(1, reg.getInstalledComponents().size());
              // add duplicate component
              try {
***************
*** 130,140 ****
              } catch (FrameworkException fe) {
              }
!             assertEquals(1, reg.getComponents().size());
              // add 2nd comp
!             ComponentConfig comp2 = new ComponentConfig(getComponentDescription("Comp 2"));
              reg.addComponent(comp2);
!             assertEquals(2, reg.getComponents().size());
!             assertSame(comp1, reg.getComponentConfig("Comp 1"));
!             assertSame(comp2, reg.getComponentConfig("Comp 2"));
          } catch (Exception e) {
              e.printStackTrace();
--- 130,140 ----
              } catch (FrameworkException fe) {
              }
!             assertEquals(1, reg.getInstalledComponents().size());
              // add 2nd comp
!             ComponentRuntimeInfo comp2 = new ComponentRuntimeInfo(getComponentDescription("Comp 2"));
              reg.addComponent(comp2);
!             assertEquals(2, reg.getInstalledComponents().size());
!             assertSame(comp1, reg.getComponentRuntimeInfo("Comp 1"));
!             assertSame(comp2, reg.getComponentRuntimeInfo("Comp 2"));
          } catch (Exception e) {
              e.printStackTrace();
***************
*** 147,160 ****
              JBIRegistry reg = new HashmapJBIRegistryImpl();
              // add 1st library
!             ComponentConfig comp1 = new ComponentConfig(getComponentDescription("Comp 1"));
              reg.addComponent(comp1);
!             assertEquals(1, reg.getComponents().size());
              // add 2nd comp
!             ComponentConfig comp2 = new ComponentConfig(getComponentDescription("Comp 2"));
              reg.addComponent(comp2);
!             assertEquals(2, reg.getComponents().size());
              // remove component 1
              reg.removeComponent("Comp 1");
!             assertEquals(1, reg.getComponents().size());
              assertFalse("Shouldn't be installed", reg
                      .isComponentInstalled("Comp 1"));
--- 147,160 ----
              JBIRegistry reg = new HashmapJBIRegistryImpl();
              // add 1st library
!             ComponentRuntimeInfo comp1 = new ComponentRuntimeInfo(getComponentDescription("Comp 1"));
              reg.addComponent(comp1);
!             assertEquals(1, reg.getInstalledComponents().size());
              // add 2nd comp
!             ComponentRuntimeInfo comp2 = new ComponentRuntimeInfo(getComponentDescription("Comp 2"));
              reg.addComponent(comp2);
!             assertEquals(2, reg.getInstalledComponents().size());
              // remove component 1
              reg.removeComponent("Comp 1");
!             assertEquals(1, reg.getInstalledComponents().size());
              assertFalse("Shouldn't be installed", reg
                      .isComponentInstalled("Comp 1"));
***************
*** 171,175 ****
              JBIRegistry reg = new HashmapJBIRegistryImpl();
              // add 1st library
!             SharedLibrary lib = new SharedLibrary(getLibraryDescription("Lib 1", "4.2"));
              reg.addSharedLibrary(lib);
              assertEquals(1, reg.getSharedLibraries().size());
--- 171,175 ----
              JBIRegistry reg = new HashmapJBIRegistryImpl();
              // add 1st library
!             SharedLibraryInfo lib = new SharedLibraryInfo(getLibraryDescription("Lib 1", "4.2"));
              reg.addSharedLibrary(lib);
              assertEquals(1, reg.getSharedLibraries().size());
***************
*** 180,184 ****
                      regCopy);
              assertEquals(1, regCopy.getSharedLibraries().size());
!             SharedLibrary libCopy = regCopy.getSharedLibrary("Lib 1");
              assertNotNull("Lib should be recovered from serialization", libCopy);
              assertEquals("4.2", libCopy.getVersion());
--- 180,184 ----
                      regCopy);
              assertEquals(1, regCopy.getSharedLibraries().size());
!             SharedLibraryInfo libCopy = regCopy.getSharedLibrary("Lib 1");
              assertNotNull("Lib should be recovered from serialization", libCopy);
              assertEquals("4.2", libCopy.getVersion());

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/java/org/openbus/jbi/loader/impl ClassLoaderFactoryImpl.java,NONE,1.1 DefaultClassLoaderFactoryImpl.java,1.2,NONE

[Esteban S. <es...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/loader/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23990/src/java/org/openbus/jbi/loader/impl

Added Files:
	ClassLoaderFactoryImpl.java 
Removed Files:
	DefaultClassLoaderFactoryImpl.java 
Log Message:
Adding more installation code

--- NEW FILE: ClassLoaderFactoryImpl.java ---
/*
 * Copyright 2001-2005 The Apache Software Foundation.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 *      http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.openbus.jbi.loader.impl;

import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
import java.util.WeakHashMap;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.openbus.jbi.descriptor.ClassPathDesc;
import org.openbus.jbi.descriptor.ComponentDesc;
import org.openbus.jbi.descriptor.SharedLibraryDesc;
import org.openbus.jbi.framework.ComponentRuntimeInfo;
import org.openbus.jbi.framework.FrameworkException;
import org.openbus.jbi.framework.JBIRegistry;
import org.openbus.jbi.framework.JBIRepository;
import org.openbus.jbi.framework.SharedLibraryInfo;
import org.openbus.jbi.loader.ClassLoaderFactory;
import org.openbus.jbi.loader.CompositeClassLoader;
import org.openbus.jbi.loader.DelegateClassLoader;

/**
 * 
 * 
 * @author <a href="mailto:es...@op...">Esteban Sancho </a>
 */
public class ClassLoaderFactoryImpl implements ClassLoaderFactory {
    private static final String SELF_FIRST_DELEGATION = "self-first";
    private static Log log = LogFactory
            .getLog(ClassLoaderFactoryImpl.class);

    // key -> SharedLibrary
    // value -> ClassLoader
    private Map libraryLoaders = new WeakHashMap();
    // key -> Component
    // value -> ClassLoader
    private Map bootstrapLoaders = new WeakHashMap();
    // key -> Component
    // value -> ClassLoader
    private Map componentLoaders = new WeakHashMap();

    private JBIRepository repository;

    public ClassLoaderFactoryImpl() {
        super();
    }

    public ClassLoader getComponentClassLoader(ComponentRuntimeInfo component_)
            throws FrameworkException {
        ClassLoader loader = (ClassLoader) componentLoaders.get(component_);

        if (loader == null) {
            JBIRegistry registry = repository.retrieveRegistry();
            ComponentDesc descriptor = component_.getDescriptor();
            try {
                URL[] paths = getPathUrls(component_.getInstallRoot(),
                        descriptor.getComponentClassPath());

                Collection dependencies = descriptor.getRequiredLibraries();
                CompositeClassLoader libsLoader = new CompositeClassLoader();

                for (Iterator i = dependencies.iterator(); i.hasNext();) {
                    SharedLibraryDesc libDesc = (SharedLibraryDesc) i.next();
                    SharedLibraryInfo lib = registry.getSharedLibrary(libDesc
                            .getIdentification().getName(), libDesc
                            .getVersion());
                    libsLoader.addClassLoader(getLibraryClassLoader(lib));
                }

                // get loading delegation
                String delegation = descriptor
                        .getComponentClassLoaderDelegation();
                boolean parentFirst = !(delegation
                        .equals(SELF_FIRST_DELEGATION));

                loader = new DelegateClassLoader(paths, libsLoader, parentFirst);
                // store for future use
                componentLoaders.put(component_, loader);
            } catch (MalformedURLException e) {
                // @todo i18n
                throw new FrameworkException(
                        "Unable to create component class loader", e);
            }
        }

        return loader;
    }

    protected DelegateClassLoader getLibraryClassLoader(SharedLibraryInfo library_)
            throws FrameworkException {
        if (library_ == null) {
            // @todo i18n
            throw new IllegalArgumentException("Parameter is null: library_");
        }

        DelegateClassLoader loader = (DelegateClassLoader) libraryLoaders
                .get(library_);

        if (loader == null) {
            SharedLibraryDesc descriptor = library_.getDescriptor();
            // get loading delegation
            String delegation = descriptor.getClassLoaderDelegation();
            boolean parentFirst = !(delegation.equals(SELF_FIRST_DELEGATION));
            try {
                URL[] paths = getPathUrls(library_.getInstallRoot(), descriptor
                        .getClassPath());
                loader = new DelegateClassLoader(paths, getJBIClassLoader(),
                        parentFirst);
                libraryLoaders.put(library_, loader);
            } catch (MalformedURLException e) {
                // @todo i18n
                throw new FrameworkException(
                        "Unable to create shared library class loader", e);
            }
        }

        return loader;
    }

    public ClassLoader getBootstrapClassLoader(ComponentRuntimeInfo component_)
            throws FrameworkException {
        ClassLoader loader = (ClassLoader) bootstrapLoaders.get(component_);

        if (loader == null) {
            ComponentDesc descriptor = component_.getDescriptor();
            // get loading delegation
            String delegation = descriptor.getBootstrapClassLoaderDelegation();
            boolean parentFirst = !(delegation.equals(SELF_FIRST_DELEGATION));
            try {
                URL[] paths = getPathUrls(component_.getInstallRoot(),
                        descriptor.getBootstrapClassPath());
                loader = new DelegateClassLoader(paths, getJBIClassLoader(),
                        parentFirst);
                bootstrapLoaders.put(component_, loader);
            } catch (MalformedURLException e) {
                // @todo i18n
                throw new FrameworkException(
                        "Unable to create bootstrap class loader", e);
            }
        }
        return loader;
    }

    protected URL[] getPathUrls(String root_, ClassPathDesc cp_)
            throws MalformedURLException {
        Collection entries = cp_.getPathElements();
        URL[] paths = new URL[entries.size()];
        int counter = 0;
        for (Iterator i = entries.iterator(); i.hasNext(); counter++) {
            String entry = root_ + File.separator + (String) i.next();
            if (log.isDebugEnabled()) {
                log.debug("Adding URL to classpath: " + entry);
            }
            paths[counter] = new URL("file", null, entry);
        }
        return paths;
    }

    protected ClassLoader getJBIClassLoader() {
        // @todo define appropriate class loader
        return ClassLoader.getSystemClassLoader();
    }

    public JBIRepository getRepository() {
        return repository;
    }

    public void setRepository(JBIRepository repository_) {
        repository = repository_;
    }
}
--- DefaultClassLoaderFactoryImpl.java DELETED ---

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/java/org/openbus/jbi/installation InstallerFactory.java,1.1,1.2

[Esteban S. <es...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/installation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23990/src/java/org/openbus/jbi/installation

Modified Files:
	InstallerFactory.java 
Log Message:
Adding more installation code

Index: InstallerFactory.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/installation/InstallerFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InstallerFactory.java	13 Jul 2005 21:15:12 -0000	1.1
--- InstallerFactory.java	27 Jul 2005 00:22:50 -0000	1.2
***************
*** 16,21 ****
  package org.openbus.jbi.installation;
  
- import java.awt.Component;
- 
  import javax.jbi.management.InstallerMBean;
  
--- 16,19 ----
***************
*** 26,29 ****
   */
  public interface InstallerFactory {
!     InstallerMBean getInstaller(Component component_);
  }
--- 24,27 ----
   */
  public interface InstallerFactory {
!     InstallerMBean getInstaller(String installZipName_);
  }

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/java/org/openbus/jbi/installation/impl InstallerFactoryImpl.java,NONE,1.1 InstallationService.java,1.2,1.3 Installer.java,1.1,1.2

[Esteban S. <es...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/installation/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23990/src/java/org/openbus/jbi/installation/impl

Modified Files:
	InstallationService.java Installer.java 
Added Files:
	InstallerFactoryImpl.java 
Log Message:
Adding more installation code

Index: Installer.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/installation/impl/Installer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Installer.java	13 Jul 2005 21:15:11 -0000	1.1
--- Installer.java	27 Jul 2005 00:22:50 -0000	1.2
***************
*** 13,17 ****
   * See the License for the specific language governing permissions and
   * limitations under the License.
!  */ 
  
  package org.openbus.jbi.installation.impl;
--- 13,17 ----
   * See the License for the specific language governing permissions and
   * limitations under the License.
!  */
  
  package org.openbus.jbi.installation.impl;
***************
*** 21,59 ****
  import javax.management.ObjectName;
  
  /**
!  * OpenBus implementation of <code>InstallerMBean</code> management
!  * interface.
   * 
   * Created 04/05/2005
-  * @author Javier Storni
-  * Revision: [Last rev id] at: [Last rev timestamp]
   * 
   */
  public class Installer implements InstallerMBean {
  
! 	public ObjectName getInstallerConfigurationMBean() throws JBIException {
! 		// TODO Auto-generated method stub
! 		return null;
! 	}
  
! 	public String getInstallRoot() {
! 		// TODO Auto-generated method stub
! 		return null;
! 	}
  
! 	public ObjectName install() throws JBIException {
! 		// TODO Auto-generated method stub
! 		return null;
! 	}
  
! 	public boolean isInstalled() {
! 		// TODO Auto-generated method stub
! 		return false;
! 	}
  
! 	public void uninstall() throws JBIException {
! 		// TODO Auto-generated method stub
  
! 	}
  
! }
--- 21,82 ----
  import javax.management.ObjectName;
  
+ import org.openbus.jbi.framework.JBIRepository;
+ 
  /**
!  * OpenBus implementation of <code>InstallerMBean</code> management interface.
   * 
   * Created 04/05/2005
   * 
+  * @author Javier Storni Revision: [Last rev id] at: [Last rev timestamp]
+  *  
   */
  public class Installer implements InstallerMBean {
+     JBIRepository repository;
  
!     String installZip;
  
!     public Installer(String installZip_) {
!         setInstallZip(installZip_);
!     }
  
!     public ObjectName getInstallerConfigurationMBean() throws JBIException {
!         // TODO Auto-generated method stub
!         return null;
!     }
  
!     public String getInstallRoot() {
!         // TODO Auto-generated method stub
!         return null;
!     }
  
!     public ObjectName install() throws JBIException {
!         // TODO Auto-generated method stub
!         return null;
!     }
  
!     public boolean isInstalled() {
!         // TODO Auto-generated method stub
!         return false;
!     }
  
!     public void uninstall() throws JBIException {
!         // TODO Auto-generated method stub
! 
!     }
! 
!     public JBIRepository getRepository() {
!         return repository;
!     }
! 
!     public void setRepository(JBIRepository repository_) {
!         repository = repository_;
!     }
! 
!     public String getInstallZip() {
!         return installZip;
!     }
! 
!     public void setInstallZip(String installZip_) {
!         installZip = installZip_;
!     }
! }
\ No newline at end of file

--- NEW FILE: InstallerFactoryImpl.java ---
/*
 * Copyright 2001-2005 The Apache Software Foundation.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 *      http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */ 
package org.openbus.jbi.installation.impl;

import javax.jbi.management.InstallerMBean;

import org.openbus.jbi.installation.InstallerFactory;

/**
 * 
 * 
 * @author <a href="mailto:es...@op...">Esteban Sancho</a>
 */
public class InstallerFactoryImpl implements InstallerFactory {

    public InstallerMBean getInstaller(String installZipName_) {
        return new Installer(installZipName_);
    }

}

Index: InstallationService.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/installation/impl/InstallationService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InstallationService.java	14 Jul 2005 23:10:59 -0000	1.2
--- InstallationService.java	27 Jul 2005 00:22:50 -0000	1.3
***************
*** 19,39 ****
  import java.io.IOException;
  import java.util.Collection;
  import java.util.Iterator;
  import java.util.zip.ZipFile;
  
  import javax.jbi.management.InstallationServiceMBean;
  import javax.management.ObjectName;
  
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
- import org.openbus.commons.transaction.JTAFactory;
  import org.openbus.jbi.descriptor.JBIDesc;
! import org.openbus.jbi.framework.ComponentConfig;
  import org.openbus.jbi.framework.FrameworkException;
  import org.openbus.jbi.framework.JBIRegistry;
  import org.openbus.jbi.framework.JBIRepository;
! import org.openbus.jbi.framework.SharedLibrary;
  import org.openbus.jbi.installation.InstallationException;
  import org.openbus.jbi.installation.PackageParser;
  
  /**
--- 19,43 ----
  import java.io.IOException;
  import java.util.Collection;
+ import java.util.HashMap;
  import java.util.Iterator;
  import java.util.zip.ZipFile;
  
  import javax.jbi.management.InstallationServiceMBean;
+ import javax.jbi.management.InstallerMBean;
  import javax.management.ObjectName;
  
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
  import org.openbus.jbi.descriptor.JBIDesc;
! import org.openbus.jbi.framework.ComponentRuntimeInfo;
  import org.openbus.jbi.framework.FrameworkException;
  import org.openbus.jbi.framework.JBIRegistry;
  import org.openbus.jbi.framework.JBIRepository;
! import org.openbus.jbi.framework.SharedLibraryInfo;
  import org.openbus.jbi.installation.InstallationException;
+ import org.openbus.jbi.installation.InstallerFactory;
  import org.openbus.jbi.installation.PackageParser;
+ import org.openbus.jbi.management.JMXEnvironment;
+ import org.openbus.jbi.management.ManagementException;
  
  /**
***************
*** 47,56 ****
   */
  public class InstallationService implements InstallationServiceMBean {
      private PackageParser parser;
      private JBIRepository repository;
      private JBIRegistry registry;
!     private JTAFactory jtaFactory;
  
!     private static Log log = LogFactory.getLog(InstallationServiceMBean.class);
  
      public void init() throws InstallationException {
--- 51,66 ----
   */
  public class InstallationService implements InstallationServiceMBean {
+     private static Log log = LogFactory.getLog(InstallationServiceMBean.class);
+ 
      private PackageParser parser;
      private JBIRepository repository;
      private JBIRegistry registry;
!     private InstallerFactory installerFactory;
!     private JMXEnvironment jmxEnvironment;
  
!     /*
!      * key -> component name value -> installer entry
!      */
!     private HashMap installers = new HashMap();
  
      public void init() throws InstallationException {
***************
*** 62,65 ****
--- 72,76 ----
          try {
              registry = repository.retrieveRegistry();
+             registry.recoverComponents();
          } catch (FrameworkException e) {
              // @todo i18n
***************
*** 87,98 ****
      public String installSharedLibrary(String slZipURL_) {
          String libraryName = null;
!         SharedLibrary lib = null;
  
          try {
!             lib = new SharedLibrary(getDescriptor(slZipURL_).getSharedLibrary());
              libraryName = lib.getUniqueName();
              String libRoot = getRepository().storeSharedLibrary(lib, slZipURL_);
              lib.setInstallRoot(libRoot);
!             lib.setStatus(SharedLibrary.STATUS_INSTALLED);
              getRegistry().addSharedLibrary(lib);
              getRepository().storeRegistry(getRegistry());
--- 98,110 ----
      public String installSharedLibrary(String slZipURL_) {
          String libraryName = null;
!         SharedLibraryInfo lib = null;
  
          try {
!             lib = new SharedLibraryInfo(getDescriptor(slZipURL_)
!                     .getSharedLibrary());
              libraryName = lib.getUniqueName();
              String libRoot = getRepository().storeSharedLibrary(lib, slZipURL_);
              lib.setInstallRoot(libRoot);
!             lib.setStatus(SharedLibraryInfo.STATUS_INSTALLED);
              getRegistry().addSharedLibrary(lib);
              getRepository().storeRegistry(getRegistry());
***************
*** 102,113 ****
                      new InstallationException(e));
              if (lib != null) {
!                 try {
!                     abortSharedLibraryInstallation(lib);
!                 } catch (FrameworkException fe) {
!                     // @todo i18n
!                     log.warn("Error aborting installation of library "
!                             + libraryName
!                             + ". System state could be inconsistent.", fe);
!                 }
              }
          }
--- 114,118 ----
                      new InstallationException(e));
              if (lib != null) {
!                 abortSharedLibraryInstallation(lib);
              }
          }
***************
*** 115,124 ****
      }
  
!     protected void checkDependencies(SharedLibrary library_)
              throws InstallationException {
!         Collection components = getRegistry().getComponents();
  
          for (Iterator i = components.iterator(); i.hasNext();) {
!             ComponentConfig comp = (ComponentConfig) i.next();
              if (comp.getDependencies().contains(library_)) {
                  // @todo i18n
--- 120,129 ----
      }
  
!     protected void checkDependencies(SharedLibraryInfo library_)
              throws InstallationException {
!         Collection components = getRegistry().getInstalledComponents();
  
          for (Iterator i = components.iterator(); i.hasNext();) {
!             ComponentRuntimeInfo comp = (ComponentRuntimeInfo) i.next();
              if (comp.getDependencies().contains(library_)) {
                  // @todo i18n
***************
*** 131,139 ****
      }
  
      public boolean uninstallSharedLibrary(String slName_) {
          boolean success = false;
  
          try {
!             SharedLibrary lib = registry.getSharedLibrary(slName_);
              if (lib == null) {
                  // @todo i18n
--- 136,170 ----
      }
  
+     protected void abortSharedLibraryInstallation(SharedLibraryInfo library_) {
+         if (getRegistry() != null) {
+             try {
+                 getRegistry().removeSharedLibrary(library_.getUniqueName());
+             } catch (Exception e) {
+                 // @todo i18n
+                 log.error("Exception caught while cleaning the registry up", e);
+             }
+         }
+         if (getRepository() != null) {
+             try {
+                 getRepository().removeSharedLibrary(library_);
+             } catch (Exception e) {
+                 // @todo i18n
+                 log.error("Exception caught while cleaning the repository up",
+                         e);
+             }
+             try {
+                 getRepository().storeRegistry(getRegistry());
+             } catch (Exception e) {
+                 // @todo i18n
+                 log.error("Exception caught while undoing changes", e);
+             }
+         }
+     }
+ 
      public boolean uninstallSharedLibrary(String slName_) {
          boolean success = false;
  
          try {
!             SharedLibraryInfo lib = registry.getSharedLibrary(slName_);
              if (lib == null) {
                  // @todo i18n
***************
*** 163,186 ****
  
      public ObjectName loadInstaller(String componentName_) {
!         // @todo Auto-generated method stub
!         return null;
      }
  
      public ObjectName loadNewInstaller(String installZipURL_) {
!         // @todo Auto-generated method stub
!         return null;
      }
  
      public boolean unloadInstaller(String componentName_, boolean isToBeDeleted_) {
!         // @todo Auto-generated method stub
!         return false;
!     }
  
!     public JTAFactory getJtaFactory() {
!         return jtaFactory;
!     }
  
!     public void setJtaFactory(JTAFactory jtaFactory_) {
!         jtaFactory = jtaFactory_;
      }
  
--- 194,253 ----
  
      public ObjectName loadInstaller(String componentName_) {
!         InstallerEntry entry = (InstallerEntry) installers.get(componentName_);
! 
!         try {
!             if (entry != null) {
!                 if (!jmxEnvironment.isMBeanRegistered(entry.installerName)) {
!                     jmxEnvironment.registerMBean(entry.installerName,
!                             entry.installer);
!                 }
!             }
!         } catch (Exception e) {
!             // @todo i18n
!             log.error("Error loading installer", e);
!             return null;
!         }
! 
!         return entry.installerName;
      }
  
      public ObjectName loadNewInstaller(String installZipURL_) {
!         InstallerEntry entry = null;
!         try {
!             JBIDesc descriptor = getDescriptor(installZipURL_);
!             String compName = descriptor.getComponent().getIdentification()
!                     .getName();
!             entry.installerName = jmxEnvironment.createObjectName(compName);
!             entry.installer = installerFactory.getInstaller(installZipURL_);
!             jmxEnvironment.registerMBean(entry.installerName, entry.installer);
!             installers.put(compName, entry);
!         } catch (Exception e) {
!             // @todo i18n
!             log.error("Error loading new installer", e);
!             return null;
!         }
!         return entry.installerName;
      }
  
      public boolean unloadInstaller(String componentName_, boolean isToBeDeleted_) {
!         InstallerEntry entry = (InstallerEntry) installers.get(componentName_);
  
!         if (entry == null) {
!             return false;
!         }
!         
!         try {
!             jmxEnvironment.unregisterMBean(entry.installerName);
  
!             if (isToBeDeleted_) {
!                 installers.remove(componentName_);
!             }
!         } catch (ManagementException e) {
!             // @todo i18n
!             log.error("Error loading new installer", e);
!             return false;
!         }
! 
!         return true;
      }
  
***************
*** 205,217 ****
      }
  
!     protected void abortSharedLibraryInstallation(SharedLibrary library_)
!             throws FrameworkException {
!         getRegistry().removeSharedLibrary(library_.getUniqueName());
!         getRepository().removeSharedLibrary(library_);
!         getRepository().storeRegistry(getRegistry());
      }
  
!     protected void abortComponentInstallation(ComponentConfig component_) {
  
      }
  }
\ No newline at end of file
--- 272,294 ----
      }
  
!     public InstallerFactory getInstallerFactory() {
!         return installerFactory;
      }
  
!     public void setInstallerFactory(InstallerFactory installerFactory_) {
!         installerFactory = installerFactory_;
!     }
  
+     public JMXEnvironment getJmxEnvironment() {
+         return jmxEnvironment;
+     }
+ 
+     public void setJmxEnvironment(JMXEnvironment jmxEnvironment_) {
+         jmxEnvironment = jmxEnvironment_;
+     }
+ 
+     private static class InstallerEntry {
+         ObjectName installerName;
+         InstallerMBean installer;
      }
  }
\ No newline at end of file

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/java/org/openbus/jbi/loader ClassLoaderFactory.java,1.2,1.3

[Esteban S. <es...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/loader
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23990/src/java/org/openbus/jbi/loader

Modified Files:
	ClassLoaderFactory.java 
Log Message:
Adding more installation code

Index: ClassLoaderFactory.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/loader/ClassLoaderFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ClassLoaderFactory.java	14 Jul 2005 23:11:00 -0000	1.2
--- ClassLoaderFactory.java	27 Jul 2005 00:22:51 -0000	1.3
***************
*** 16,20 ****
  package org.openbus.jbi.loader;
  
! import org.openbus.jbi.framework.ComponentConfig;
  import org.openbus.jbi.framework.FrameworkException;
  
--- 16,20 ----
  package org.openbus.jbi.loader;
  
! import org.openbus.jbi.framework.ComponentRuntimeInfo;
  import org.openbus.jbi.framework.FrameworkException;
  
***************
*** 25,32 ****
   */
  public interface ClassLoaderFactory {
!     ClassLoader getComponentClassLoader(ComponentConfig component_)
              throws FrameworkException;
  
!     ClassLoader getBootstrapClassLoader(ComponentConfig component_)
              throws FrameworkException;
  }
\ No newline at end of file
--- 25,32 ----
   */
  public interface ClassLoaderFactory {
!     ClassLoader getComponentClassLoader(ComponentRuntimeInfo component_)
              throws FrameworkException;
  
!     ClassLoader getBootstrapClassLoader(ComponentRuntimeInfo component_)
              throws FrameworkException;
  }
\ No newline at end of file

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/java/org/openbus/jbi/framework/impl FileSystemRepositoryImpl.java,1.4,1.5 HashmapJBIRegistryImpl.java,1.3,1.4

[Esteban S. <es...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/framework/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23990/src/java/org/openbus/jbi/framework/impl

Modified Files:
	FileSystemRepositoryImpl.java HashmapJBIRegistryImpl.java 
Log Message:
Adding more installation code

Index: HashmapJBIRegistryImpl.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/framework/impl/HashmapJBIRegistryImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HashmapJBIRegistryImpl.java	14 Jul 2005 23:10:59 -0000	1.3
--- HashmapJBIRegistryImpl.java	27 Jul 2005 00:22:51 -0000	1.4
***************
*** 21,24 ****
--- 21,25 ----
  import java.util.ArrayList;
  import java.util.Collection;
+ import java.util.Collections;
  import java.util.HashMap;
  import java.util.Iterator;
***************
*** 26,37 ****
  import javax.jbi.component.Component;
  
- import org.apache.commons.collections.collection.UnmodifiableCollection;
  import org.apache.commons.lang.SerializationUtils;
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
! import org.openbus.jbi.framework.ComponentConfig;
  import org.openbus.jbi.framework.FrameworkException;
  import org.openbus.jbi.framework.JBIRegistry;
! import org.openbus.jbi.framework.SharedLibrary;
  
  /**
--- 27,41 ----
  import javax.jbi.component.Component;
  
  import org.apache.commons.lang.SerializationUtils;
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
! import org.openbus.jbi.descriptor.ClassNameDesc;
! import org.openbus.jbi.descriptor.ComponentDesc;
! import org.openbus.jbi.framework.ComponentRuntimeInfo;
  import org.openbus.jbi.framework.FrameworkException;
  import org.openbus.jbi.framework.JBIRegistry;
! import org.openbus.jbi.framework.SharedLibraryInfo;
! import org.openbus.jbi.installation.InstallationException;
! import org.openbus.jbi.loader.ClassLoaderFactory;
  
  /**
***************
*** 45,52 ****
      protected static transient final Log log = LogFactory
              .getLog(HashmapJBIRegistryImpl.class);
  
      // Backend maps to be serialized
      private HashMap sharedLibraries;
!     private HashMap components;
  
      // To allow version changes on this class
--- 49,58 ----
      protected static transient final Log log = LogFactory
              .getLog(HashmapJBIRegistryImpl.class);
+     private transient HashMap componentInstances = new HashMap();
+     private transient ClassLoaderFactory classLoaderFactory;
  
      // Backend maps to be serialized
      private HashMap sharedLibraries;
!     private HashMap componentsInfo;
  
      // To allow version changes on this class
***************
*** 55,59 ****
      public HashmapJBIRegistryImpl() {
          sharedLibraries = new HashMap();
!         components = new HashMap();
      }
  
--- 61,65 ----
      public HashmapJBIRegistryImpl() {
          sharedLibraries = new HashMap();
!         componentsInfo = new HashMap();
      }
  
***************
*** 67,76 ****
      }
  
!     public SharedLibrary getSharedLibrary(String libraryName_) {
          return getSharedLibrary(libraryName_, null);
      }
  
!     public SharedLibrary getSharedLibrary(String libraryName_, String version_) {
!         SharedLibrary lib = null;
  
          synchronized (sharedLibraries) {
--- 73,83 ----
      }
  
!     public SharedLibraryInfo getSharedLibrary(String libraryName_) {
          return getSharedLibrary(libraryName_, null);
      }
  
!     public SharedLibraryInfo getSharedLibrary(String libraryName_,
!             String version_) {
!         SharedLibraryInfo lib = null;
  
          synchronized (sharedLibraries) {
***************
*** 87,91 ****
                      if (i.hasNext()) {
                          String version = (String) i.next();
!                         lib = (SharedLibrary) versions.get(version);
                          if (log.isDebugEnabled()) {
                              log.debug("Returning version " + version
--- 94,98 ----
                      if (i.hasNext()) {
                          String version = (String) i.next();
!                         lib = (SharedLibraryInfo) versions.get(version);
                          if (log.isDebugEnabled()) {
                              log.debug("Returning version " + version
***************
*** 94,98 ****
                      }
                  } else {
!                     lib = (SharedLibrary) versions.get(version_);
                      if (log.isDebugEnabled()) {
                          log.debug("Found version " + version_ + " for library "
--- 101,105 ----
                      }
                  } else {
!                     lib = (SharedLibraryInfo) versions.get(version_);
                      if (log.isDebugEnabled()) {
                          log.debug("Found version " + version_ + " for library "
***************
*** 118,122 ****
              }
          }
!         return UnmodifiableCollection.decorate(libs);
      }
  
--- 125,129 ----
              }
          }
!         return Collections.unmodifiableCollection(libs);
      }
  
***************
*** 132,138 ****
  
              if (versions != null) {
!                 if (log.isDebugEnabled()) {
!                     log.debug("Found " + versions.keySet().size()
!                             + " versions for library " + libraryName_);
                  }
                  if ((version_ == null) || (versions.get(version_) != null)) {
--- 139,156 ----
  
              if (versions != null) {
!                 if (log.isTraceEnabled()) {
!                     StringBuffer sb = new StringBuffer();
!                     boolean isFirst = true;
!                     for (Iterator i = versions.keySet().iterator(); i.hasNext();) {
!                         if (isFirst) {
!                             isFirst = false;
!                         } else {
!                             sb.append(';');
!                         }
!                         sb.append(i.next());
!                     }
!                     log.trace("Found " + versions.keySet().size()
!                             + " versions for library " + libraryName_ + " -> {"
!                             + sb.toString() + '}');
                  }
                  if ((version_ == null) || (versions.get(version_) != null)) {
***************
*** 151,162 ****
      }
  
!     public void addSharedLibrary(SharedLibrary library_)
              throws FrameworkException {
          String version = library_.getVersion();
  
-         if (version == null) {
-             version = SharedLibrary.DEFAULT_LIB_VERSION;
-         }
- 
          if (isSharedLibraryInstalled(library_.getUniqueName(), version)) {
              // @todo i18n
--- 169,176 ----
      }
  
!     public void addSharedLibrary(SharedLibraryInfo library_)
              throws FrameworkException {
          String version = library_.getVersion();
  
          if (isSharedLibraryInstalled(library_.getUniqueName(), version)) {
              // @todo i18n
***************
*** 215,247 ****
  
      public boolean isComponentInstalled(String componentName_) {
!         synchronized (components) {
!             return (components.get(componentName_) != null);
          }
      }
  
!     /*
!      * (non-Javadoc)
!      * 
!      * @see org.openbus.jbi.framework.FrameworkRegistry#getComponent(java.lang.String)
!      */
!     public ComponentConfig getComponentConfig(String componentName_) {
!         synchronized (components) {
!             return (ComponentConfig) components.get(componentName_);
          }
      }
  
!     public Collection getComponents() {
!         return UnmodifiableCollection.decorate(components.values());
      }
  
!     public void addComponent(ComponentConfig component_) throws FrameworkException {
!         if (isComponentInstalled(component_.getUniqueName())) {
              // @todo i18n
              throw new FrameworkException("Component "
!                     + component_.getUniqueName() + " is already installed");
          }
!         synchronized (components) {
!             components.put(component_.getUniqueName(), component_);
          }
      }
  
--- 229,262 ----
  
      public boolean isComponentInstalled(String componentName_) {
!         synchronized (componentsInfo) {
!             return (componentsInfo.get(componentName_) != null);
          }
      }
  
!     public ComponentRuntimeInfo getComponentRuntimeInfo(String componentName_) {
!         synchronized (componentsInfo) {
!             return (ComponentRuntimeInfo) componentsInfo.get(componentName_);
          }
      }
  
!     public Collection getInstalledComponents() {
!         return Collections.unmodifiableCollection(componentsInfo.values());
      }
  
!     public Component addComponent(ComponentRuntimeInfo componentInfo_)
!             throws FrameworkException {
!         Component comp = null;
!         if (isComponentInstalled(componentInfo_.getUniqueName())) {
              // @todo i18n
              throw new FrameworkException("Component "
!                     + componentInfo_.getUniqueName() + " is already installed");
          }
!         synchronized (componentsInfo) {
!             componentsInfo.put(componentInfo_.getUniqueName(), componentInfo_);
!         }
!         synchronized (componentInstances) {
!             componentInstances.put(componentInfo_.getUniqueName(), comp);
          }
+         return comp;
      }
  
***************
*** 253,269 ****
                      + " is not installed");
          }
!         synchronized (components) {
!             components.remove(componentName_);
          }
      }
  
!     protected Object clone() throws CloneNotSupportedException {
          return SerializationUtils.clone(this);
      }
  
! 	public Component getComponent(String component) {
! 		// @todo implement
! 		return null;
! 	}
  
  }
\ No newline at end of file
--- 268,317 ----
                      + " is not installed");
          }
!         synchronized (componentsInfo) {
!             componentsInfo.remove(componentName_);
!         }
!         synchronized (componentInstances) {
!             componentInstances.remove(componentName_);
          }
      }
  
!     public Component getComponent(String componentName_) {
!         Component comp = null;
!         synchronized (componentInstances) {
!             comp = (Component) componentInstances.get(componentName_);
!         }
!         return comp;
!     }
! 
!     protected Object clone() {
          return SerializationUtils.clone(this);
      }
  
!     public void recoverComponents() throws FrameworkException {
  
+     }
+ 
+     protected Component createComponent(ComponentRuntimeInfo info_)
+             throws InstallationException {
+         Component comp = null;
+ 
+         ComponentDesc desc = info_.getDescriptor();
+ 
+         if (desc == null) {
+             // @todo i18n
+             throw new InstallationException("Unable to find descriptor");
+         }
+         
+         ClassNameDesc compClassname = desc.getComponentClassName();
+         
+         return comp;
+     }
+ 
+     public ClassLoaderFactory getClassLoaderFactory() {
+         return classLoaderFactory;
+     }
+ 
+     public void setClassLoaderFactory(ClassLoaderFactory classLoaderFactory_) {
+         classLoaderFactory = classLoaderFactory_;
+     }
  }
\ No newline at end of file

Index: FileSystemRepositoryImpl.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/framework/impl/FileSystemRepositoryImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FileSystemRepositoryImpl.java	14 Jul 2005 23:10:59 -0000	1.4
--- FileSystemRepositoryImpl.java	27 Jul 2005 00:22:51 -0000	1.5
***************
*** 27,35 ****
  import org.apache.commons.logging.LogFactory;
  import org.openbus.commons.util.ZipUtils;
! import org.openbus.jbi.framework.ComponentConfig;
  import org.openbus.jbi.framework.FrameworkException;
  import org.openbus.jbi.framework.JBIRegistry;
  import org.openbus.jbi.framework.JBIRepository;
! import org.openbus.jbi.framework.SharedLibrary;
  
  /**
--- 27,35 ----
  import org.apache.commons.logging.LogFactory;
  import org.openbus.commons.util.ZipUtils;
! import org.openbus.jbi.framework.ComponentRuntimeInfo;
  import org.openbus.jbi.framework.FrameworkException;
  import org.openbus.jbi.framework.JBIRegistry;
  import org.openbus.jbi.framework.JBIRepository;
! import org.openbus.jbi.framework.SharedLibraryInfo;
  
  /**
***************
*** 143,147 ****
      }
  
!     public String storeComponent(ComponentConfig component_, String zipFile_)
              throws FrameworkException {
          if (isComponentStored(component_)) {
--- 143,147 ----
      }
  
!     public String storeComponent(ComponentRuntimeInfo component_, String zipFile_)
              throws FrameworkException {
          if (isComponentStored(component_)) {
***************
*** 160,164 ****
      }
  
!     public void removeComponent(ComponentConfig component_) throws FrameworkException {
          try {
              File componentDir = new File(getComponentsPath(), component_
--- 160,164 ----
      }
  
!     public void removeComponent(ComponentRuntimeInfo component_) throws FrameworkException {
          try {
              File componentDir = new File(getComponentsPath(), component_
***************
*** 171,175 ****
      }
  
!     public boolean isComponentStored(ComponentConfig component_)
              throws FrameworkException {
          File componentDir = new File(getComponentsPath(), component_
--- 171,175 ----
      }
  
!     public boolean isComponentStored(ComponentRuntimeInfo component_)
              throws FrameworkException {
          File componentDir = new File(getComponentsPath(), component_
***************
*** 178,182 ****
      }
  
!     public String storeSharedLibrary(SharedLibrary library_, String zipFile_)
              throws FrameworkException {
          if (isSharedLibraryStored(library_)) {
--- 178,182 ----
      }
  
!     public String storeSharedLibrary(SharedLibraryInfo library_, String zipFile_)
              throws FrameworkException {
          if (isSharedLibraryStored(library_)) {
***************
*** 198,202 ****
      }
  
!     public void removeSharedLibrary(SharedLibrary library_)
              throws FrameworkException {
          try {
--- 198,202 ----
      }
  
!     public void removeSharedLibrary(SharedLibraryInfo library_)
              throws FrameworkException {
          try {
***************
*** 213,217 ****
      }
  
!     public boolean isSharedLibraryStored(SharedLibrary library_)
              throws FrameworkException {
          File libraryDir = new File(getLibrariesPath(), getLibraryPath(library_));
--- 213,217 ----
      }
  
!     public boolean isSharedLibraryStored(SharedLibraryInfo library_)
              throws FrameworkException {
          File libraryDir = new File(getLibrariesPath(), getLibraryPath(library_));
***************
*** 220,228 ****
      }
  
!     public String getLibraryPath(SharedLibrary library_) {
          String version = library_.getVersion();
-         if (version == null) {
-             version = SharedLibrary.DEFAULT_LIB_VERSION;
-         }
          return library_.getUniqueName() + File.separator + version;
      }
--- 220,225 ----
      }
  
!     public String getLibraryPath(SharedLibraryInfo library_) {
          String version = library_.getVersion();
          return library_.getUniqueName() + File.separator + version;
      }

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/java/javax/jbi/management ComponentLifeCycleMBean.java,1.1,NONE

[Esteban S. <es...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/javax/jbi/management
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23990/src/java/javax/jbi/management

Removed Files:
	ComponentLifeCycleMBean.java 
Log Message:
Adding more installation code

--- ComponentLifeCycleMBean.java DELETED ---

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/java/org/openbus/jbi/management JMXEnvironment.java,NONE,1.1 ManagementException.java,NONE,1.1

[Esteban S. <es...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/management
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23990/src/java/org/openbus/jbi/management

Added Files:
	JMXEnvironment.java ManagementException.java 
Log Message:
Adding more installation code

--- NEW FILE: JMXEnvironment.java ---
/*
 * Copyright 2001-2005 The Apache Software Foundation.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 *      http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.openbus.jbi.management;

import javax.management.ObjectName;

/**
 * 
 * 
 * @author <a href="mailto:es...@op...">Esteban Sancho </a>
 */
public interface JMXEnvironment {
    ObjectName createObjectName(String name_) throws ManagementException;

    void registerMBean(ObjectName name_, Object object_)
            throws ManagementException;

    boolean isMBeanRegistered(ObjectName objectName_)
            throws ManagementException;

    Object getMBean(ObjectName objectName_) throws ManagementException;

    ObjectName unregisterMBean(ObjectName objectName_)
            throws ManagementException;
}
--- NEW FILE: ManagementException.java ---
/*
 * Copyright 2001-2005 The Apache Software Foundation.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 *      http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */ 
package org.openbus.jbi.management;

import org.openbus.commons.exceptions.OpenbusException;

/**
 * 
 * 
 * @author <a href="mailto:es...@op...">Esteban Sancho</a>
 */
public class ManagementException extends OpenbusException {

    /**
     * 
     */
    public ManagementException() {
        super();
        // @todo Auto-generated constructor stub
    }

    /**
     * @param arg0_
     */
    public ManagementException(String arg0_) {
        super(arg0_);
        // @todo Auto-generated constructor stub
    }

    /**
     * @param arg0_
     * @param arg1_
     */
    public ManagementException(String arg0_, Throwable arg1_) {
        super(arg0_, arg1_);
        // @todo Auto-generated constructor stub
    }

    /**
     * @param arg0_
     */
    public ManagementException(Throwable arg0_) {
        super(arg0_);
        // @todo Auto-generated constructor stub
    }

}

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/java/org/openbus/jbi/server/commands/impl ServerStarter.java,1.2,1.3

[Diego E. <er...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/server/commands/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21221/src/java/org/openbus/jbi/server/commands/impl

Modified Files:
	ServerStarter.java 
Log Message:
fixed problems with the reference implementation interfaces 

Index: ServerStarter.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/server/commands/impl/ServerStarter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ServerStarter.java	26 Jun 2005 22:48:24 -0000	1.2
--- ServerStarter.java	19 Jul 2005 03:06:55 -0000	1.3
***************
*** 35,39 ****
  import org.openbus.commons.OpenbusConfigurationException;
  import org.openbus.commons.exceptions.OpenbusException;
- import org.openbus.commons.i18n.ResourceBundleFinder;
  import org.openbus.jbi.server.ServerController;
  import org.openbus.jbi.server.commands.ServerCommand;
--- 35,38 ----
***************
*** 56,112 ****
  	 */
  	public void doCommand(CommandLine cmd) throws OpenbusException {
! //		String confFile = null;
! //		ConfigurationFacade conf = ConfigurationFacade.getInstance();
! //
! //		// if a file name is provided in the command line, then override
! //		// the configured one.
! //		if (cmd.hasOption(ServerController.FILE))
! //			confFile = cmd.getOptionValue(ServerController.FILE);
! //		else
! //			confFile = conf.getRootDir().concat(
! //					conf.getConfig().getString(
! //							CommandsKeys.JMX_STARTUP_CONF_FILE));
! //
! //		if (confFile == null)
! //			throw new OpenbusConfigurationException(
! //					CommandsKeys.ERR_NO_JMX_FILE);
! //
! //		File file = new File(confFile);
! //		if (!file.exists())
! //			throw new OpenbusConfigurationException(
! //					CommandsKeys.ERR_NO_JMX_FILE);
! //
! //		// start server instance
! //		MBeanServer server = MBeanServerFactory.newMBeanServer();
! //		ConfigurationLoader loader = new ConfigurationLoader();
! //		
! //		ResourceBundle bundle = ResourceBundleFinder.getInstance().find(getClass());
! //		
! //		// register configuration loader
! //		log.info(bundle.getString(CommandsKeys.START_REGISTERING_CONF_LOADER));
! //		try {
! //			server.registerMBean(loader, ObjectName
! //					.getInstance("config:service=loader"));
! //		} catch (Exception ex) {
! //			throw new OpenbusException(
! //				bundle.getString(CommandsKeys.ERR_REGISTERING_CONF_LOADER), ex);
! //		}
! //
! //		// load configuration from file
! //		log.info(bundle.getString(CommandsKeys.START_LOADING_CONF));
! //		try {
! //			Reader reader = new BufferedReader(new FileReader(confFile));
! //	
! //			// start jmx server with supplied configuration
! //			loader.startup(reader);
! //			
! //			// free reader
! //			reader.close();
! //		} catch (Exception ex) {
! //			throw new OpenbusException(
! //				bundle.getString(CommandsKeys.ERR_LOADING_CONF), ex);
! //		}
! //		
! //		log.info(bundle.getString(CommandsKeys.START_FINISH));
  	}
  
--- 55,112 ----
  	 */
  	public void doCommand(CommandLine cmd) throws OpenbusException {
! 		String confFile = null;
! 		ConfigurationFacade conf = ConfigurationFacade.getInstance();
! 
! 		// if a file name is provided in the command line, then override
! 		// the configured one.
! 		if (cmd.hasOption(ServerController.FILE))
! 			confFile = cmd.getOptionValue(ServerController.FILE);
! 		else
! 			confFile = conf.getRootDir().concat(
! 					conf.getConfig().getString(
! 							CommandsKeys.JMX_STARTUP_CONF_FILE));
! 
! 		if (confFile == null)
! 			throw new OpenbusConfigurationException(
! 					CommandsKeys.ERR_NO_JMX_FILE);
! 
! 		File file = new File(confFile);
! 		if (!file.exists())
! 			throw new OpenbusConfigurationException(
! 					CommandsKeys.ERR_NO_JMX_FILE);
! 
! 		// start server instance
! 		MBeanServer server = MBeanServerFactory.newMBeanServer();
! 		ConfigurationLoader loader = new ConfigurationLoader();
! 		
! 		// @todo implement
! 		ResourceBundle bundle = null; //ResourceBundleFinder.getInstance().find(getClass());
! 		
! 		// register configuration loader
! 		log.info(bundle.getString(CommandsKeys.START_REGISTERING_CONF_LOADER));
! 		try {
! 			server.registerMBean(loader, ObjectName
! 					.getInstance("config:service=loader"));
! 		} catch (Exception ex) {
! 			throw new OpenbusException(
! 				bundle.getString(CommandsKeys.ERR_REGISTERING_CONF_LOADER), ex);
! 		}
! 
! 		// load configuration from file
! 		log.info(bundle.getString(CommandsKeys.START_LOADING_CONF));
! 		try {
! 			Reader reader = new BufferedReader(new FileReader(confFile));
! 	
! 			// start jmx server with supplied configuration
! 			loader.startup(reader);
! 			
! 			// free reader
! 			reader.close();
! 		} catch (Exception ex) {
! 			throw new OpenbusException(
! 				bundle.getString(CommandsKeys.ERR_LOADING_CONF), ex);
! 		}
! 		
! 		log.info(bundle.getString(CommandsKeys.START_FINISH));
  	}
  

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/java/org/openbus/jbi/component ComponentContextImpl.java,1.8,1.9

[Diego E. <er...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/component
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21221/src/java/org/openbus/jbi/component

Modified Files:
	ComponentContextImpl.java 
Log Message:
fixed problems with the reference implementation interfaces 

Index: ComponentContextImpl.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/component/ComponentContextImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ComponentContextImpl.java	27 Jun 2005 03:11:56 -0000	1.8
--- ComponentContextImpl.java	19 Jul 2005 03:06:55 -0000	1.9
***************
*** 6,10 ****
  import javax.jbi.JBIException;
  import javax.jbi.component.ComponentContext;
! import javax.jbi.component.MBeanNames;
  import javax.jbi.messaging.DeliveryChannel;
  import javax.jbi.messaging.MessagingException;
--- 6,10 ----
  import javax.jbi.JBIException;
  import javax.jbi.component.ComponentContext;
! import javax.jbi.management.MBeanNames;
  import javax.jbi.messaging.DeliveryChannel;
  import javax.jbi.messaging.MessagingException;
***************
*** 12,16 ****
  import javax.management.MBeanServer;
  import javax.naming.InitialContext;
- import javax.transaction.TransactionManager;
  import javax.xml.namespace.QName;
  
--- 12,15 ----
***************
*** 123,132 ****
  	}
  
! 	/*
! 	 * (non-Javadoc)
! 	 * 
! 	 * @see javax.jbi.component.ComponentContext#getTransactionManager()
! 	 */
! 	public TransactionManager getTransactionManager() {
  		// TODO Auto-generated method stub
  		return null;
--- 122,126 ----
  	}
  
! 	public Object getTransactionManager() {
  		// TODO Auto-generated method stub
  		return null;

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging DeliveryChannelImplTest.java,1.2,1.3 NormalizedMessageImplTest.java,1.1,1.2

[Diego E. <er...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21221/src/test/org/openbus/jbi/messaging

Modified Files:
	DeliveryChannelImplTest.java NormalizedMessageImplTest.java 
Log Message:
fixed problems with the reference implementation interfaces 

Index: NormalizedMessageImplTest.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/NormalizedMessageImplTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NormalizedMessageImplTest.java	21 Jun 2005 00:17:48 -0000	1.1
--- NormalizedMessageImplTest.java	19 Jul 2005 03:06:55 -0000	1.2
***************
*** 78,86 ****
  		assertEquals("content", TEST_STRING, baos.toString());
  
- 		Iterator attIt = nm.listAttachments();
- 		assertTrue(attIt.hasNext());
- 		assertEquals(dh, attIt.next());
- 		assertFalse(attIt.hasNext());
- 
  		nm.removeAttachment(ATTACHMENT_NAME + "2");
  		assertEquals(1, nm.getAttachmentNames().size());
--- 78,81 ----
***************
*** 101,105 ****
  	protected void analyzeProperties(NormalizedMessage nm) throws Exception {
  		Set names = new HashSet();
! 		for (Iterator it = msg.getPropertyNames(); it.hasNext();) {
  			names.add(it.next());
  		}
--- 96,100 ----
  	protected void analyzeProperties(NormalizedMessage nm) throws Exception {
  		Set names = new HashSet();
! 		for (Iterator it = msg.getPropertyNames().iterator(); it.hasNext();) {
  			names.add(it.next());
  		}

Index: DeliveryChannelImplTest.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/DeliveryChannelImplTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DeliveryChannelImplTest.java	28 Jun 2005 22:54:43 -0000	1.2
--- DeliveryChannelImplTest.java	19 Jul 2005 03:06:55 -0000	1.3
***************
*** 148,157 ****
  		}
  		try {
! 			deliveryChannel.sendSynch(me);
  			fail("Channel is closed");
  		} catch (MessagingException e) {
  		}
  		try {
! 			deliveryChannel.sendSynch(me, 1000);
  			fail("Channel is closed");
  		} catch (MessagingException e) {
--- 148,157 ----
  		}
  		try {
! 			deliveryChannel.sendSync(me);
  			fail("Channel is closed");
  		} catch (MessagingException e) {
  		}
  		try {
! 			deliveryChannel.sendSync(me, 1000);
  			fail("Channel is closed");
  		} catch (MessagingException e) {

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/java/org/openbus/jbi/server ServerController.java,1.2,1.3

[Diego E. <er...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21221/src/java/org/openbus/jbi/server

Modified Files:
	ServerController.java 
Log Message:
fixed problems with the reference implementation interfaces 

Index: ServerController.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/server/ServerController.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ServerController.java	26 Jun 2005 22:48:24 -0000	1.2
--- ServerController.java	19 Jul 2005 03:07:15 -0000	1.3
***************
*** 17,38 ****
  package org.openbus.jbi.server;
  
- import java.util.HashMap;
- import java.util.ResourceBundle;
- 
  import org.apache.commons.cli.CommandLine;
- import org.apache.commons.cli.CommandLineParser;
  import org.apache.commons.cli.HelpFormatter;
- import org.apache.commons.cli.Option;
  import org.apache.commons.cli.Options;
- import org.apache.commons.cli.ParseException;
- import org.apache.commons.cli.PosixParser;
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.impl.LogFactoryImpl;
  import org.openbus.commons.exceptions.OpenbusException;
- import org.openbus.commons.exceptions.OpenbusRuntimeException;
- import org.openbus.commons.i18n.ResourceBundleFinder;
- import org.openbus.jbi.server.commands.ServerCommand;
- import org.openbus.jbi.server.commands.impl.ServerStarter;
- import org.openbus.jbi.server.commands.impl.ServerStopper;
  
  /**
--- 17,26 ----

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/java/org/openbus/jbi/servicedesc ServiceEndpointImpl.java,1.4,1.5

[Diego E. <er...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/servicedesc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21221/src/java/org/openbus/jbi/servicedesc

Modified Files:
	ServiceEndpointImpl.java 
Log Message:
fixed problems with the reference implementation interfaces 

Index: ServiceEndpointImpl.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/servicedesc/ServiceEndpointImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ServiceEndpointImpl.java	21 Jun 2005 00:13:53 -0000	1.4
--- ServiceEndpointImpl.java	19 Jul 2005 03:07:15 -0000	1.5
***************
*** 38,49 ****
      }
  
- 	public DocumentFragment getAsReference(String operationName) {
- 		// TODO Auto-generated method stub
- 		return null;
- 	}
- 
  	public QName[] getInterfaces() {
  		return interfaces;
  	}
  
  }
--- 38,49 ----
      }
  
  	public QName[] getInterfaces() {
  		return interfaces;
  	}
  
+ 	public DocumentFragment getAsReference(QName arg0) {
+ 		// TODO Auto-generated method stub
+ 		return null;
+ 	}
+ 
  }

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/java/org/openbus/jbi/messaging DeliveryChannelImpl.java,1.13,1.14 NormalizedMessageImpl.java,1.4,1.5

[Diego E. <er...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/messaging
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21221/src/java/org/openbus/jbi/messaging

Modified Files:
	DeliveryChannelImpl.java NormalizedMessageImpl.java 
Log Message:
fixed problems with the reference implementation interfaces 

Index: DeliveryChannelImpl.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/messaging/DeliveryChannelImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** DeliveryChannelImpl.java	28 Jun 2005 22:54:44 -0000	1.13
--- DeliveryChannelImpl.java	19 Jul 2005 03:07:14 -0000	1.14
***************
*** 266,272 ****
  	 * @see javax.jbi.messaging.DeliveryChannel#sendSynch(javax.jbi.messaging.MessageExchange)
  	 */
! 	public boolean sendSynch(MessageExchange exchange)
  			throws MessagingException {
! 		return sendSynch(exchange, Long.MAX_VALUE);
  	}
  
--- 266,272 ----
  	 * @see javax.jbi.messaging.DeliveryChannel#sendSynch(javax.jbi.messaging.MessageExchange)
  	 */
! 	public boolean sendSync(MessageExchange exchange)
  			throws MessagingException {
! 		return sendSync(exchange, Long.MAX_VALUE);
  	}
  
***************
*** 277,281 ****
  	 *      long)
  	 */
! 	public boolean sendSynch(MessageExchange exchange, long timeoutMS)
  			throws MessagingException {
  		if (isClosed) {
--- 277,281 ----
  	 *      long)
  	 */
! 	public boolean sendSync(MessageExchange exchange, long timeoutMS)
  			throws MessagingException {
  		if (isClosed) {

Index: NormalizedMessageImpl.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/messaging/NormalizedMessageImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NormalizedMessageImpl.java	8 Jun 2005 04:32:38 -0000	1.4
--- NormalizedMessageImpl.java	19 Jul 2005 03:07:14 -0000	1.5
***************
*** 5,9 ****
  import java.io.Serializable;
  import java.util.HashMap;
- import java.util.Iterator;
  import java.util.Map;
  import java.util.Set;
--- 5,8 ----
***************
*** 89,95 ****
  	 * @see javax.jbi.messaging.NormalizedMessage#getPropertyNames()
  	 */
! 	public Iterator getPropertyNames() {
  		// TODO check if a Collections.unmodifiableCollection is needed
! 		return propertiesByName.keySet().iterator();
  	}
  
--- 88,94 ----
  	 * @see javax.jbi.messaging.NormalizedMessage#getPropertyNames()
  	 */
! 	public Set getPropertyNames() {
  		// TODO check if a Collections.unmodifiableCollection is needed
! 		return propertiesByName.keySet();
  	}
  
***************
*** 99,103 ****
  	 * @see javax.jbi.messaging.NormalizedMessage#getSecurityObject()
  	 */
! 	public Subject getSecurityObject() {
  		return securityObject;
  	}
--- 98,102 ----
  	 * @see javax.jbi.messaging.NormalizedMessage#getSecurityObject()
  	 */
! 	public Subject getSecuritySubject() {
  		return securityObject;
  	}
***************
*** 106,119 ****
  	 * (non-Javadoc)
  	 * 
- 	 * @see javax.jbi.messaging.NormalizedMessage#listAttachments()
- 	 */
- 	public Iterator listAttachments() {
- 		// TODO check if a Collections.unmodifiableCollection is needed
- 		return attachmentsById.values().iterator();
- 	}
- 
- 	/*
- 	 * (non-Javadoc)
- 	 * 
  	 * @see javax.jbi.messaging.NormalizedMessage#removeAttachment(java.lang.String)
  	 */
--- 105,108 ----
***************
*** 147,151 ****
  	 * @see javax.jbi.messaging.NormalizedMessage#setSecurityObject(javax.security.auth.Subject)
  	 */
! 	public void setSecurityObject(Subject subject) {
  		this.securityObject = subject;
  	}
--- 136,140 ----
  	 * @see javax.jbi.messaging.NormalizedMessage#setSecurityObject(javax.security.auth.Subject)
  	 */
! 	public void setSecuritySubject(Subject subject) {
  		this.securityObject = subject;
  	}

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/examples/inout SoapBinding.java,1.2,1.3

[Diego E. <er...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/examples/inout
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21221/src/test/org/openbus/jbi/messaging/examples/inout

Modified Files:
	SoapBinding.java 
Log Message:
fixed problems with the reference implementation interfaces 

Index: SoapBinding.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/examples/inout/SoapBinding.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SoapBinding.java	21 Jun 2005 03:12:19 -0000	1.2
--- SoapBinding.java	19 Jul 2005 03:06:55 -0000	1.3
***************
*** 121,125 ****
  			// InOut exchange = (InOut) channel.sendSynch(inOut);
  
! 			channel.sendSynch(inOut);
  
  			process(inOut);
--- 121,125 ----
  			// InOut exchange = (InOut) channel.sendSynch(inOut);
  
! 			channel.sendSync(inOut);
  
  			process(inOut);

[Openbus-cvs-commits] Openbus/OpenbusJBI .cvsignore,NONE,1.1

[Diego E. <er...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14540

Added Files:
	.cvsignore 
Log Message:


--- NEW FILE: .cvsignore ---
target

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/java/javax/jbi/servicedesc ServiceEndpoint.java,1.2,NONE

[Esteban S. <es...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/javax/jbi/servicedesc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1126/src/java/javax/jbi/servicedesc

Removed Files:
	ServiceEndpoint.java 
Log Message:
Removing JBI spec code and adding dependency to external jbi jar (stored in our maven repo)

--- ServiceEndpoint.java DELETED ---

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/java/javax/jbi/management MBeanNames.java,1.1,NONE InstallerMBean.java,1.1,NONE LifeCycleMBean.java,1.1,NONE InstallationServiceMBean.java,1.1,NONE DeploymentServiceMBean.java,1.1,NONE DeploymentException.java,1.1,NONE AdminServiceMBean.java,1.1,NONE

[Esteban S. <es...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/javax/jbi/management
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1126/src/java/javax/jbi/management

Removed Files:
	MBeanNames.java InstallerMBean.java LifeCycleMBean.java 
	InstallationServiceMBean.java DeploymentServiceMBean.java 
	DeploymentException.java AdminServiceMBean.java 
Log Message:
Removing JBI spec code and adding dependency to external jbi jar (stored in our maven repo)

--- LifeCycleMBean.java DELETED ---

--- MBeanNames.java DELETED ---

--- InstallerMBean.java DELETED ---

--- DeploymentException.java DELETED ---

--- InstallationServiceMBean.java DELETED ---

--- DeploymentServiceMBean.java DELETED ---

--- AdminServiceMBean.java DELETED ---

[Openbus-cvs-commits] Openbus/OpenbusJBI .classpath,1.10,1.11 project.xml,1.15,1.16

[Esteban S. <es...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1126

Modified Files:
	.classpath project.xml 
Log Message:
Removing JBI spec code and adding dependency to external jbi jar (stored in our maven repo)

Index: .classpath
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/.classpath,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** .classpath	10 Jul 2005 18:31:50 -0000	1.10
--- .classpath	19 Jul 2005 01:09:17 -0000	1.11
***************
*** 1,148 ****
  <?xml version="1.0" encoding="UTF-8"?>
  <classpath>
! 	<classpathentry kind="src" path="src/java">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="src" path="src/conf">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry output="target/test-classes" kind="src" path="src/test">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/jmock/jars/jmock-1.0.1.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/xmlunit/jars/xmlunit-1.0.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/hivemind/jars/hivemind-1.0.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/hivemind/jars/hivemind-lib-1.0.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/oro/jars/oro-2.0.8.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/openbus/jars/commons-0.1.0.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/commons-beanutils/jars/commons-beanutils-1.7.0.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/commons-io/jars/commons-io-1.0.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-2.0.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-3.1.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/commons-digester/jars/commons-digester-1.6.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/commons-cli/jars/commons-cli-1.0.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/commons-configuration/jars/commons-configuration-1.1.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/xalan/jars/xalan-2.6.0.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xercesImpl-2.6.2.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/jaf/jars/activation-1.0.2.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/jta/jars/jta-1.0.1.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/jta/jars/jts-1.0.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/jms/jars/jms-1.1.0.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/mx4j/jars/mx4j-2.1.1.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/mx4j/jars/mx4j-tools-2.1.1.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/joram/jars/joram-client-4.2.0.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/joram/jars/joram-mom-4.2.0.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/joram/jars/joram-shared-4.2.0.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/monolog/jars/monolog-1.8.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.8.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/wsdl4j/jars/wsdl4j-1.4.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/jax-qname/jars/jax-qname-1.0.3.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/javassist/jars/javassist-2.6.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="var" path="MAVEN_REPO/xml-apis/jars/xml-apis-2.0.2.jar">
! 		<attributes>
! 		</attributes>
! 	</classpathentry>
! 	<classpathentry kind="output" path="target/classes"/>
! </classpath>
--- 1,80 ----
  <?xml version="1.0" encoding="UTF-8"?>
+ 
  <classpath>
!   <classpathentry excluding="" kind="src" path="src/java">
!   </classpathentry>
!   <classpathentry kind="src" path="src/conf">
!   </classpathentry>
!   <classpathentry output="target/test-classes" kind="src" path="src/test">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar">
!   </classpathentry>
!   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/jmock/jars/jmock-1.0.1.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/xmlunit/jars/xmlunit-1.0.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/hivemind/jars/hivemind-1.0.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/hivemind/jars/hivemind-lib-1.0.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/oro/jars/oro-2.0.8.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/openbus/jars/commons-0.1.0.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/commons-beanutils/jars/commons-beanutils-1.7.0.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/commons-io/jars/commons-io-1.0.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-2.0.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-3.1.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/commons-digester/jars/commons-digester-1.6.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/commons-cli/jars/commons-cli-1.0.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/commons-configuration/jars/commons-configuration-1.1.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/xalan/jars/xalan-2.6.0.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xercesImpl-2.6.2.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/jaf/jars/activation-1.0.2.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/jta/jars/jta-1.0.1.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/jta/jars/jts-1.0.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/jms/jars/jms-1.1.0.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/mx4j/jars/mx4j-2.1.1.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/mx4j/jars/mx4j-tools-2.1.1.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/joram/jars/joram-client-4.2.0.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/joram/jars/joram-mom-4.2.0.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/joram/jars/joram-shared-4.2.0.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/monolog/jars/monolog-1.8.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.8.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/wsdl4j/jars/wsdl4j-1.4.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/jax-qname/jars/jax-qname-1.0.3.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/javassist/jars/javassist-2.6.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/xml-apis/jars/xml-apis-2.0.2.jar">
!   </classpathentry>
!   <classpathentry kind="var" path="MAVEN_REPO/jbi/jars/jbi-1.0.jar">
!   </classpathentry>
!   <classpathentry kind="output" path="target/classes">
!   </classpathentry>
! </classpath>
\ No newline at end of file

Index: project.xml
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/project.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** project.xml	10 Jul 2005 18:31:50 -0000	1.15
--- project.xml	19 Jul 2005 01:09:17 -0000	1.16
***************
*** 256,259 ****
--- 256,265 ----
              <type>jar</type>
          </dependency>
+         <dependency>
+             <groupId>jbi</groupId>
+             <artifactId>jbi</artifactId>
+             <version>1.0</version>
+             <type>jar</type>
+         </dependency>
      </dependencies>
      <!-- build information for the project -->

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/java/javax/jbi JBIException.java,1.1,NONE

[Esteban S. <es...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/javax/jbi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1126/src/java/javax/jbi

Removed Files:
	JBIException.java 
Log Message:
Removing JBI spec code and adding dependency to external jbi jar (stored in our maven repo)

--- JBIException.java DELETED ---

[Openbus-cvs-commits] Openbus/OpenbusJBI/src/java/javax/jbi/messaging MessagingException.java,1.1,NONE ExchangeStatus.java,1.1,NONE DeliveryChannel.java,1.2,NONE MessageExchangeFactory.java,1.1,NONE InOptionalOut.java,1.1,NONE InOut.java,1.1,NONE InOnly.java,1.1,NONE MessageExchange.java,1.6,NONE RobustInOnly.java,1.1,NONE Fault.java,1.1,NONE NormalizedMessage.java,1.2,NONE

[Esteban S. <es...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/javax/jbi/messaging
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1126/src/java/javax/jbi/messaging

Removed Files:
	MessagingException.java ExchangeStatus.java 
	DeliveryChannel.java MessageExchangeFactory.java 
	InOptionalOut.java InOut.java InOnly.java MessageExchange.java 
	RobustInOnly.java Fault.java NormalizedMessage.java 
Log Message:
Removing JBI spec code and adding dependency to external jbi jar (stored in our maven repo)

--- InOnly.java DELETED ---

--- InOut.java DELETED ---

--- Fault.java DELETED ---

--- MessageExchangeFactory.java DELETED ---

--- ExchangeStatus.java DELETED ---

--- MessageExchange.java DELETED ---

--- InOptionalOut.java DELETED ---

--- MessagingException.java DELETED ---

--- DeliveryChannel.java DELETED ---

--- NormalizedMessage.java DELETED ---

--- RobustInOnly.java DELETED ---