From: <gun...@us...> - 2007-09-13 11:56:23
|
Revision: 4978 http://dcm4che.svn.sourceforge.net/dcm4che/?rev=4978&view=rev Author: gunterze Date: 2007-09-13 04:56:20 -0700 (Thu, 13 Sep 2007) Log Message: ----------- [#DCMEE-531] Replace Sun's SAAJ implementation (saaj-impl.jar) by SAAJ implemention of JBoss's WS stack Modified Paths: -------------- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/.classpath dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/build.properties.default dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/build.xml dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/xdsi/XDSIService.java Removed Paths: ------------- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/lib/saaj-api.jar dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/lib/saaj-impl.jar Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/.classpath =================================================================== --- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/.classpath 2007-09-13 11:55:15 UTC (rev 4977) +++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/.classpath 2007-09-13 11:56:20 UTC (rev 4978) @@ -1,21 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/java"/> - <classpathentry kind="src" path="/dcm4che14"/> - <classpathentry kind="src" path="/dcm4jboss-ejb"/> - <classpathentry kind="var" path="JBOSS_HOME/lib/concurrent.jar"/> - <classpathentry kind="var" path="JBOSS_HOME/lib/jboss-common.jar" sourcepath="/JBOSS_SRC/system/src/main"/> - <classpathentry kind="var" path="JBOSS_HOME/lib/jboss-jmx.jar" sourcepath="/JBOSS_SRC/jmx/src/main"/> - <classpathentry kind="var" path="JBOSS_HOME/lib/jboss-system.jar" sourcepath="/JBOSS_SRC/system/src/main"/> - <classpathentry kind="var" path="JBOSS_HOME/server/default/lib/jboss-j2ee.jar"/> - <classpathentry kind="var" path="JBOSS_HOME/server/default/lib/jbosssx.jar" sourcepath="/JBOSS_SRC/security/src/main"/> - <classpathentry kind="var" path="JBOSS_HOME/server/default/lib/mail.jar"/> - <classpathentry kind="var" path="JBOSS_HOME/server/default/lib/activation.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="lib/commons-compress-20050911.jar"/> - <classpathentry exported="true" kind="lib" path="lib/saaj-api.jar"/> - <classpathentry exported="true" kind="lib" path="lib/saaj-impl.jar"/> - <classpathentry exported="true" kind="lib" path="lib/dcm4che-audit-2.0.11.jar"/> - <classpathentry kind="var" path="JBOSS_HOME/server/default/lib/javax.servlet.jar"/> - <classpathentry kind="output" path="target/classes"/> + <classpathentry path="src/java" kind="src"/> + <classpathentry path="/dcm4che14" kind="src"/> + <classpathentry path="/dcm4jboss-ejb" kind="src"/> + <classpathentry path="JBOSS_HOME/lib/concurrent.jar" kind="var"/> + <classpathentry sourcepath="/JBOSS_SRC/system/src/main" path="JBOSS_HOME/lib/jboss-common.jar" kind="var"/> + <classpathentry sourcepath="/JBOSS_SRC/jmx/src/main" path="JBOSS_HOME/lib/jboss-jmx.jar" kind="var"/> + <classpathentry sourcepath="/JBOSS_SRC/system/src/main" path="JBOSS_HOME/lib/jboss-system.jar" kind="var"/> + <classpathentry path="JBOSS_HOME/server/default/lib/jboss-j2ee.jar" kind="var"/> + <classpathentry sourcepath="/JBOSS_SRC/security/src/main" path="JBOSS_HOME/server/default/lib/jbosssx.jar" kind="var"/> + <classpathentry path="JBOSS_HOME/server/default/lib/mail.jar" kind="var"/> + <classpathentry path="JBOSS_HOME/server/default/lib/activation.jar" kind="var"/> + <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/> + <classpathentry path="lib/commons-compress-20050911.jar" kind="lib"/> + <classpathentry path="lib/dcm4che-audit-2.0.11.jar" exported="true" kind="lib"/> + <classpathentry path="JBOSS_HOME/server/default/lib/servlet-api.jar" kind="var"/> + <classpathentry path="JBOSS_HOME/server/default/lib/jboss-saaj.jar" kind="var"/> + <classpathentry path="target/classes" kind="output"/> </classpath> Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/build.properties.default =================================================================== --- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/build.properties.default 2007-09-13 11:55:15 UTC (rev 4977) +++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/build.properties.default 2007-09-13 11:56:20 UTC (rev 4978) @@ -5,7 +5,7 @@ dcm4chee-ejb.home=../dcm4jboss-ejb #Override with your JBoss dist location -jboss.home=${user.home}/jboss-4.0.5.GA +jboss.home=${user.home}/jboss-4.2.1.GA #Override with your FOP dist location fop.home=${user.home}/fop-0.20.5 Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/build.xml =================================================================== --- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/build.xml 2007-09-13 11:55:15 UTC (rev 4977) +++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/build.xml 2007-09-13 11:56:20 UTC (rev 4978) @@ -31,7 +31,7 @@ <property name="dcm4chee-ejb.src" value="${dcm4chee-ejb.home}/src"/> <!-- Override with your JBoss/Web server bundle dist location --> - <property name="jboss.home" value="${user.home}/jboss-4.0.5.GA"/> + <property name="jboss.home" value="${user.home}/jboss-4.2.1.GA"/> <property name="jboss.server" value="${jboss.home}/server"/> <property name="jboss.server.home" value="${jboss.home}/server/default"/> <property name="jboss.deploy" value="${jboss.server.home}/deploy"/> @@ -44,8 +44,6 @@ <pathelement location="${dcm4chee-ejb.target}/hsql/deploy/dcm4chee-ejb-hsql.jar"/> <pathelement location="${lib.dir}/commons-compress-20050911.jar"/> <pathelement location="${lib.dir}/commons-net-1.4.1.jar"/> - <pathelement location="${lib.dir}/saaj-impl.jar"/> - <pathelement location="${lib.dir}/saaj-api.jar"/> <pathelement location="${lib.dir}/dcm4che-audit-2.0.11.jar"/> <pathelement location="${jboss.home}/bin/"/> <pathelement location="${jboss.home}/client/jmx-rmi-connector-client.jar"/> Deleted: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/lib/saaj-api.jar =================================================================== (Binary files differ) Deleted: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/lib/saaj-impl.jar =================================================================== (Binary files differ) Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/xdsi/XDSIService.java =================================================================== --- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/xdsi/XDSIService.java 2007-09-13 11:55:15 UTC (rev 4977) +++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/xdsi/XDSIService.java 2007-09-13 11:56:20 UTC (rev 4978) @@ -118,7 +118,7 @@ import org.w3c.dom.NodeList; import org.xml.sax.SAXException; -import com.sun.xml.messaging.saaj.util.JAXMStreamSource; +//import com.sun.xml.messaging.saaj.util.JAXMStreamSource; /** * @author fra...@gw... @@ -150,8 +150,6 @@ private static Logger log = Logger.getLogger(XDSIService.class.getName()); - private DocumentBuilderFactory dbFactory; - private String testPath; @@ -1208,23 +1206,23 @@ try { NodeList nl; NodeList errors; - try { +// try { SOAPBody body = response.getSOAPBody(); log.debug("SOAPBody:"+body ); nl = body.getElementsByTagName("RegistryResponse"); errors = body.getElementsByTagName("RegistryError"); - } catch ( Throwable t) { - log.warn("Retrieve of SOAPBody failed! Try to get RegistryResponse directly from SOAPMessage!"); - log.debug("SOAPBody Failure:",t); - JAXMStreamSource src = (JAXMStreamSource) response.getSOAPPart().getContent(); - DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); - dbFactory.setNamespaceAware(true); - DocumentBuilder builder = dbFactory.newDocumentBuilder(); - Document d = builder.parse( src.getInputStream() ); - nl = d.getElementsByTagName("RegistryResponse"); - log.debug("Fallback RegistryResponse NodeList:"+nl); - errors = d.getElementsByTagName("RegistryError"); - } +// } catch ( Throwable t) { +// log.warn("Retrieve of SOAPBody failed! Try to get RegistryResponse directly from SOAPMessage!"); +// log.debug("SOAPBody Failure:",t); +// JAXMStreamSource src = (JAXMStreamSource) response.getSOAPPart().getContent(); +// DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); +// dbFactory.setNamespaceAware(true); +// DocumentBuilder builder = dbFactory.newDocumentBuilder(); +// Document d = builder.parse( src.getInputStream() ); +// nl = d.getElementsByTagName("RegistryResponse"); +// log.debug("Fallback RegistryResponse NodeList:"+nl); +// errors = d.getElementsByTagName("RegistryError"); +// } if ( nl.getLength() != 0 ) { Node n = nl.item(0); String status = n.getAttributes().getNamedItem("status").getNodeValue(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |