[jboss-svn-commits] JBL Code SVN: r21513 - in labs/jbossesb/workspace/skeagh: commons and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 13 09:28:04 EDT 2008
Author: tfennelly
Date: 2008-08-13 09:28:04 -0400 (Wed, 13 Aug 2008)
New Revision: 21513
Added:
labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/classpath/
labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/classpath/package.html
labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/util/
labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/util/AssertArgument.java
labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/util/package.html
labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/xml/
labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/xml/XsdDOMValidator.java
labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/xml/package.html
Removed:
labs/jbossesb/workspace/skeagh/service-api/
Modified:
labs/jbossesb/workspace/skeagh/commons/pom.xml
labs/jbossesb/workspace/skeagh/jbossesb_checkstyle_checks.xml
labs/jbossesb/workspace/skeagh/pom.xml
labs/jbossesb/workspace/skeagh/runtime/pom.xml
Log:
Restructuring for API modules.
Added some utils.
Modified: labs/jbossesb/workspace/skeagh/commons/pom.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/commons/pom.xml 2008-08-13 13:06:02 UTC (rev 21512)
+++ labs/jbossesb/workspace/skeagh/commons/pom.xml 2008-08-13 13:28:04 UTC (rev 21513)
@@ -5,7 +5,7 @@
<parent>
<groupId>jboss.jbossesb</groupId>
<artifactId>jbossesb</artifactId>
- <version>5.0</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<name>JBoss ESB - Commons</name>
<groupId>jboss.jbossesb</groupId>
Copied: labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/classpath/package.html (from rev 21504, labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/serialization/package.html)
===================================================================
--- labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/classpath/package.html (rev 0)
+++ labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/classpath/package.html 2008-08-13 13:28:04 UTC (rev 21513)
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+Classpath utilities.
+
+<h2>Package Specification</h2>
+</body>
+</html>
\ No newline at end of file
Added: labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/util/AssertArgument.java
===================================================================
--- labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/util/AssertArgument.java (rev 0)
+++ labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/util/AssertArgument.java 2008-08-13 13:28:04 UTC (rev 21513)
@@ -0,0 +1,148 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., 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.
+ *
+ * (C) 2005-2006, JBoss Inc.
+ */
+package org.jboss.esb.util;
+
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * Argument assertion utilities.
+ * <p/>
+ * <b>Copied from <a href="http://www.milyn.org">milyn.org</a></b>.
+ *
+ * @author tfennelly
+ */
+public abstract class AssertArgument
+{
+ /**
+ * Private default constructor.
+ */
+ private AssertArgument()
+ {
+ }
+
+ /**
+ * Assert that the argument is not null.
+ *
+ * @param arg Argument.
+ * @param argName Argument name.
+ * @return The supplied "arg" argument.
+ * @throws IllegalArgumentException Argument is null.
+ */
+ public static Object isNotNull(final Object arg, final String argName) throws IllegalArgumentException
+ {
+ if (arg == null)
+ {
+ throw new IllegalArgumentException("null '" + argName
+ + "' arg in method call.");
+ }
+ return arg;
+ }
+
+ /**
+ * Assert that the argument is not empty.
+ *
+ * @param arg Argument.
+ * @param argName Argument name.
+ * @return The supplied "arg" argument.
+ * @throws IllegalArgumentException Argument is not null, but is empty.
+ */
+ public static String isNotEmpty(final String arg, final String argName) throws IllegalArgumentException
+ {
+ if (arg != null && arg.trim().equals(""))
+ {
+ throw new IllegalArgumentException("Not null, but empty '"
+ + argName + "' arg in method call.");
+ }
+ return arg;
+ }
+
+ /**
+ * Assert that the argument is neither null nor empty.
+ *
+ * @param arg Argument.
+ * @param argName Argument name.
+ * @return The supplied "arg" argument.
+ * @throws IllegalArgumentException Argument is null or empty.
+ */
+ public static String isNotNullAndNotEmpty(final String arg, final String argName) throws IllegalArgumentException
+ {
+ if (arg == null || arg.trim().equals(""))
+ {
+ throw new IllegalArgumentException("null or empty '" + argName
+ + "' arg in method call.");
+ }
+ return arg;
+ }
+
+ /**
+ * Assert that the argument is neither null nor empty.
+ *
+ * @param arg Argument.
+ * @param argName Argument name.
+ * @return The supplied "arg" argument.
+ * @throws IllegalArgumentException Argument is null or empty.
+ */
+ public static Collection isNotNullAndNotEmpty(final Collection arg, final String argName) throws IllegalArgumentException
+ {
+ if (arg == null || arg.isEmpty())
+ {
+ throw new IllegalArgumentException("null or empty '" + argName
+ + "' arg in method call.");
+ }
+ return arg;
+ }
+
+ /**
+ * Assert that the argument is neither null nor empty.
+ *
+ * @param arg Argument.
+ * @param argName Argument name.
+ * @return The supplied "arg" argument.
+ * @throws IllegalArgumentException Argument is null or empty.
+ */
+ public static Object[] isNotNullAndNotEmpty(final Object[] arg, final String argName) throws IllegalArgumentException
+ {
+ if (arg == null || arg.length == 0)
+ {
+ throw new IllegalArgumentException("null or empty '" + argName
+ + "' arg in method call.");
+ }
+ return arg;
+ }
+
+ /**
+ * Assert that the argument is neither null nor empty.
+ *
+ * @param arg Argument.
+ * @param argName Argument name.
+ * @return The supplied "arg" argument.
+ * @throws IllegalArgumentException Argument is null or empty.
+ */
+ public static Map isNotNullAndNotEmpty(final Map arg, final String argName) throws IllegalArgumentException
+ {
+ if (arg == null || arg.isEmpty())
+ {
+ throw new IllegalArgumentException("null or empty '" + argName
+ + "' arg in method call.");
+ }
+ return arg;
+ }
+}
Property changes on: labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/util/AssertArgument.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/util/package.html (from rev 21504, labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/serialization/package.html)
===================================================================
--- labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/util/package.html (rev 0)
+++ labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/util/package.html 2008-08-13 13:28:04 UTC (rev 21513)
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+General purpose utility classes.
+
+<h2>Package Specification</h2>
+</body>
+</html>
\ No newline at end of file
Added: labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/xml/XsdDOMValidator.java
===================================================================
--- labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/xml/XsdDOMValidator.java (rev 0)
+++ labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/xml/XsdDOMValidator.java 2008-08-13 13:28:04 UTC (rev 21513)
@@ -0,0 +1,231 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., 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.
+ *
+ * (C) 2005-2006, JBoss Inc.
+ */
+package org.jboss.esb.xml;
+
+import org.jboss.esb.classpath.ClassUtil;
+import org.jboss.esb.util.AssertArgument;
+import org.w3c.dom.*;
+import org.xml.sax.SAXException;
+
+import javax.xml.XMLConstants;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * XSD DOM Validator.
+ * <p/>
+ * <b><i>Donated by the <a href="http://milyn.codehaus.org">Milyn Project</a>.</i></b>
+ * <p/>
+ * Iterates through the document (DOM) gathering the namespaces. It validates
+ * based on the convention that the gathered namespace XSDs are provided on the
+ * classpath. It uses the namespace path (URI.getPath()), prepending it with "/META-INF"
+ * to perform a classpath resource lookup for the XSD i.e. the XSDs must be provided on
+ * the classpath below the "META-INF" package.
+ *
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+public class XsdDOMValidator
+{
+ /**
+ * The document being validated.
+ */
+ private Document document;
+ /**
+ * Docuent default namespace.
+ */
+ private URI defaultNamespace;
+ /**
+ * Full namespace list.
+ */
+ private List<URI> namespaces = new ArrayList<URI>();
+
+ /**
+ * Public vonstructor.
+ *
+ * @param document The document to be validated.
+ * @throws SAXException Unable to preprocess document for validation.
+ */
+ public XsdDOMValidator(final Document document) throws SAXException
+ {
+ AssertArgument.isNotNull(document, "document");
+ this.document = document;
+
+ // Get the default namespace...
+ String defaultNamespaceString = getDefaultNamespace(document.getDocumentElement());
+ if (defaultNamespaceString != null)
+ {
+ try
+ {
+ defaultNamespace = new URI(defaultNamespaceString);
+ } catch (URISyntaxException e)
+ {
+ throw new SAXException("Cannot validate this document with this class. Namespaces must be valid URIs. Default Namespace: '" + defaultNamespaceString + "'.", e);
+ }
+ }
+
+ // Get the full namespace list...
+ gatherNamespaces(document.getDocumentElement(), namespaces);
+ }
+
+ /**
+ * Get the default namespace.
+ *
+ * @return The default namespace.
+ */
+ public final URI getDefaultNamespace()
+ {
+ return defaultNamespace;
+ }
+
+ /**
+ * Get the full namespace list.
+ *
+ * @return The namespace list.
+ */
+ public final List<URI> getNamespaces()
+ {
+ return namespaces;
+ }
+
+ /**
+ * Validate the document against the namespaces referenced in it.
+ *
+ * @throws SAXException Validation error.
+ * @throws java.io.IOException Error reading the XSD Sources.
+ */
+ public final void validate() throws SAXException, IOException
+ {
+ // Using the namespace URI list, create the XSD Source array used to
+ // create the merged Schema instance...
+ Source[] xsdSources = new Source[namespaces.size()];
+ for (int i = 0; i < namespaces.size(); i++)
+ {
+ xsdSources[i] = getNamespaceSource(namespaces.get(i));
+ }
+
+ // Create the merged Schema instance and from that, create the Validator instance...
+ SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+ Schema schema = schemaFactory.newSchema(xsdSources);
+ Validator validator = schema.newValidator();
+
+ // Validate the document...
+ validator.validate(new DOMSource(document));
+ }
+
+ /**
+ * Get the default namespace associated with the supplied element.
+ *
+ * @param element The element to be checked.
+ * @return The default namespace, or null if none was found.
+ */
+ public static String getDefaultNamespace(final Element element)
+ {
+ NamedNodeMap attributes = element.getAttributes();
+ int attributeCount = attributes.getLength();
+
+ for (int i = 0; i < attributeCount; i++)
+ {
+ Attr attribute = (Attr) attributes.item(i);
+
+ if (XMLConstants.XMLNS_ATTRIBUTE.equals(attribute.getName()) && XMLConstants.XMLNS_ATTRIBUTE.equals(attribute.getLocalName()))
+ {
+ return attribute.getValue();
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Gather the namespaces from the supplied element and all child elements recursivelt.
+ *
+ * @param element The element to be iterated over.
+ * @param namespaceSources The list to which all found namespaces are to be added.
+ * @throws SAXException Unable to iterate the supplied element.
+ */
+ private void gatherNamespaces(final Element element, final List<URI> namespaceSources) throws SAXException
+ {
+ NamedNodeMap attributes = element.getAttributes();
+ int attributeCount = attributes.getLength();
+
+ for (int i = 0; i < attributeCount; i++)
+ {
+ Attr attribute = (Attr) attributes.item(i);
+ String namespace = attribute.getNamespaceURI();
+
+ if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(namespace))
+ {
+ try
+ {
+ namespaceSources.add(new URI(attribute.getValue()));
+ } catch (URISyntaxException e)
+ {
+ throw new SAXException("Cannot validate this document with this class. Namespaces must be valid URIs. Found Namespace: '" + attribute.getValue() + "'.", e);
+ }
+ }
+ }
+
+ NodeList childNodes = element.getChildNodes();
+ int childCount = childNodes.getLength();
+ for (int i = 0; i < childCount; i++)
+ {
+ Node child = childNodes.item(i);
+
+ if (child.getNodeType() == Node.ELEMENT_NODE)
+ {
+ gatherNamespaces((Element) child, namespaceSources);
+ }
+ }
+ }
+
+ /**
+ * Get the namespace XSD for the specified namespace.
+ * <p/>
+ * Extracts the path element from the supplied namespace URI, prefixes
+ * it with "/META-INF" and uses the result to check the classpath for the
+ * XSD Source.
+ *
+ * @param namespace The namespace URI.
+ * @return The XSD Schema Source.
+ * @throws SAXException Unable to get XSD Schema Source.
+ */
+ private Source getNamespaceSource(final URI namespace) throws SAXException
+ {
+ String resourcePath = "/META-INF" + namespace.getPath();
+ InputStream xsdStream = ClassUtil.getResourceAsStream(resourcePath, getClass());
+
+ if (xsdStream == null)
+ {
+ throw new SAXException("Failed to locate XSD resource '" + resourcePath + "' on classpath. Namespace: '" + namespace + "'.");
+ }
+
+ return new StreamSource(xsdStream);
+ }
+}
Property changes on: labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/xml/XsdDOMValidator.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/xml/package.html (from rev 21504, labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/serialization/package.html)
===================================================================
--- labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/xml/package.html (rev 0)
+++ labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/xml/package.html 2008-08-13 13:28:04 UTC (rev 21513)
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+XML Utility classes.
+
+<h2>Package Specification</h2>
+</body>
+</html>
\ No newline at end of file
Modified: labs/jbossesb/workspace/skeagh/jbossesb_checkstyle_checks.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/jbossesb_checkstyle_checks.xml 2008-08-13 13:06:02 UTC (rev 21512)
+++ labs/jbossesb/workspace/skeagh/jbossesb_checkstyle_checks.xml 2008-08-13 13:28:04 UTC (rev 21513)
@@ -36,7 +36,7 @@
<!-- Checks whether files end with a new line. -->
<!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
- <module name="NewlineAtEndOfFile"/>
+ <!-- module name="NewlineAtEndOfFile"/ -->
<!-- Checks that property files contain the same keys. -->
<!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
@@ -88,7 +88,7 @@
<!-- Checks for imports -->
<!-- See http://checkstyle.sf.net/config_import.html -->
- <module name="AvoidStarImport"/>
+ <!-- module name="AvoidStarImport"/ -->
<module name="IllegalImport"/>
<!-- defaults to sun.* packages -->
<module name="RedundantImport"/>
@@ -114,10 +114,12 @@
<module name="TypecastParenPad"/>
<module name="TabCharacter"/>
<module name="WhitespaceAfter">
- <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
+ <property name="tokens"
+ value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
</module>
<module name="WhitespaceAround">
- <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
+ <property name="tokens"
+ value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
</module>
@@ -135,12 +137,14 @@
<property name="option" value="nl"/>
</module>
<module name="NeedBraces"/>
- <module name="RightCurly"/>
+ <module name="RightCurly">
+ <property name="option" value="alone"/>
+ <property name="tokens" value="LITERAL_ELSE"/>
+ </module>
-
<!-- Checks for common coding problems -->
<!-- See http://checkstyle.sf.net/config_coding.html -->
- <module name="AvoidInlineConditionals"/>
+ <!-- module name="AvoidInlineConditionals"/ -->
<module name="DoubleCheckedLocking"/>
<!-- MY FAVOURITE -->
<module name="EmptyStatement"/>
@@ -153,7 +157,7 @@
<module name="InnerAssignment"/>
<module name="MagicNumber"/>
<module name="MissingSwitchDefault"/>
- <module name="RedundantThrows"/>
+ <!-- module name="RedundantThrows"/ -->
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
Modified: labs/jbossesb/workspace/skeagh/pom.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/pom.xml 2008-08-13 13:06:02 UTC (rev 21512)
+++ labs/jbossesb/workspace/skeagh/pom.xml 2008-08-13 13:28:04 UTC (rev 21513)
@@ -5,7 +5,7 @@
<groupId>jboss.jbossesb</groupId>
<artifactId>jbossesb</artifactId>
<packaging>pom</packaging>
- <version>5.0</version>
+ <version>5.0-SNAPSHOT</version>
<name>Jboss ESB (Base POM)</name>
<url>http://www.jboss.org/jbossesb/</url>
@@ -15,46 +15,25 @@
<modules>
<module>commons</module>
- <module>service-api</module>
+ <module>api</module>
<module>runtime</module>
</modules>
<dependencies>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- <exclusions>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
Modified: labs/jbossesb/workspace/skeagh/runtime/pom.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/pom.xml 2008-08-13 13:06:02 UTC (rev 21512)
+++ labs/jbossesb/workspace/skeagh/runtime/pom.xml 2008-08-13 13:28:04 UTC (rev 21513)
@@ -5,7 +5,7 @@
<parent>
<groupId>jboss.jbossesb</groupId>
<artifactId>jbossesb</artifactId>
- <version>5.0</version>
+ <version>5.0-SNAPSHOT</version>
</parent>
<name>JBoss ESB - Runtime</name>
<groupId>jboss.jbossesb</groupId>
More information about the jboss-svn-commits
mailing list