[jboss-svn-commits] JBL Code SVN: r32873 - in labs/jbossesb/branches/JBESB_4_7_CP/product: tools/systinet and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu May 13 10:49:12 EDT 2010
Author: kevin.conner at jboss.com
Date: 2010-05-13 10:49:11 -0400 (Thu, 13 May 2010)
New Revision: 32873
Added:
labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/Utils.java
Removed:
labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/systinet.properties
Modified:
labs/jbossesb/branches/JBESB_4_7_CP/product/build-distr.xml
labs/jbossesb/branches/JBESB_4_7_CP/product/build.xml
labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/build.xml
labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/InquiryService.java
labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/PublishService.java
Log:
Build systinet plugin jars as part of the build: JBESB-3318
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/build-distr.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/build-distr.xml 2010-05-13 14:40:33 UTC (rev 32872)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/build-distr.xml 2010-05-13 14:49:11 UTC (rev 32873)
@@ -88,7 +88,7 @@
<mkdir dir="${build.dir}/jbossesb.sar/lib"/>
<copy todir="${build.dir}/jbossesb.sar/lib">
- <fileset dir="${build.lib.dir}" includes="jbossesb*.jar" excludes="jbossesb-registry.jar"/>
+ <fileset dir="${build.lib.dir}" includes="jbossesb*.jar" excludes="jbossesb-registry.jar jbossesb-transport*.jar"/>
<!-- xbean for reading/marchalling xml for configuration, and scout -->
<fileset dir="${lib.dir}" includes="xbean*.jar"/>
<fileset dir="${lib.dir}" includes="stax-api-*.jar"/>
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/build.xml 2010-05-13 14:40:33 UTC (rev 32872)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/build.xml 2010-05-13 14:49:11 UTC (rev 32873)
@@ -153,6 +153,11 @@
<ant dir="tools/jonplugin"/>
</target>
+ <target name="org.jboss.soa.esb.systinet.build" depends="org.jboss.esb.rosetta.compile">
+ <echo message="Build Systinet jars"/>
+ <ant dir="tools/systinet"/>
+ </target>
+
<target name="dependencies.get">
<ant antfile="ivy-build.xml" />
</target>
@@ -295,7 +300,7 @@
<!-- produce a basic installation (minus docs and samples) -->
- <target name="org.jboss.esb.install" depends="org.jboss.esb.contract-web, org.jboss.esb.jar, org.jboss.soa.esb.plugin.build">
+ <target name="org.jboss.esb.install" depends="org.jboss.esb.contract-web, org.jboss.esb.jar, org.jboss.soa.esb.plugin.build, org.jboss.soa.esb.systinet.build">
<echo message="Installation directory : ${org.jboss.esb.installationdirectory}"/>
@@ -435,6 +440,7 @@
<ant dir="contract-web" target="clean"/>
<ant dir="services" target="clean"/>
<ant dir="tools/jonplugin" target="clean"/>
+ <ant dir="tools/systinet" target="clean"/>
<delete dir="${org.jboss.esb.internal.dest}"/>
<delete dir="${org.jboss.esb.internal.dest.root}"/>
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/build.xml 2010-05-13 14:40:33 UTC (rev 32872)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/build.xml 2010-05-13 14:49:11 UTC (rev 32873)
@@ -1,10 +1,13 @@
<project name="jon-build" default="deploy" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
<property name="build.dir" location="build"/>
- <property name="classes.dir" value="${build.dir}/classes"/>
- <property name="classpath.dir" location="../../../antlib"/>
+ <property name="classes.dir" location="${build.dir}/classes"/>
- <property name="soap.classes.dir" location="${basedir}/../../services/soap/build/classes"/>
+ <property name="product.dir" location="../.."/>
+ <property name="product.build.dir" location="${product.dir}/build"/>
+ <property name="product.lib.dir" location="${product.build.dir}/lib"/>
+ <property name="jbossesb.lib.dir" location="${product.build.dir}/jbossesb/lib"/>
+
<property name="esb.transport.jar.version" value="1.0"/>
<property name="esb.transport.jar.name" value="jbossesb-transport-${esb.transport.jar.version}.jar"/>
<property name="esb.transport.client.jar.name" value="jbossesb-transport-client-${esb.transport.jar.version}.jar"/>
@@ -15,17 +18,12 @@
<property name="java.dir" location="${src.dir}/java"/>
<property name="resources.dir" location="${src.dir}/resources"/>
- <property file="systinet.properties"/>
-
<target name="clean">
<delete dir="${build.dir}"/>
</target>
<path id="classpath">
- <fileset dir="/home/tcunning/jboss-4.2.2.GA/server/default/lib"
- includes="**/*.jar"/>
- <fileset dir="${systinet.reg.dir}/lib" includes="**/*.jar"/>
- <fileset dir="${systinet.reg.dir}/app/uddi" includes="**/*.jar"/>
+ <fileset dir="${product.lib.dir}" includes="servlet-api-*.jar"/>
</path>
<target name="compile-transport">
@@ -50,12 +48,9 @@
</target>
<target name="deploy" depends="jar-transport">
- <copy file="${esb.transport.jar}"
- overwrite="true"
- todir="/home/tcunning/jboss-4.2.2.GA/server/default/deploy/registry.war/WEB-INF/lib"/>
- <copy file="${esb.client.transport.jar}"
- overwrite="true"
- todir="/home/tcunning/jboss-4.2.2.GA/server/default/deploy/jbossesb.sar/lib"/>
+ <copy todir="${jbossesb.lib.dir}">
+ <fileset file="${esb.transport.jar}"/>
+ <fileset file="${esb.client.transport.jar}"/>
+ </copy>
</target>
-
</project>
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/InquiryService.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/InquiryService.java 2010-05-13 14:40:33 UTC (rev 32872)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/InquiryService.java 2010-05-13 14:49:11 UTC (rev 32873)
@@ -38,7 +38,6 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.apache.xerces.parsers.DOMParser;
import org.jboss.soa.esb.http.mock.SOAPProcessorHttpServletRequest;
import org.jboss.soa.esb.http.mock.SOAPProcessorHttpServletResponse;
import org.w3c.dom.Document;
@@ -88,11 +87,7 @@
}
private Node marshalResult(String result) throws SAXException, IOException {
- DOMParser parser = new DOMParser();
- InputStream is = new ByteArrayInputStream(result.getBytes());
- parser.parse(new InputSource(is));
-
- Document document = parser.getDocument();
+ Document document = Utils.parse(result) ;
Element docelement = document.getDocumentElement();
Node bodyNode = docelement.getFirstChild();
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/PublishService.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/PublishService.java 2010-05-13 14:40:33 UTC (rev 32872)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/PublishService.java 2010-05-13 14:49:11 UTC (rev 32873)
@@ -38,7 +38,6 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.apache.xerces.parsers.DOMParser;
import org.jboss.soa.esb.http.mock.SOAPProcessorHttpServletRequest;
import org.jboss.soa.esb.http.mock.SOAPProcessorHttpServletResponse;
import org.w3c.dom.Document;
@@ -88,11 +87,7 @@
}
private Node marshalResult(String result) throws SAXException, IOException {
- DOMParser parser = new DOMParser();
- InputStream is = new ByteArrayInputStream(result.getBytes());
- parser.parse(new InputSource(is));
-
- Document document = parser.getDocument();
+ Document document = Utils.parse(result) ;
Element docelement = document.getDocumentElement();
Node bodyNode = docelement.getFirstChild();
Added: labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/Utils.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/Utils.java (rev 0)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/Utils.java 2010-05-13 14:49:11 UTC (rev 32873)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.soa.esb.registry.rmi;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+class Utils
+{
+ private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY ;
+
+ static
+ {
+ final DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
+ docBuilderFactory.setNamespaceAware(true);
+ DOCUMENT_BUILDER_FACTORY = docBuilderFactory ;
+ }
+
+ public static Document parse(final String result)
+ throws SAXException, IOException
+ {
+ final InputSource is = new InputSource(new StringReader(result)) ;
+ final DocumentBuilder builder ;
+ try
+ {
+ builder = DOCUMENT_BUILDER_FACTORY.newDocumentBuilder() ;
+ }
+ catch (final ParserConfigurationException pce)
+ {
+ throw new SAXException("Unexpected exception obtaining document builder", pce);
+ }
+ return builder.parse(is) ;
+ }
+}
Property changes on: labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/Utils.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Deleted: labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/systinet.properties
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/systinet.properties 2010-05-13 14:40:33 UTC (rev 32872)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/tools/systinet/systinet.properties 2010-05-13 14:49:11 UTC (rev 32873)
@@ -1,2 +0,0 @@
-systinet.reg.dir=/opt/hp/registry
-jboss.home.dir=/home/tcunning/jboss-4.2.2.GA
More information about the jboss-svn-commits
mailing list