Author: klape
Date: 2011-06-20 18:49:01 -0400 (Mon, 20 Jun 2011)
New Revision: 14591
Modified:
stack/native/branches/jbossws-native-3.1.2/
stack/native/branches/jbossws-native-3.1.2/modules/core/
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementDoc.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaExtractor.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaValidationHelper.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java
stack/native/branches/jbossws-native-3.1.2/pom.xml
Log:
[JBPAPP-6389] Fix for schema validation with multiple imported schemas.
Property changes on: stack/native/branches/jbossws-native-3.1.2
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946
/stack/native/trunk:12502,13992,14181,14183
+ /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192
/stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946
/stack/native/trunk:12502,13992,14157,14160,14181,14183
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/core
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946
/stack/native/trunk/modules/core:12502,13992,14011,14181,14183
+
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946
/stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementDoc.java
===================================================================
---
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementDoc.java 2011-06-20
16:25:38 UTC (rev 14590)
+++
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementDoc.java 2011-06-20
22:49:01 UTC (rev 14591)
@@ -21,6 +21,7 @@
*/
package org.jboss.ws.core.soap;
+import java.io.InputStream;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -102,6 +103,7 @@
EndpointMetaData epMetaData = msgContext.getEndpointMetaData();
feature = epMetaData.getFeature(SchemaValidationFeature.class);
URL xsdURL = feature.getSchemaLocation() != null ? new
URL(feature.getSchemaLocation()) : null;
+ InputStream[] xsdStreams = null;
if (xsdURL == null)
{
URL wsdlURL = epMetaData.getServiceMetaData().getWsdlFileOrLocation();
@@ -111,7 +113,7 @@
}
else
{
- xsdURL = schemaExtractor.getSchemaUrl(wsdlURL);
+ xsdStreams = schemaExtractor.getSchemas(wsdlURL);
}
}
if (xsdURL != null)
@@ -120,6 +122,12 @@
Element xmlDOM = DOMUtils.sourceToElement(source);
new
SchemaValidationHelper(xsdURL).setErrorHandler(errorHandler).validateDocument(xmlDOM);
}
+ else //xsdStreams != null
+ {
+ ErrorHandler errorHandler = feature.getErrorHandler();
+ Element xmlDOM = DOMUtils.sourceToElement(source);
+ new
SchemaValidationHelper(xsdStreams).setErrorHandler(errorHandler).validateDocument(xmlDOM);
+ }
}
catch (RuntimeException rte)
{
@@ -129,10 +137,6 @@
{
WSException.rethrow(ex);
}
- finally
- {
- schemaExtractor.close();
- }
}
private boolean isValidationEnabled()
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaExtractor.java
===================================================================
---
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaExtractor.java 2011-06-20
16:25:38 UTC (rev 14590)
+++
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaExtractor.java 2011-06-20
22:49:01 UTC (rev 14591)
@@ -25,8 +25,16 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.FileInputStream;
import java.net.URL;
+import java.util.Map;
import java.util.List;
+import java.util.ArrayList;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
import javax.xml.namespace.QName;
@@ -35,6 +43,9 @@
import org.jboss.wsf.common.DOMWriter;
import org.jboss.wsf.common.IOUtils;
import org.w3c.dom.Element;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Node;
+import org.w3c.dom.NamedNodeMap;
/**
* Extracts the schema from a given WSDL
@@ -48,12 +59,20 @@
private static Logger log = Logger.getLogger(SchemaExtractor.class);
private File xsdFile;
+ private String path;
- public URL getSchemaUrl(URL wsdlURL) throws IOException
+ public InputStream[] getSchemas(URL wsdlURL) throws IOException
{
+ //Get the path to the WSDL
+ Pattern p = Pattern.compile("[a-zA-Z]+\\.[a-zA-Z]+$");
+ Matcher m = p.matcher(wsdlURL.getFile());
+ path = m.replaceFirst("");
+
// parse the wsdl
Element root = DOMUtils.parse(wsdlURL.openStream());
+ List<Attr> nsAttrs = getNamespaceAttrs(root);
+
// get the types element
QName typesQName = new QName(root.getNamespaceURI(), "types");
Element typesEl = DOMUtils.getFirstChildElement(root, typesQName);
@@ -77,25 +96,91 @@
}
Element schemaElement = schemaElements.get(0);
- File tmpdir = IOUtils.createTempDirectory();
- xsdFile = File.createTempFile("jbossws_schema", ".xsd",
tmpdir);
- xsdFile.deleteOnExit();
+ //Add namespace declarations from root element
+ for(Attr nsAttr : nsAttrs)
+ {
+ Attr replacedAttr = schemaElement.setAttributeNodeNS(nsAttr);
+ if(replacedAttr != null) //then put it back
+ {
+ schemaElement.setAttributeNodeNS(replacedAttr);
+ }
+ }
- OutputStreamWriter outwr = new OutputStreamWriter(new FileOutputStream(xsdFile));
+ List<InputStream> streams = new ArrayList<InputStream>();
+
+ pullImportedSchemas(schemaElement, streams);
+
+ //Add the WSDL schema to the schema array
+ ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+ OutputStreamWriter outwr = new OutputStreamWriter( outStream );
DOMWriter domWriter = new DOMWriter(outwr);
domWriter.setPrettyprint(true);
domWriter.print(schemaElement);
- outwr.close();
- return xsdFile.toURL();
+ streams.add(new ByteArrayInputStream(outStream.toByteArray()));
+
+ return streams.toArray(new InputStream[streams.size()]);
}
-
- public void close()
+
+ private List<Attr> getNamespaceAttrs(Element element)
{
- if (xsdFile != null)
+ List<Attr> nsAttrs = new ArrayList<Attr>();
+
+ NamedNodeMap nodes = element.getAttributes();
+
+ for(int i=0; i < nodes.getLength(); i++)
{
- xsdFile.delete();
- xsdFile = null;
+ Node node = nodes.item(i);
+ Attr attr = (Attr)node;
+ if(attr.getName().startsWith("xmlns"))
+ nsAttrs.add((Attr)attr.cloneNode(true));
}
+
+ return nsAttrs;
}
+
+ private void pullImportedSchemas(Element schemaElement, List<InputStream>
streams)
+ {
+ QName importQName = new QName( "http://www.w3.org/2001/XMLSchema",
"import" );
+ List<Element> importElements = DOMUtils.getChildElementsAsList(
schemaElement, importQName );
+
+ ArrayList<String> schemaLocations = new ArrayList<String>();
+ for( Element importElement : importElements )
+ {
+ String schemaLocation = importElement.getAttribute( "schemaLocation"
);
+ schemaLocations.add( schemaLocation );
+ }
+
+ ByteArrayOutputStream outStream = null;
+
+ for( int i=0; i < schemaLocations.size(); i++ )
+ {
+ String schemaLocation = schemaLocations.get( i );
+
+ try
+ {
+ FileInputStream in = new FileInputStream( path + schemaLocation );
+ outStream = new ByteArrayOutputStream();
+
+ int bt = 0;
+ while(( bt = in.read() ) != -1 )
+ {
+ outStream.write( (byte)bt );
+ }
+
+ InputStream inputStream = new ByteArrayInputStream(outStream.toByteArray());
+ inputStream.mark(0);
+
+ Element root = DOMUtils.parse(inputStream);
+ pullImportedSchemas(root, streams);
+
+ inputStream.reset();
+ streams.add(inputStream);
+ }
+ catch(IOException ioe)
+ {
+ log.warn("Error obtaining schema: " + path + schemaLocation);
+ }
+ }
+ }
}
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaValidationHelper.java
===================================================================
---
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaValidationHelper.java 2011-06-20
16:25:38 UTC (rev 14590)
+++
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaValidationHelper.java 2011-06-20
22:49:01 UTC (rev 14591)
@@ -30,6 +30,7 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import org.jboss.logging.Logger;
import org.jboss.wsf.common.DOMWriter;
import org.w3c.dom.Element;
import org.xml.sax.ErrorHandler;
@@ -44,13 +45,21 @@
public class SchemaValidationHelper
{
private URL xsdURL;
+ private InputStream[] xsdStreams;
private ErrorHandler errorHandler = new StrictlyValidErrorHandler();
+
+ private static Logger log = Logger.getLogger(SchemaValidationHelper.class);
public SchemaValidationHelper(URL xsdURL)
{
this.xsdURL = xsdURL;
}
+ public SchemaValidationHelper(InputStream[] xsdStreams)
+ {
+ this.xsdStreams = xsdStreams;
+ }
+
public SchemaValidationHelper setErrorHandler(ErrorHandler errorHandler)
{
this.errorHandler = errorHandler;
@@ -79,14 +88,23 @@
DocumentBuilder builder = getDocumentBuilder();
builder.parse(inxml);
}
-
+
private DocumentBuilder getDocumentBuilder() throws ParserConfigurationException
{
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setValidating(true);
factory.setNamespaceAware(true);
factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schema...;,
"http://www.w3.org/2001/XMLSchema");
-
factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schema...;,
xsdURL.toExternalForm());
+
+ if(xsdStreams != null)
+ {
+
factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schema...;,
xsdStreams);
+ }
+ else //use xsdURL
+ {
+
factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schema...;,
xsdURL.toExternalForm());
+ }
+
factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
DocumentBuilder builder = factory.newDocumentBuilder();
builder.setErrorHandler(errorHandler);
Property changes on:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests
___________________________________________________________________
Modified: svn:mergeinfo
-
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946
/stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14181,14183
+
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946
/stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java
===================================================================
---
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java 2011-06-20
16:25:38 UTC (rev 14590)
+++
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java 2011-06-20
22:49:01 UTC (rev 14591)
@@ -21,6 +21,7 @@
*/
package org.jboss.test.ws.jaxws.jbws1172;
+import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.URL;
@@ -60,19 +61,19 @@
public void testSchemaValidationPositive() throws Exception
{
URL wsdlURL =
getResourceURL("jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl");
- URL xsdURL = new SchemaExtractor().getSchemaUrl(wsdlURL);
+ InputStream[] xsdStreams = new SchemaExtractor().getSchemas(wsdlURL);
String inxml = "<performTest
xmlns='http://www.my-company.it/ws/my-test'><Code>1000</Code></performTest>";
- new SchemaValidationHelper(xsdURL).validateDocument(inxml);
+ new SchemaValidationHelper(xsdStreams).validateDocument(inxml);
}
public void testSchemaValidationNegative() throws Exception
{
URL wsdlURL =
getResourceURL("jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl");
- URL xsdURL = new SchemaExtractor().getSchemaUrl(wsdlURL);
+ InputStream[] xsdStreams = new SchemaExtractor().getSchemas(wsdlURL);
String inxml = "<performTest
xmlns='http://www.my-company.it/ws/my-test'><Code>2000</Code></performTest>";
try
{
- new SchemaValidationHelper(xsdURL).validateDocument(inxml);
+ new SchemaValidationHelper(xsdStreams).validateDocument(inxml);
}
catch (SAXException ex)
{
@@ -84,18 +85,19 @@
public void testEndpointWsdlValidation() throws Exception
{
URL wsdlURL = new URL("http://" + getServerHost() +
":8080/jaxws-jbws1172/noval?wsdl");
- URL xsdURL = new SchemaExtractor().getSchemaUrl(wsdlURL);
+ InputStream[] xsdStreams = new SchemaExtractor().getSchemas(wsdlURL);
String inxml = "<performTest
xmlns='http://www.my-company.it/ws/my-test'><Code>1000</Code></performTest>";
- new SchemaValidationHelper(xsdURL).validateDocument(inxml);
+ new SchemaValidationHelper(xsdStreams).validateDocument(inxml);
}
public void testValidatingClientWithExplicitSchema() throws Exception
{
URL wsdlURL =
getResourceURL("jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl");
- URL xsdURL = new SchemaExtractor().getSchemaUrl(wsdlURL);
+ //URL xsdURL = new SchemaExtractor().getSchemaUrl(wsdlURL);
Service service = Service.create(wsdlURL, SERVICE_NAME);
- SchemaValidationFeature feature = new SchemaValidationFeature(xsdURL.toString());
+ //SchemaValidationFeature feature = new
SchemaValidationFeature(xsdURL.toString());
+ SchemaValidationFeature feature = new SchemaValidationFeature();
MyTest port = service.getPort(MyTest.class, feature);
try
{
@@ -113,10 +115,11 @@
public void testValidatingClientWithErrorHandler() throws Exception
{
URL wsdlURL =
getResourceURL("jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl");
- URL xsdURL = new SchemaExtractor().getSchemaUrl(wsdlURL);
+ //URL xsdURL = new SchemaExtractor().getSchemaUrl(wsdlURL);
Service service = Service.create(wsdlURL, SERVICE_NAME);
- SchemaValidationFeature feature = new SchemaValidationFeature(xsdURL.toString());
+ //SchemaValidationFeature feature = new
SchemaValidationFeature(xsdURL.toString());
+ SchemaValidationFeature feature = new SchemaValidationFeature();
TestErrorHandler errorHandler = new TestErrorHandler();
feature.setErrorHandler(errorHandler);
Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/pom.xml 2011-06-20 16:25:38 UTC (rev
14590)
+++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2011-06-20 22:49:01 UTC (rev
14591)
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!-- ====================================================================== -->
<!-- -->
<!-- JBoss, the OpenSource J2EE webOS -->
@@ -8,31 +7,25 @@
<!-- See terms of license at
http://www.gnu.org. -->
<!-- -->
<!-- ====================================================================== -->
-
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<name>JBoss Web Services - Stack Native</name>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
<packaging>pom</packaging>
-
<version>3.1.2-SNAPSHOT</version>
-
<!-- Parent -->
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
<version>1.0.8.GA</version>
</parent>
-
<!-- Source Control Management -->
<scm>
<
connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native...
<
developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/...
<
url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/branches/jbo...
</scm>
-
<!-- Modules -->
<modules>
<module>modules/endorsed</module>
@@ -41,12 +34,11 @@
<module>modules/management</module>
<module>modules/resources</module>
</modules>
-
<!-- Properties -->
<properties>
- <jbossws.common.version>1.1.0-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.1.2-SNAPSHOT</jbossws.framework.version>
- <jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
+ <jbossws.common.version>1.1.0</jbossws.common.version>
+ <jbossws.framework.version>3.1.2</jbossws.framework.version>
+ <jbossws.spi.version>1.1.2</jbossws.spi.version>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
@@ -77,7 +69,6 @@
<xalan.version>2.7.1.patch02</xalan.version>
<xerces.version>2.9.1</xerces.version>
</properties>
-
<!-- DependencyManagement -->
<dependencyManagement>
<dependencies>
@@ -273,40 +264,40 @@
<type>sar</type>
<exclusions>
<exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-jmx</artifactId>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-jmx</artifactId>
</exclusion>
<exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-system-jmx</artifactId>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system-jmx</artifactId>
</exclusion>
<exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common</artifactId>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common</artifactId>
</exclusion>
<exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-j2ee</artifactId>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-j2ee</artifactId>
</exclusion>
<exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-j2se</artifactId>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-j2se</artifactId>
</exclusion>
<exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-system</artifactId>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-microcontainer</artifactId>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-microcontainer</artifactId>
</exclusion>
<exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxrpc</artifactId>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxrpc</artifactId>
</exclusion>
<exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-saaj</artifactId>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-saaj</artifactId>
</exclusion>
<!--
<exclusion>
@@ -367,7 +358,6 @@
</dependency>
</dependencies>
</dependencyManagement>
-
<!-- Plugins -->
<build>
<plugins>
@@ -375,9 +365,9 @@
<artifactId>maven-resources-plugin</artifactId>
<version>2.4</version>
<configuration>
- <escapeWindowsPaths>false</escapeWindowsPaths>
- </configuration>
- </plugin>
+ <escapeWindowsPaths>false</escapeWindowsPaths>
+ </configuration>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -389,10 +379,10 @@
</goals>
<configuration>
<tasks>
- <echo />
- <echo message="profile=${jbossws.integration.target}" />
- <echo message="jboss.home=${jboss.home}" />
- <echo />
+ <echo/>
+ <echo message="profile=${jbossws.integration.target}"/>
+ <echo message="jboss.home=${jboss.home}"/>
+ <echo/>
</tasks>
</configuration>
</execution>
@@ -432,7 +422,6 @@
</plugin>
</plugins>
</build>
-
<!-- Repositories -->
<repositories>
<repository>
@@ -450,10 +439,8 @@
</snapshots>
</repository>
</repositories>
-
<!-- Profiles -->
<profiles>
-
<!--
Name: bindist
Descr: Build the binary distribution
@@ -476,7 +463,6 @@
</plugins>
</build>
</profile>
-
<!--
Name: srcdist
Descr: Build the source distribution
@@ -499,7 +485,6 @@
</plugins>
</build>
</profile>
-
<!--
Name: jboss510
Descr: JBoss-5.1.0 specific options
@@ -511,7 +496,6 @@
<jboss.home>${jboss510.home}</jboss.home>
</properties>
</profile>
-
<!--
Name: jdk16
Descr: Compile with jdk1.6
@@ -534,7 +518,6 @@
</plugins>
</build>
</profile>
-
<!--
Name: smoketest
Descr: Executes the smoke tests
@@ -557,7 +540,6 @@
</plugins>
</build>
</profile>
-
<!--
Name: testsuite
Descr: Executes the testsuite
@@ -569,5 +551,4 @@
</modules>
</profile>
</profiles>
-
</project>