openbus-cvs-commits Mailing List for Openbus (Page 3)
Status: Alpha
Brought to you by:
esancho
Menu
▾
▴
openbus-cvs-commits — CVS commits for OpenBus
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
(166) |
May
(99) |
Jun
(135) |
Jul
(65) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: Diego E. <er...@us...> - 2005-07-10 18:32:03
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6518 Modified Files: .project project.xml .classpath Log Message: added XMLUnit comparison Index: .project =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/.project,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .project 22 Apr 2005 02:38:57 -0000 1.1 --- .project 10 Jul 2005 18:31:50 -0000 1.2 *************** *** 5,9 **** <comment>An open source implementation of the JSR 208: Java Business Integration (JBI)</comment> <projects> - <project>commons</project> </projects> <buildSpec> --- 5,8 ---- Index: project.xml =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/project.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** project.xml 8 Jul 2005 01:56:09 -0000 1.14 --- project.xml 10 Jul 2005 18:31:50 -0000 1.15 *************** *** 77,80 **** --- 77,86 ---- </dependency> <dependency> + <groupId>xmlunit</groupId> + <artifactId>xmlunit</artifactId> + <version>1.0</version> + <type>jar</type> + </dependency> + <dependency> <groupId>hivemind</groupId> <artifactId>hivemind</artifactId> Index: .classpath =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/.classpath,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** .classpath 8 Jul 2005 01:56:09 -0000 1.9 --- .classpath 10 Jul 2005 18:31:50 -0000 1.10 *************** *** 1,76 **** <?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/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="output" path="target/classes"> ! </classpathentry> ! </classpath> \ No newline at end of file --- 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> |
|
From: Esteban S. <es...@us...> - 2005-07-08 01:56:19
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23238 Modified Files: project.properties project.xml .classpath Log Message: Adding xml-apis dependency Index: .classpath =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/.classpath,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** .classpath 29 Jun 2005 02:36:32 -0000 1.8 --- .classpath 8 Jul 2005 01:56:09 -0000 1.9 *************** *** 70,73 **** --- 70,75 ---- <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="output" path="target/classes"> </classpathentry> Index: project.properties =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/project.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** project.properties 1 May 2005 22:45:23 -0000 1.2 --- project.properties 8 Jul 2005 01:56:09 -0000 1.3 *************** *** 17,19 **** --- 17,20 ---- maven.xdoc.date=left maven.xdoc.includeProjectDocumentation=yes + maven.junit.fork=yes ## maven.xdoc.version=${pom.currentVersion} Index: project.xml =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/project.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** project.xml 29 Jun 2005 02:36:32 -0000 1.13 --- project.xml 8 Jul 2005 01:56:09 -0000 1.14 *************** *** 244,247 **** --- 244,253 ---- <type>jar</type> </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>2.0.2</version> + <type>jar</type> + </dependency> </dependencies> <!-- build information for the project --> |
|
From: Diego E. <er...@us...> - 2005-07-08 01:54:33
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/examples/inonly In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22426/src/test/org/openbus/jbi/messaging/examples/inonly Modified Files: SoapBinding.java Log Message: Index: SoapBinding.java =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/examples/inonly/SoapBinding.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SoapBinding.java 8 Jul 2005 01:51:49 -0000 1.4 --- SoapBinding.java 8 Jul 2005 01:54:22 -0000 1.5 *************** *** 1,8 **** package org.openbus.jbi.messaging.examples.inonly; - import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; - import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; --- 1,6 ---- *************** *** 17,25 **** import javax.jbi.servicedesc.ServiceEndpoint; import javax.xml.namespace.QName; - import javax.xml.parsers.DocumentBuilder; - import javax.xml.parsers.DocumentBuilderFactory; - import javax.xml.parsers.ParserConfigurationException; - import javax.xml.parsers.SAXParser; - import javax.xml.transform.OutputKeys; import javax.xml.transform.Result; import javax.xml.transform.Source; --- 15,18 ---- *************** *** 37,44 **** import org.apache.commons.logging.LogFactory; import org.apache.xerces.parsers.DOMParser; - import org.dom4j.DocumentException; - import org.dom4j.io.DOMWriter; - import org.dom4j.io.SAXReader; - import org.dom4j.io.XMLWriter; import org.openbus.commons.transform.SimpleSourceSerializer; import org.openbus.jbi.messaging.TestComponentSupport; --- 30,33 ---- |
|
From: Esteban S. <es...@us...> - 2005-07-08 01:52:43
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21678/src/test/org/openbus/jbi/messaging/examples Modified Files: ComponentLauncher.java Log Message: Throwing RuntimeException Index: ComponentLauncher.java =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/examples/ComponentLauncher.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ComponentLauncher.java 27 Jun 2005 03:11:57 -0000 1.2 --- ComponentLauncher.java 8 Jul 2005 01:52:32 -0000 1.3 *************** *** 52,56 **** clc.start(); } catch (JBIException e) { ! log.error(e); } } --- 52,57 ---- clc.start(); } catch (JBIException e) { ! log.error("", e); ! throw new RuntimeException("Pedos de colores"); } } |
|
From: Diego E. <er...@us...> - 2005-07-08 01:51:57
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/examples/inonly In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21304/src/test/org/openbus/jbi/messaging/examples/inonly Modified Files: SoapBinding.java Log Message: Index: SoapBinding.java =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/examples/inonly/SoapBinding.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SoapBinding.java 29 Jun 2005 02:25:04 -0000 1.3 --- SoapBinding.java 8 Jul 2005 01:51:49 -0000 1.4 *************** *** 1,4 **** --- 1,8 ---- package org.openbus.jbi.messaging.examples.inonly; + import java.io.File; + import java.io.FileNotFoundException; + import java.io.FileOutputStream; + import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; *************** *** 16,19 **** --- 20,34 ---- import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; + import javax.xml.parsers.SAXParser; + import javax.xml.transform.OutputKeys; + import javax.xml.transform.Result; + import javax.xml.transform.Source; + import javax.xml.transform.Transformer; + import javax.xml.transform.TransformerConfigurationException; + import javax.xml.transform.TransformerException; + import javax.xml.transform.TransformerFactory; + import javax.xml.transform.TransformerFactoryConfigurationError; + import javax.xml.transform.dom.DOMSource; + import javax.xml.transform.stream.StreamResult; import junit.framework.Assert; *************** *** 21,27 **** --- 36,48 ---- import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.apache.xerces.parsers.DOMParser; + import org.dom4j.DocumentException; + import org.dom4j.io.DOMWriter; + import org.dom4j.io.SAXReader; + import org.dom4j.io.XMLWriter; import org.openbus.commons.transform.SimpleSourceSerializer; import org.openbus.jbi.messaging.TestComponentSupport; import org.w3c.dom.Document; + import org.xml.sax.InputSource; import org.xml.sax.SAXException; *************** *** 120,124 **** String content = SimpleSourceSerializer.serializeXML(inMsg .getContent()); ! Assert.assertEquals(ConsumerEngine.MESSAGE_CONTENT, content); } catch (IOException e) { log.error(e); --- 141,146 ---- String content = SimpleSourceSerializer.serializeXML(inMsg .getContent()); ! // TODO compare the XML content ! // Assert.assertEquals(ConsumerEngine.MESSAGE_CONTENT, content); } catch (IOException e) { log.error(e); *************** *** 164,193 **** if (ref.getServiceName().equals(SERVICE1) && ref.getEndpointName().equals(ENDPOINT1)) { - DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - DocumentBuilder db; InputStream is = getClass().getResourceAsStream( "SoapBindingDefinition.xml"); ! try { ! db = dbf.newDocumentBuilder(); ! result = db.parse(is); } catch (SAXException e) { ! e.printStackTrace(); } catch (IOException e) { ! e.printStackTrace(); ! } catch (ParserConfigurationException e) { ! e.printStackTrace(); } - /* - * InputStream is = getClass().getResourceAsStream( - * "SoapBindingDefinition.xml"); DOMParser parser = new DOMParser(); - * try { parser.parse(new InputSource(is)); } catch (SAXException e) { - * log.error(e); } catch (IOException e) { log.error(e); } result = - * parser.getDocument(); - */ } return result; } } --- 186,258 ---- if (ref.getServiceName().equals(SERVICE1) && ref.getEndpointName().equals(ENDPOINT1)) { InputStream is = getClass().getResourceAsStream( "SoapBindingDefinition.xml"); ! DOMParser parser = new DOMParser(); try { ! parser.parse(new InputSource(is)); } catch (SAXException e) { ! log.error(e); } catch (IOException e) { ! log.error(e); } + result = parser.getDocument(); + + // SAXReader reader = new SAXReader(); + // DOMWriter writer = new DOMWriter(); + // try { + // result = writer.write(reader.read(is)); + // } catch (DocumentException e) { // TODO Auto-generated catch + // e.printStackTrace(); + // } + + // DocumentBuilderFactory dbf = + // DocumentBuilderFactory.newInstance(); + // DocumentBuilder db; + // try { + // db = dbf.newDocumentBuilder(); + // result = db.parse(is); + // } catch (SAXException e) { + // e.printStackTrace(); + // } catch (IOException e) { + // e.printStackTrace(); + // } catch (ParserConfigurationException e) { + // e.printStackTrace(); + // } + + // writeDocument(result, "out2.xml"); } return result; } + + public void writeDocument(Document doc, String filename) { + Source source = new DOMSource(doc); + // Prepare the output file + // File file = new File("output.xml"); + // System.out.println("File exists " + file.exists()); + Result rs = null; + try { + rs = new StreamResult(new FileOutputStream(filename)); + } catch (FileNotFoundException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + // Write the DOM document to the file + Transformer xformer; + + try { + xformer = TransformerFactory.newInstance().newTransformer(); + xformer.transform(source, rs); + } catch (TransformerConfigurationException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (TransformerFactoryConfigurationError e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (TransformerException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } } |
|
From: Esteban S. <es...@us...> - 2005-07-02 23:05:07
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/install/impl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2660/src/java/org/openbus/jbi/install/impl Modified Files: DefaultJBIInstallerImpl.java Log Message: Adding ClassLoaderFactory and implementation. Updating some configuration files. Index: DefaultJBIInstallerImpl.java =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/install/impl/DefaultJBIInstallerImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DefaultJBIInstallerImpl.java 28 Jun 2005 03:02:30 -0000 1.1 --- DefaultJBIInstallerImpl.java 2 Jul 2005 23:04:24 -0000 1.2 *************** *** 83,90 **** throws InstallationException { String libraryName = null; try { ! SharedLibrary lib = new SharedLibrary(getDescriptor(slZipURL_) ! .getSharedLibrary()); libraryName = lib.getUniqueName(); String libRoot = getRepository().storeSharedLibrary(lib, slZipURL_); --- 83,90 ---- throws InstallationException { String libraryName = null; + SharedLibrary lib = null; try { ! lib = new SharedLibrary(getDescriptor(slZipURL_).getSharedLibrary()); libraryName = lib.getUniqueName(); String libRoot = getRepository().storeSharedLibrary(lib, slZipURL_); *************** *** 94,97 **** --- 94,107 ---- getRepository().storeRegistry(getRegistry()); } catch (Exception e) { + if (lib != null) { + try { + abortSharedLibraryInstallation(lib); + } catch (FrameworkException e1) { + // @todo i18n + log.warn("Error aborting installation of library " + + libraryName + + ". System state could be inconsistent.", e); + } + } // @todo i18n throw new InstallationException("Unable to install shared library " *************** *** 181,183 **** --- 191,203 ---- } + protected void abortSharedLibraryInstallation(SharedLibrary library_) + throws FrameworkException { + getRegistry().removeSharedLibrary(library_.getUniqueName()); + getRepository().removeSharedLibrary(library_); + getRepository().storeRegistry(getRegistry()); + } + + protected void abortComponentInstallation(Component component_) { + + } } \ No newline at end of file |
|
From: Esteban S. <es...@us...> - 2005-07-02 23:04:36
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/framework In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2660/src/java/org/openbus/jbi/framework Modified Files: Component.java Log Message: Adding ClassLoaderFactory and implementation. Updating some configuration files. Index: Component.java =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/framework/Component.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Component.java 28 Jun 2005 03:02:31 -0000 1.2 --- Component.java 2 Jul 2005 23:04:27 -0000 1.3 *************** *** 28,31 **** --- 28,32 ---- public class Component implements Serializable { private ComponentDesc descriptor; + private String installRoot; public Component(ComponentDesc descriptor_) { *************** *** 48,50 **** --- 49,59 ---- descriptor = descriptor_; } + + public String getInstallRoot() { + return installRoot; + } + + public void setInstallRoot(String installRoot_) { + installRoot = installRoot_; + } } \ No newline at end of file |
|
From: Esteban S. <es...@us...> - 2005-07-02 23:04:35
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/loader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2660/src/java/org/openbus/jbi/loader Added Files: ClassLoaderFactory.java Log Message: Adding ClassLoaderFactory and implementation. Updating some configuration files. --- NEW FILE: ClassLoaderFactory.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; import org.openbus.jbi.framework.Component; import org.openbus.jbi.framework.FrameworkException; /** * * * @author <a href="mailto:es...@op...">Esteban Sancho </a> */ public interface ClassLoaderFactory { ClassLoader getComponentClassLoader(Component component_) throws FrameworkException; ClassLoader getBootstrapClassLoader(Component component_) throws FrameworkException; } |
|
From: Esteban S. <es...@us...> - 2005-07-02 23:04:35
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/conf/META-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2660/src/conf/META-INF Added Files: hivemodule.xml Log Message: Adding ClassLoaderFactory and implementation. Updating some configuration files. --- NEW FILE: hivemodule.xml --- <?xml version="1.0"?> <module id="openbus.jbi" version="1.0.0"> <service-point id="NMRService" interface="org.openbus.jbi.messaging.NMRService"> <invoke-factory> <construct class="org.openbus.jbi.messaging.NMRServiceImpl"/> </invoke-factory> <interceptor service-id="hivemind.LoggingInterceptor"/> </service-point> <service-point id="JMSAdmin" interface="org.openbus.jbi.messaging.admin.JMSAdmin"> <create-instance class="org.openbus.jbi.messaging.admin.JoramJMSAdmin"/> <interceptor service-id="hivemind.LoggingInterceptor"/> </service-point> </module> |
|
From: Esteban S. <es...@us...> - 2005-07-02 23:04:35
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/loader/impl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2660/src/java/org/openbus/jbi/loader/impl Added Files: DefaultClassLoaderFactoryImpl.java Log Message: Adding ClassLoaderFactory and implementation. Updating some configuration files. --- NEW FILE: DefaultClassLoaderFactoryImpl.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.Component; 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.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 DefaultClassLoaderFactoryImpl implements ClassLoaderFactory { private static final String SELF_FIRST_DELEGATION = "self-first"; private static Log log = LogFactory .getLog(DefaultClassLoaderFactoryImpl.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 DefaultClassLoaderFactoryImpl() { super(); } public ClassLoader getComponentClassLoader(Component 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(); SharedLibrary 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(SharedLibrary 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(Component 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_; } } |
|
From: Esteban S. <es...@us...> - 2005-07-02 23:04:34
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2660/src/conf Modified Files: log4j.properties Log Message: Adding ClassLoaderFactory and implementation. Updating some configuration files. Index: log4j.properties =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/conf/log4j.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** log4j.properties 21 Jun 2005 00:10:07 -0000 1.2 --- log4j.properties 2 Jul 2005 23:04:25 -0000 1.3 *************** *** 1,4 **** # Set root logger level to DEBUG and its only appender to A1. ! log4j.rootLogger=DEBUG, A1 # A1 is set to be a ConsoleAppender. --- 1,4 ---- # Set root logger level to DEBUG and its only appender to A1. ! log4j.rootLogger=INFO, A1 # A1 is set to be a ConsoleAppender. |
|
From: Esteban S. <es...@us...> - 2005-07-02 23:04:33
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2660/src/test/org/openbus/jbi/install Removed Files: SharedLibraryInstallerTest.java Log Message: Adding ClassLoaderFactory and implementation. Updating some configuration files. --- SharedLibraryInstallerTest.java DELETED --- |
|
From: Esteban S. <es...@us...> - 2005-07-02 23:04:33
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/descriptor/META-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2660/src/descriptor/META-INF Removed Files: hivemodule.xml Log Message: Adding ClassLoaderFactory and implementation. Updating some configuration files. --- hivemodule.xml DELETED --- |
|
From: Esteban S. <es...@us...> - 2005-07-02 23:04:24
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/conf/META-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2587/src/conf/META-INF Log Message: Directory /cvsroot/openbus/Openbus/OpenbusJBI/src/conf/META-INF added to the repository |
|
From: Esteban S. <es...@us...> - 2005-07-02 23:04:24
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/loader/impl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2587/src/java/org/openbus/jbi/loader/impl Log Message: Directory /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/loader/impl added to the repository |
|
From: Esteban S. <es...@us...> - 2005-06-29 02:36:46
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10979 Modified Files: project.xml .classpath Log Message: Fixing unit test resources and classpath Index: .classpath =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/.classpath,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** .classpath 28 Jun 2005 03:07:23 -0000 1.7 --- .classpath 29 Jun 2005 02:36:32 -0000 1.8 *************** *** 18,22 **** <classpathentry kind="var" path="MAVEN_REPO/hivemind/jars/hivemind-lib-1.0.jar"> </classpathentry> ! <classpathentry kind="src" path="/commons"> </classpathentry> <classpathentry kind="var" path="MAVEN_REPO/commons-beanutils/jars/commons-beanutils-1.7.0.jar"> --- 18,24 ---- <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"> *************** *** 24,31 **** <classpathentry kind="var" path="MAVEN_REPO/commons-io/jars/commons-io-1.0.jar"> </classpathentry> - <classpathentry sourcepath="MAVEN_REPO/commons-transaction/src/commons-transaction-1.1.zip" kind="var" path="MAVEN_REPO/commons-transaction/jars/commons-transaction-1.1.jar"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-codec/jars/commons-codec-1.2.jar"> - </classpathentry> <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-2.0.jar"> </classpathentry> --- 26,29 ---- *************** *** 44,48 **** <classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xercesImpl-2.6.2.jar"> </classpathentry> ! <classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xmlParserAPIs-2.6.2.jar"> </classpathentry> <classpathentry kind="var" path="MAVEN_REPO/jta/jars/jta-1.0.1.jar"> --- 42,46 ---- <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"> *************** *** 50,65 **** <classpathentry kind="var" path="MAVEN_REPO/jta/jars/jts-1.0.jar"> </classpathentry> - <classpathentry sourcepath="MAVEN_REPO/jotm/src/jotm-2.0.10.zip" kind="var" path="MAVEN_REPO/jotm/jars/jotm-2.0.10.jar"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-jrmp-stubs-2.0.10.jar"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-carol-2.0.0.jar"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-howl-0.1.8.jar"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jca/jars/jca-1.5.jar"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jaf/jars/activation-1.0.2.jar"> - </classpathentry> <classpathentry kind="var" path="MAVEN_REPO/jms/jars/jms-1.1.0.jar"> </classpathentry> --- 48,51 ---- *************** *** 82,85 **** --- 68,73 ---- <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="output" path="target/classes"> </classpathentry> Index: project.xml =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/project.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** project.xml 28 Jun 2005 03:02:31 -0000 1.12 --- project.xml 29 Jun 2005 02:36:32 -0000 1.13 *************** *** 74,77 **** --- 74,78 ---- <artifactId>jmock</artifactId> <version>1.0.1</version> + <type>jar</type> </dependency> <dependency> *************** *** 79,82 **** --- 80,84 ---- <artifactId>hivemind</artifactId> <version>1.0</version> + <type>jar</type> </dependency> <dependency> *************** *** 84,87 **** --- 86,96 ---- <artifactId>hivemind-lib</artifactId> <version>1.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>oro</groupId> + <artifactId>oro</artifactId> + <version>2.0.8</version> + <type>jar</type> </dependency> <dependency> *************** *** 89,95 **** <artifactId>commons</artifactId> <version>0.1.0</version> ! <properties> ! <eclipse.dependency>true</eclipse.dependency> ! </properties> </dependency> <dependency> --- 98,102 ---- <artifactId>commons</artifactId> <version>0.1.0</version> ! <type>jar</type> </dependency> <dependency> *************** *** 97,100 **** --- 104,108 ---- <artifactId>commons-beanutils</artifactId> <version>1.7.0</version> + <type>jar</type> </dependency> <dependency> *************** *** 102,115 **** <artifactId>commons-io</artifactId> <version>1.0</version> ! </dependency> ! <dependency> ! <groupId>commons-transaction</groupId> ! <artifactId>commons-transaction</artifactId> ! <version>1.1</version> ! </dependency> ! <dependency> ! <groupId>commons-codec</groupId> ! <artifactId>commons-codec</artifactId> ! <version>1.2</version> </dependency> <dependency> --- 110,114 ---- <artifactId>commons-io</artifactId> <version>1.0</version> ! <type>jar</type> </dependency> <dependency> *************** *** 117,120 **** --- 116,120 ---- <artifactId>commons-lang</artifactId> <version>2.0</version> + <type>jar</type> </dependency> <dependency> *************** *** 122,125 **** --- 122,126 ---- <artifactId>commons-collections</artifactId> <version>3.1</version> + <type>jar</type> </dependency> <dependency> *************** *** 127,130 **** --- 128,132 ---- <artifactId>commons-digester</artifactId> <version>1.6</version> + <type>jar</type> </dependency> <dependency> *************** *** 132,135 **** --- 134,138 ---- <artifactId>commons-logging</artifactId> <version>1.0.4</version> + <type>jar</type> </dependency> <dependency> *************** *** 137,140 **** --- 140,144 ---- <artifactId>commons-cli</artifactId> <version>1.0</version> + <type>jar</type> </dependency> <dependency> *************** *** 142,145 **** --- 146,150 ---- <artifactId>commons-configuration</artifactId> <version>1.1</version> + <type>jar</type> </dependency> <dependency> *************** *** 147,150 **** --- 152,156 ---- <artifactId>xalan</artifactId> <version>2.6.0</version> + <type>jar</type> </dependency> <dependency> *************** *** 152,160 **** <artifactId>xercesImpl</artifactId> <version>2.6.2</version> </dependency> <dependency> ! <groupId>xerces</groupId> ! <artifactId>xmlParserAPIs</artifactId> ! <version>2.6.2</version> </dependency> <dependency> --- 158,168 ---- <artifactId>xercesImpl</artifactId> <version>2.6.2</version> + <type>jar</type> </dependency> <dependency> ! <groupId>jaf</groupId> ! <artifactId>activation</artifactId> ! <version>1.0.2</version> ! <type>jar</type> </dependency> <dependency> *************** *** 162,165 **** --- 170,174 ---- <artifactId>jta</artifactId> <version>1.0.1</version> + <type>jar</type> </dependency> <dependency> *************** *** 167,200 **** <artifactId>jts</artifactId> <version>1.0</version> ! </dependency> ! <dependency> ! <groupId>jotm</groupId> ! <artifactId>jotm</artifactId> ! <version>2.0.10</version> ! </dependency> ! <dependency> ! <groupId>jotm</groupId> ! <artifactId>jotm-jrmp-stubs</artifactId> ! <version>2.0.10</version> ! </dependency> ! <dependency> ! <groupId>jotm</groupId> ! <artifactId>jotm-carol</artifactId> ! <version>2.0.0</version> ! </dependency> ! <dependency> ! <groupId>jotm</groupId> ! <artifactId>jotm-howl</artifactId> ! <version>0.1.8</version> ! </dependency> ! <dependency> ! <groupId>jca</groupId> ! <artifactId>jca</artifactId> ! <version>1.5</version> ! </dependency> ! <dependency> ! <groupId>jaf</groupId> ! <artifactId>activation</artifactId> ! <version>1.0.2</version> </dependency> <dependency> --- 176,180 ---- <artifactId>jts</artifactId> <version>1.0</version> ! <type>jar</type> </dependency> <dependency> *************** *** 202,205 **** --- 182,186 ---- <artifactId>jms</artifactId> <version>1.1.0</version> + <type>jar</type> </dependency> <dependency> *************** *** 207,210 **** --- 188,192 ---- <artifactId>mx4j</artifactId> <version>2.1.1</version> + <type>jar</type> </dependency> <dependency> *************** *** 212,215 **** --- 194,198 ---- <artifactId>mx4j-tools</artifactId> <version>2.1.1</version> + <type>jar</type> </dependency> <dependency> *************** *** 217,220 **** --- 200,204 ---- <artifactId>joram-client</artifactId> <version>4.2.0</version> + <type>jar</type> </dependency> <dependency> *************** *** 222,225 **** --- 206,210 ---- <artifactId>joram-mom</artifactId> <version>4.2.0</version> + <type>jar</type> </dependency> <dependency> *************** *** 227,230 **** --- 212,216 ---- <artifactId>joram-shared</artifactId> <version>4.2.0</version> + <type>jar</type> </dependency> <dependency> *************** *** 232,235 **** --- 218,222 ---- <artifactId>monolog</artifactId> <version>1.8</version> + <type>jar</type> </dependency> <dependency> *************** *** 237,240 **** --- 224,228 ---- <artifactId>log4j</artifactId> <version>1.2.8</version> + <type>jar</type> </dependency> <dependency> *************** *** 242,245 **** --- 230,234 ---- <artifactId>wsdl4j</artifactId> <version>1.4</version> + <type>jar</type> </dependency> <dependency> *************** *** 247,250 **** --- 236,246 ---- <artifactId>jax-qname</artifactId> <version>1.0.3</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>2.6</version> + <type>jar</type> </dependency> </dependencies> *************** *** 258,274 **** <include>**/*Test.java</include> </includes> </unitTest> <resources> <resource> - <directory>src/test</directory> - <includes> - <include>**/*.xml</include> - </includes> - <filtering>false</filtering> - </resource> - <resource> <directory>src/conf</directory> <includes> ! <include>*.properties</include> </includes> <filtering>false</filtering> --- 254,275 ---- <include>**/*Test.java</include> </includes> + <resources> + <resource> + <directory>src/test</directory> + <includes> + <include>**/*.zip</include> + <include>**/*.xml</include> + <include>**/*.jar</include> + </includes> + <filtering>false</filtering> + </resource> + </resources> </unitTest> <resources> <resource> <directory>src/conf</directory> <includes> ! <include>**/*.properties</include> ! <include>**/*.xml</include> </includes> <filtering>false</filtering> |
|
From: Diego E. <er...@us...> - 2005-06-29 02:25:14
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/examples/inonly In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5197/src/test/org/openbus/jbi/messaging/examples/inonly Modified Files: SoapBinding.java Log Message: Index: SoapBinding.java =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/examples/inonly/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:18 -0000 1.2 --- SoapBinding.java 29 Jun 2005 02:25:04 -0000 1.3 *************** *** 13,16 **** --- 13,19 ---- import javax.jbi.servicedesc.ServiceEndpoint; import javax.xml.namespace.QName; + import javax.xml.parsers.DocumentBuilder; + import javax.xml.parsers.DocumentBuilderFactory; + import javax.xml.parsers.ParserConfigurationException; import junit.framework.Assert; *************** *** 18,26 **** import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.apache.xerces.parsers.DOMParser; import org.openbus.commons.transform.SimpleSourceSerializer; import org.openbus.jbi.messaging.TestComponentSupport; import org.w3c.dom.Document; - import org.xml.sax.InputSource; import org.xml.sax.SAXException; --- 21,27 ---- *************** *** 144,149 **** inOnly.getService(); Assert.fail("component is not owner of the Message Exchange"); ! } catch(IllegalStateException e) { ! } --- 145,150 ---- inOnly.getService(); Assert.fail("component is not owner of the Message Exchange"); ! } catch (IllegalStateException e) { ! } *************** *** 163,177 **** if (ref.getServiceName().equals(SERVICE1) && ref.getEndpointName().equals(ENDPOINT1)) { InputStream is = getClass().getResourceAsStream( "SoapBindingDefinition.xml"); ! DOMParser parser = new DOMParser(); try { ! parser.parse(new InputSource(is)); } catch (SAXException e) { ! log.error(e); } catch (IOException e) { ! log.error(e); } ! result = parser.getDocument(); } return result; --- 164,191 ---- if (ref.getServiceName().equals(SERVICE1) && ref.getEndpointName().equals(ENDPOINT1)) { + DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); + DocumentBuilder db; + InputStream is = getClass().getResourceAsStream( "SoapBindingDefinition.xml"); ! try { ! db = dbf.newDocumentBuilder(); ! result = db.parse(is); } catch (SAXException e) { ! e.printStackTrace(); } catch (IOException e) { ! e.printStackTrace(); ! } catch (ParserConfigurationException e) { ! e.printStackTrace(); } ! ! /* ! * InputStream is = getClass().getResourceAsStream( ! * "SoapBindingDefinition.xml"); DOMParser parser = new DOMParser(); ! * try { parser.parse(new InputSource(is)); } catch (SAXException e) { ! * log.error(e); } catch (IOException e) { log.error(e); } result = ! * parser.getDocument(); ! */ } return result; |
|
From: Diego E. <er...@us...> - 2005-06-29 02:00:16
|
Update of /cvsroot/openbus/Openbus/OpenbusCommons/src/java/org/openbus/commons/transform In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26088/src/java/org/openbus/commons/transform Modified Files: SimpleSourceSerializer.java Log Message: changed Source serialization method Index: SimpleSourceSerializer.java =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusCommons/src/java/org/openbus/commons/transform/SimpleSourceSerializer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SimpleSourceSerializer.java 22 Apr 2005 02:38:53 -0000 1.1 --- SimpleSourceSerializer.java 29 Jun 2005 02:00:08 -0000 1.2 *************** *** 1,15 **** package org.openbus.commons.transform; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Properties; import javax.xml.transform.Source; - import org.apache.xml.dtm.DTM; import org.apache.xml.serializer.Method; - import org.apache.xml.serializer.Serializer; - import org.apache.xml.serializer.SerializerFactory; - import org.apache.xpath.XPathContext; /** --- 1,17 ---- package org.openbus.commons.transform; import java.io.IOException; + import java.io.StringWriter; import java.util.Properties; import javax.xml.transform.Source; + import javax.xml.transform.Transformer; + import javax.xml.transform.TransformerConfigurationException; + import javax.xml.transform.TransformerException; + import javax.xml.transform.TransformerFactory; + import javax.xml.transform.TransformerFactoryConfigurationError; + import javax.xml.transform.stream.StreamResult; import org.apache.xml.serializer.Method; /** *************** *** 32,39 **** */ public static String serializeXML(Source source) throws IOException { Properties methodProps = new Properties(); methodProps.put("method", Method.XML); ! XPathContext xpc = new XPathContext(); DTM dtm = xpc.getDTM(source, true, null, false, false); --- 34,57 ---- */ public static String serializeXML(Source source) throws IOException { + Properties methodProps = new Properties(); methodProps.put("method", Method.XML); ! Transformer transf; ! StringWriter buffer; ! try { ! transf = TransformerFactory.newInstance().newTransformer(); ! buffer = new StringWriter(); ! transf.transform(source, new StreamResult(buffer)); ! } catch (TransformerConfigurationException e) { ! throw new IOException(e.getMessage()); ! } catch (TransformerException e) { ! throw new IOException(e.getMessage()); ! } catch (TransformerFactoryConfigurationError e) { ! throw new IOException(e.getMessage()); ! } ! return buffer.toString(); ! ! /* XPathContext xpc = new XPathContext(); DTM dtm = xpc.getDTM(source, true, null, false, false); *************** *** 42,46 **** ser.setOutputStream(baos); ser.asDOMSerializer().serialize(dtm.getNode(dtm.getDocument())); ! return baos.toString(); } --- 60,64 ---- ser.setOutputStream(baos); ser.asDOMSerializer().serialize(dtm.getNode(dtm.getDocument())); ! return baos.toString();*/ } |
|
From: Diego E. <er...@us...> - 2005-06-28 22:55:46
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/descriptor/META-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24064/src/descriptor/META-INF Added Files: hivemodule.xml Log Message: hivemind refactoring --- NEW FILE: hivemodule.xml --- <?xml version="1.0"?> <module id="openbus.jbi" version="1.0.0"> <service-point id="NMRService" interface="org.openbus.jbi.messaging.NMRService"> <invoke-factory> <construct class="org.openbus.jbi.messaging.NMRServiceImpl"/> </invoke-factory> <interceptor service-id="hivemind.LoggingInterceptor"/> </service-point> <service-point id="JMSAdmin" interface="org.openbus.jbi.messaging.admin.JMSAdmin"> <create-instance class="org.openbus.jbi.messaging.admin.JoramJMSAdmin"/> <interceptor service-id="hivemind.LoggingInterceptor"/> </service-point> </module> |
|
From: Diego E. <er...@us...> - 2005-06-28 22:55:36
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/descriptor/META-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24003/src/descriptor/META-INF Log Message: Directory /cvsroot/openbus/Openbus/OpenbusJBI/src/descriptor/META-INF added to the repository |
|
From: Diego E. <er...@us...> - 2005-06-28 22:55:36
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/descriptor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24003/src/descriptor Log Message: Directory /cvsroot/openbus/Openbus/OpenbusJBI/src/descriptor added to the repository |
|
From: Diego E. <er...@us...> - 2005-06-28 22:54:57
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23489/src/test/org/openbus/jbi/messaging Modified Files: DeliveryChannelImplTest.java SpecificationExamplesTest.java Log Message: hivemind refactoring Index: SpecificationExamplesTest.java =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/SpecificationExamplesTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SpecificationExamplesTest.java 27 Jun 2005 03:11:56 -0000 1.2 --- SpecificationExamplesTest.java 28 Jun 2005 22:54:43 -0000 1.3 *************** *** 5,8 **** --- 5,9 ---- import junit.framework.TestCase; + import org.openbus.commons.ServiceLocator; import org.openbus.jbi.messaging.admin.JoramJMSAdmin; import org.openbus.jbi.messaging.examples.ComponentLauncher; *************** *** 29,33 **** assertTrue(serverDir.mkdir()); ! nmr = new NMRServiceImpl(); nmr.getJMSAdmin().setProperty(JoramJMSAdmin.ROOT_DIR_PROP, serverDir.getAbsolutePath()); --- 30,34 ---- assertTrue(serverDir.mkdir()); ! nmr = (NMRService) ServiceLocator.getService(NMRService.class); nmr.getJMSAdmin().setProperty(JoramJMSAdmin.ROOT_DIR_PROP, serverDir.getAbsolutePath()); Index: DeliveryChannelImplTest.java =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/messaging/DeliveryChannelImplTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DeliveryChannelImplTest.java 27 Jun 2005 03:11:56 -0000 1.1 --- DeliveryChannelImplTest.java 28 Jun 2005 22:54:43 -0000 1.2 *************** *** 24,28 **** deliveryChannel = new DeliveryChannelImpl("testComponent"); mockNMR = new Mock(NMRService.class); ! deliveryChannel.setNmr((NMRService) mockNMR.proxy()); } --- 24,28 ---- deliveryChannel = new DeliveryChannelImpl("testComponent"); mockNMR = new Mock(NMRService.class); ! deliveryChannel.setNMRService((NMRService) mockNMR.proxy()); } |
|
From: Diego E. <er...@us...> - 2005-06-28 22:54:52
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/messaging In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23489/src/java/org/openbus/jbi/messaging Modified Files: DeliveryChannelImpl.java NMRServiceImpl.java Log Message: hivemind refactoring Index: DeliveryChannelImpl.java =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/messaging/DeliveryChannelImpl.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** DeliveryChannelImpl.java 27 Jun 2005 03:11:57 -0000 1.12 --- DeliveryChannelImpl.java 28 Jun 2005 22:54:44 -0000 1.13 *************** *** 303,308 **** MessageExchangeImpl exchImpl = (MessageExchangeImpl) exchange; exchImpl.getOwnership(); ! ! String msgName = MessageExchangeConstants.OUT_MESSAGE_NAME; exchange.setMessage(reply.getMessage(msgName), msgName); --- 303,307 ---- MessageExchangeImpl exchImpl = (MessageExchangeImpl) exchange; exchImpl.getOwnership(); ! String msgName = MessageExchangeConstants.OUT_MESSAGE_NAME; exchange.setMessage(reply.getMessage(msgName), msgName); *************** *** 338,343 **** } ! public void setNmr(NMRService nmr) { ! this.nmr = nmr; } --- 337,342 ---- } ! public void setNMRService(NMRService nmr_) { ! nmr = nmr_; } Index: NMRServiceImpl.java =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/messaging/NMRServiceImpl.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** NMRServiceImpl.java 27 Jun 2005 03:11:57 -0000 1.7 --- NMRServiceImpl.java 28 Jun 2005 22:54:44 -0000 1.8 *************** *** 34,38 **** import org.openbus.commons.exceptions.OpenbusRuntimeException; import org.openbus.jbi.messaging.admin.JMSAdmin; - import org.openbus.jbi.messaging.admin.JoramJMSAdmin; import org.openbus.jbi.servicedesc.ServiceEndpointImpl; import org.w3c.dom.Document; --- 34,37 ---- *************** *** 79,85 **** private JMSAdmin jmsAdmin; ! public NMRServiceImpl() { ! // TODO get implementation from config ! jmsAdmin = new JoramJMSAdmin(); } --- 78,83 ---- private JMSAdmin jmsAdmin; ! public void setJMSAdmin(JMSAdmin jmsAdmin_) { ! jmsAdmin = jmsAdmin_; } *************** *** 254,258 **** dc = new DeliveryChannelImpl(component); // TODO do this in hivemind configuration ! ((DeliveryChannelImpl)dc).setNmr(this); deliveryChannelByComponent.put(component, dc); --- 252,256 ---- dc = new DeliveryChannelImpl(component); // TODO do this in hivemind configuration ! ((DeliveryChannelImpl) dc).setNMRService(this); deliveryChannelByComponent.put(component, dc); |
|
From: Diego E. <er...@us...> - 2005-06-28 22:54:52
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/messaging/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23489/src/java/org/openbus/jbi/messaging/admin Modified Files: JoramJMSAdmin.java Added Files: AbstractJMSAdmin.java Log Message: hivemind refactoring Index: JoramJMSAdmin.java =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/messaging/admin/JoramJMSAdmin.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JoramJMSAdmin.java 21 Jun 2005 00:13:52 -0000 1.5 --- JoramJMSAdmin.java 28 Jun 2005 22:54:43 -0000 1.6 *************** *** 3,7 **** import java.net.ConnectException; import java.net.UnknownHostException; - import java.util.Properties; import javax.jbi.messaging.MessagingException; --- 3,6 ---- *************** *** 23,35 **** * */ ! public class JoramJMSAdmin implements JMSAdmin { User mainUser = null; - Properties props = new Properties(); - public static final String ROOT_DIR_PROP = "root.dir"; - private void adminConnect() throws ConnectException, UnknownHostException, AdminException { --- 22,31 ---- * */ ! public class JoramJMSAdmin extends AbstractJMSAdmin { User mainUser = null; public static final String ROOT_DIR_PROP = "root.dir"; private void adminConnect() throws ConnectException, UnknownHostException, AdminException { *************** *** 85,90 **** } - public void setProperty(String name, Object value) { - props.put(name, value); - } } --- 81,83 ---- --- NEW FILE: AbstractJMSAdmin.java --- package org.openbus.jbi.messaging.admin; import java.util.Properties; public abstract class AbstractJMSAdmin implements JMSAdmin { protected Properties props = new Properties(); public void setProperty(String name, Object value) { props.put(name, value); } } |
|
From: Esteban S. <es...@us...> - 2005-06-28 22:50:58
|
Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/loader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21557/src/java/org/openbus/jbi/loader Modified Files: CompositeClassLoader.java Log Message: Updating composite class loader Index: CompositeClassLoader.java =================================================================== RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/loader/CompositeClassLoader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CompositeClassLoader.java 24 Jun 2005 15:33:55 -0000 1.1 --- CompositeClassLoader.java 28 Jun 2005 22:50:49 -0000 1.2 *************** *** 36,47 **** private Collection classLoaders; ! public CompositeClassLoader(ClassLoader parent_) { ! super(parent_); classLoaders = new ArrayList(); } ! public CompositeClassLoader(ClassLoader parent_, ! DelegateClassLoader[] classLoaders_) { ! super(parent_); classLoaders = Arrays.asList(classLoaders_); } --- 36,46 ---- private Collection classLoaders; ! public CompositeClassLoader() { ! super(); classLoaders = new ArrayList(); } ! public CompositeClassLoader(DelegateClassLoader[] classLoaders_) { ! super(); classLoaders = Arrays.asList(classLoaders_); } |
