[jboss-svn-commits] JBL Code SVN: r8309 - in labs/jbossesb/trunk/product/core: listeners/src/org/jboss/soa/esb/listeners/config listeners/tests/src/org/jboss/soa/esb/listeners/config rosetta/src/org/jboss/internal/soa/esb/addressing/helpers rosetta/src/org/jboss/internal/soa/esb/util rosetta/src/org/jboss/soa/esb/addressing/eprs
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Dec 13 22:22:48 EST 2006
Author: kurt.stam at jboss.com
Date: 2006-12-13 22:22:44 -0500 (Wed, 13 Dec 2006)
New Revision: 8309
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ConfigurationController.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ESBAwareGenerator.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/GatewayGenerator.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Generator.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/MockXmlValidatorImpl.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/XmlValidator.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/XmlValidatorImpl.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/XmlValidatorUnitTest.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/EPRHelper.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java
Log:
Fixing the build, and fixing warnings
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ConfigurationController.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ConfigurationController.java 2006-12-14 00:31:39 UTC (rev 8308)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ConfigurationController.java 2006-12-14 03:22:44 UTC (rev 8309)
@@ -30,6 +30,8 @@
import java.io.StringReader;
import java.util.Date;
+import javax.xml.transform.stream.StreamSource;
+
import org.apache.log4j.Logger;
import org.jboss.soa.esb.parameters.ParamRepositoryFactory;
import org.xml.sax.InputSource;
@@ -41,7 +43,7 @@
private Logger mLogger = Logger.getLogger(this.getClass());
private boolean mIsEndRequested = false;
private String mConfigFileName;
- private InputSource mValidationInputSource;
+ private StreamSource mValidationInputSource;
private File mConfigDirectory;
private long mPreviousFileTimestamp;
/**
@@ -86,7 +88,7 @@
mLogger.warn("Could not obtain validation file " + validationFileName);
} else {
mLogger.debug("Reading validation info from " + validationFileName);
- mValidationInputSource = new InputSource(validationInputStream);
+ mValidationInputSource = new StreamSource(validationInputStream);
}
}
/**
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ESBAwareGenerator.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ESBAwareGenerator.java 2006-12-14 00:31:39 UTC (rev 8308)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ESBAwareGenerator.java 2006-12-14 03:22:44 UTC (rev 8309)
@@ -38,6 +38,7 @@
/**
* XMLBeans based configuration model instance.
*/
+ @SuppressWarnings("unused")
private XMLBeansModel model;
/**
@@ -55,6 +56,7 @@
*/
protected Document generate() throws ConfigurationException {
Document doc = YADOMUtil.createDocument();
+ @SuppressWarnings("unused")
Element root = YADOMUtil.addElement(doc, "jbossesb");
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/GatewayGenerator.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/GatewayGenerator.java 2006-12-14 00:31:39 UTC (rev 8308)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/GatewayGenerator.java 2006-12-14 03:22:44 UTC (rev 8309)
@@ -38,6 +38,7 @@
/**
* XMLBeans based configuration model instance.
*/
+ @SuppressWarnings("unused")
private XMLBeansModel model;
/**
@@ -56,6 +57,7 @@
protected Document generate() throws ConfigurationException {
Document doc = YADOMUtil.createDocument();
+ @SuppressWarnings("unused")
Element element = YADOMUtil.addElement(doc, "esb-config");
// TODO: Add the listener configuration nodes....
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Generator.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Generator.java 2006-12-14 00:31:39 UTC (rev 8308)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Generator.java 2006-12-14 03:22:44 UTC (rev 8309)
@@ -129,6 +129,7 @@
/**
* XMLBeans config model instance.
*/
+ @SuppressWarnings("unused")
private Jbossesb jbossesb;
/**
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/MockXmlValidatorImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/MockXmlValidatorImpl.java 2006-12-14 00:31:39 UTC (rev 8308)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/MockXmlValidatorImpl.java 2006-12-14 03:22:44 UTC (rev 8309)
@@ -2,6 +2,8 @@
import java.util.Collection;
+import javax.xml.transform.stream.StreamSource;
+
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
@@ -23,7 +25,7 @@
return true;
}
- public boolean validate(InputSource xmlInputSource, InputSource validationSource) throws XmlValidatorException {
+ public boolean validate(InputSource xmlInputSource, StreamSource validationSource) throws XmlValidatorException {
// TODO Auto-generated method stub
return false;
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/XmlValidator.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/XmlValidator.java 2006-12-14 00:31:39 UTC (rev 8308)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/XmlValidator.java 2006-12-14 03:22:44 UTC (rev 8309)
@@ -23,6 +23,8 @@
import java.util.Collection;
+import javax.xml.transform.stream.StreamSource;
+
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
/**
@@ -50,7 +52,7 @@
* @return boolean, true if it passed validation, false if it failed.
* @throws XmlValidatorException
*/
- public boolean validate(InputSource xmlInputSource, InputSource validationSource) throws XmlValidatorException;
+ public boolean validate(InputSource xmlInputSource, StreamSource validationSource) throws XmlValidatorException;
/**
* If the validation fails, more details can be obtained about the reasons why.
*
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/XmlValidatorImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/XmlValidatorImpl.java 2006-12-14 00:31:39 UTC (rev 8308)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/XmlValidatorImpl.java 2006-12-14 03:22:44 UTC (rev 8309)
@@ -44,14 +44,13 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
/**
* A Helper classes used to validate xml files against supplied schemas.
*
* @author $Revision$
* $Id$
*/
+ at SuppressWarnings("unchecked")
public class XmlValidatorImpl implements XmlValidator {
/**
@@ -59,12 +58,14 @@
*/
private Logger log = Logger.getLogger(this.getClass());
- private InputSource xmlSource, validationSource;
+ @SuppressWarnings("unused")
+ private InputSource xmlSource, validationSource;
/**
* The path separator
*/
- private static String SEP = System.getProperty("file.separator");
+ @SuppressWarnings("unused")
+ private static String SEP = System.getProperty("file.separator");
private boolean isValid = true;
@@ -140,7 +141,7 @@
* @return Boolean true/false indicating successful validation.
* @throws Exception Failure during validation.
*/
- public boolean validate(InputSource xmlSource, InputSource validationSource) throws XmlValidatorException {
+ public boolean validate(InputSource xmlSource, StreamSource validationSource) throws XmlValidatorException {
Schema schema = null;
@@ -156,7 +157,7 @@
}
}
else {
- schema = factory.newSchema((Source)validationSource);
+ schema = factory.newSchema(validationSource);
}
// Request validation
Validator validator = schema.newValidator();
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/XmlValidatorUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/XmlValidatorUnitTest.java 2006-12-14 00:31:39 UTC (rev 8308)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/XmlValidatorUnitTest.java 2006-12-14 03:22:44 UTC (rev 8309)
@@ -23,27 +23,39 @@
import com.sun.org.apache.xml.internal.serialize.OutputFormat;
import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
import java.io.StringWriter;
import java.util.Collection;
+
+import javax.xml.transform.stream.StreamSource;
+
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
import org.jboss.soa.esb.listeners.config.XmlValidatorImpl;
+import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
+import org.junit.BeforeClass;
+import org.junit.Test;
-import junit.framework.TestCase;
+import junit.framework.JUnit4TestAdapter;
/**
* XmlValidator unit tests.
* @author <a href="mailto:ddegroff at ddegroff.com">ddegroff at ddegroff.com</a>
*/
-public class XmlValidatorUnitTest extends TestCase {
-
- private String testXml = "jbossesb_config_01.xml";
- private InputSource inputSource = new InputSource(getClass().getResourceAsStream(testXml));
- private XmlValidatorImpl xmlValidation = new XmlValidatorImpl(inputSource);
+public class XmlValidatorUnitTest {
+
+ private static String testXml;
+ private static InputSource inputSource;
+ private static StreamSource validationSource;
+ private static XmlValidatorImpl xmlValidation;
private boolean isValid = false;
- public void testXmlOnly() throws Exception {
- isValid = xmlValidation.validate(new InputSource(getClass().getResourceAsStream(testXml)));
+ @Test
+ public void validateTestXml() throws Exception {
+ isValid = xmlValidation.validate(inputSource,validationSource);
if (isValid) {
System.err.println(testXml+" is valid");
} else {
@@ -60,7 +72,7 @@
}
}
}
-
+ @Test
public void testGetDocument() throws Exception {
Document document = xmlValidation.getXMLDocument();
if (document != null) {
@@ -73,7 +85,7 @@
System.err.println(sWriter.toString()) ;
}
}
-
+ @Test
public void testGetValidationResults() throws Exception {
if (isValid) {
@@ -90,4 +102,33 @@
}
}
}
+
+ @BeforeClass
+ public static void setup()
+ {
+ testXml = TestEnvironmentUtil.getUserDir("product")
+ + "core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml";
+ File validationFile = new File(testXml);
+ try {
+ InputStream inputStream = new FileInputStream(validationFile);
+ inputSource = new InputSource(inputStream);
+ xmlValidation = new XmlValidatorImpl(inputSource);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ String validationFileName = TestEnvironmentUtil.getUserDir("product")
+ + "etc/schemas/xml/jbossesb.xsd";
+ try {
+ validationSource = new StreamSource(validationFileName);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+
+
+ public static junit.framework.Test suite() {
+ return new JUnit4TestAdapter(XmlValidatorUnitTest.class);
+ }
+
}
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/EPRHelper.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/EPRHelper.java 2006-12-14 00:31:39 UTC (rev 8308)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/EPRHelper.java 2006-12-14 03:22:44 UTC (rev 8309)
@@ -44,7 +44,6 @@
import org.w3c.dom.Element;
import org.xml.sax.SAXException;
-import com.sun.corba.se.impl.presentation.rmi.StubFactoryProxyImpl;
import com.sun.org.apache.xml.internal.serialize.OutputFormat;
import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java 2006-12-14 00:31:39 UTC (rev 8308)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java 2006-12-14 03:22:44 UTC (rev 8309)
@@ -29,11 +29,9 @@
import java.util.List;
import org.apache.log4j.Logger;
-import org.jboss.internal.soa.esb.couriers.helpers.FtpFileHandler;
import org.jboss.soa.esb.addressing.eprs.FTPEpr;
import org.jboss.soa.esb.common.Environment;
import org.jboss.soa.esb.common.ModulePropertyManager;
-import org.jboss.soa.esb.couriers.CourierException;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.helpers.KeyValuePair;
import org.jboss.soa.esb.util.FtpClientUtil;
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java 2006-12-14 00:31:39 UTC (rev 8308)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java 2006-12-14 03:22:44 UTC (rev 8309)
@@ -31,7 +31,6 @@
import java.net.URL;
import org.jboss.soa.esb.addressing.EPR;
-import org.jboss.soa.esb.addressing.PortReference;
/**
* A helper class for using FTP style EPRs. Simply create instances of this
More information about the jboss-svn-commits
mailing list