You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by jo...@apache.org on 2006/08/10 21:10:21 UTC
svn commit: r430488 - in /webservices/commons/trunk/modules/axiom: ./
modules/ modules/axiom-api/ modules/axiom-api/src/
modules/axiom-api/src/main/ modules/axiom-api/src/main/java/
modules/axiom-api/src/main/java/org/ modules/axiom-api/src/main/java/o...
Author: jochen
Date: Thu Aug 10 12:10:16 2006
New Revision: 430488
URL: http://svn.apache.org/viewvc?rev=430488&view=rev
Log:
Splitting the project into modules axiom-api, axiom-impl and axiom-dom.
Added:
webservices/commons/trunk/modules/axiom/.classpath
webservices/commons/trunk/modules/axiom/.project
webservices/commons/trunk/modules/axiom/TODO-m2.txt
webservices/commons/trunk/modules/axiom/modules/
webservices/commons/trunk/modules/axiom/modules/axiom-api/ (with props)
webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/
- copied from r430345, webservices/commons/trunk/modules/axiom/src/org/
webservices/commons/trunk/modules/axiom/modules/axiom-dom/ (with props)
webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/
- copied from r430345, webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/
- copied from r430345, webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/
webservices/commons/trunk/modules/axiom/modules/axiom-impl/ (with props)
webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/
- copied from r430345, webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/
- copied from r430345, webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/
webservices/commons/trunk/modules/axiom/modules/axiom-tests/ (with props)
webservices/commons/trunk/modules/axiom/modules/axiom-tests/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/
- copied from r430345, webservices/commons/trunk/modules/axiom/test/org/
webservices/commons/trunk/modules/axiom/modules/axiom-tests/test-resources/
- copied from r430345, webservices/commons/trunk/modules/axiom/test-resources/
webservices/commons/trunk/modules/axiom/modules/axiom-tests/test-resources/xml/spaces2.xml
Removed:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/dom/
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/llom/
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/dom/
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/llom/
webservices/commons/trunk/modules/axiom/src/
webservices/commons/trunk/modules/axiom/test/
webservices/commons/trunk/modules/axiom/test-resources/
webservices/commons/trunk/modules/axiom/xdocs/OMTutorial.html
webservices/commons/trunk/modules/axiom/xdocs/download.cgi
webservices/commons/trunk/modules/axiom/xdocs/download.xml
webservices/commons/trunk/modules/axiom/xdocs/images/
webservices/commons/trunk/modules/axiom/xdocs/index.html
webservices/commons/trunk/modules/axiom/xdocs/navigation.xml
webservices/commons/trunk/modules/axiom/xdocs/svn.html
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/SpacesTest.java
webservices/commons/trunk/modules/axiom/pom.xml
webservices/commons/trunk/modules/axiom/project.properties
Added: webservices/commons/trunk/modules/axiom/.classpath
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/.classpath?rev=430488&view=auto
==============================================================================
--- webservices/commons/trunk/modules/axiom/.classpath (added)
+++ webservices/commons/trunk/modules/axiom/.classpath Thu Aug 10 12:10:16 2006
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry path="modules/axiom-api/src/main/java" kind="src"/>
+ <classpathentry path="modules/axiom-impl/src/main/java" kind="src"/>
+ <classpathentry path="modules/axiom-dom/src/main/java" kind="src"/>
+ <classpathentry path="modules/axiom-tests/src/test/java" kind="src"/>
+ <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>
+ <classpathentry path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" kind="con"/>
+ <classpathentry path="bin" kind="output"/>
+</classpath>
Added: webservices/commons/trunk/modules/axiom/.project
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/.project?rev=430488&view=auto
==============================================================================
--- webservices/commons/trunk/modules/axiom/.project (added)
+++ webservices/commons/trunk/modules/axiom/.project Thu Aug 10 12:10:16 2006
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>axiom</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: webservices/commons/trunk/modules/axiom/TODO-m2.txt
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/TODO-m2.txt?rev=430488&view=auto
==============================================================================
--- webservices/commons/trunk/modules/axiom/TODO-m2.txt (added)
+++ webservices/commons/trunk/modules/axiom/TODO-m2.txt Thu Aug 10 12:10:16 2006
@@ -0,0 +1,7 @@
+TODO list for completing build with Maven 2:
+============================================
+
+* Create axiom.jar (bundle of axiom-api.jar, axiom-dom.jar and
+ axiom-impl.jar) or decide to drop it.
+* Add LICENSE and NOTICE files to the generated jar files.
+ See http://jira.codehaus.org/browse/MJAR-42.
Propchange: webservices/commons/trunk/modules/axiom/modules/axiom-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 10 12:10:16 2006
@@ -0,0 +1 @@
+target
Added: webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml?rev=430488&view=auto
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml (added)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml Thu Aug 10 12:10:16 2006
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <parent>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-parent</artifactId>
+ <version>SNAPSHOT</version> <!-- Should better be ${axiom.version} -->
+ </parent>
+ <artifactId>axiom-api</artifactId>
+ <name>Axiom API</name>
+ <description>The Axiom API</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Propchange: webservices/commons/trunk/modules/axiom/modules/axiom-dom/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 10 12:10:16 2006
@@ -0,0 +1 @@
+target
Added: webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml?rev=430488&view=auto
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml (added)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml Thu Aug 10 12:10:16 2006
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <parent>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-parent</artifactId>
+ <version>SNAPSHOT</version> <!-- Should better be ${axiom.version} -->
+ </parent>
+ <artifactId>axiom-dom</artifactId>
+ <name>Axiom DOM</name>
+ <description>The Axiom DOM implementation.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Propchange: webservices/commons/trunk/modules/axiom/modules/axiom-impl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 10 12:10:16 2006
@@ -0,0 +1 @@
+target
Added: webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml?rev=430488&view=auto
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml (added)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml Thu Aug 10 12:10:16 2006
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <parent>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-parent</artifactId>
+ <version>SNAPSHOT</version> <!-- Should better be ${axiom.version} -->
+ </parent>
+ <artifactId>axiom-impl</artifactId>
+ <name>Axiom Impl</name>
+ <description>The Axiom default implementation.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Propchange: webservices/commons/trunk/modules/axiom/modules/axiom-tests/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 10 12:10:16 2006
@@ -0,0 +1 @@
+target
Added: webservices/commons/trunk/modules/axiom/modules/axiom-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/pom.xml?rev=430488&view=auto
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-tests/pom.xml (added)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-tests/pom.xml Thu Aug 10 12:10:16 2006
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <parent>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-parent</artifactId>
+ <version>SNAPSHOT</version> <!-- Should better be ${axiom.version} -->
+ </parent>
+ <artifactId>axiom-tests</artifactId>
+ <name>Axiom Test Suite</name>
+ <description>
+ The Axiom test suite. This ought to be split into several parts and be made
+ a part of axiom-api, axiom-impl and axiom-dom. However, that's not as easy
+ as it seems. The intention is to start with axiom-test and continuosly move
+ parts to the actual projects.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>2.9.3</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/SpacesTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/SpacesTest.java?rev=430488&r1=430345&r2=430488&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/SpacesTest.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/SpacesTest.java Thu Aug 10 12:10:16 2006
@@ -16,6 +16,20 @@
package org.apache.axiom.om;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Iterator;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.impl.llom.factory.OMXMLBuilderFactory;
import org.custommonkey.xmlunit.Diff;
@@ -24,27 +38,14 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
public class SpacesTest extends XMLTestCase {
- private String filePath = "test-resources/xml/spaces.xml";
+ private static final String filePath = "test-resources/xml/spaces.xml";
+ private static final String filePath2 = "test-resources/xml/spaces2.xml";
private OMElement rootElement;
- protected void setUp() throws Exception {
- }
-
public void testCData() throws Exception {
checkOMConformance(new FileInputStream(filePath));
}
@@ -59,6 +60,8 @@
iStream));
staxOMBuilder.setDoDebug(true);
rootElement = staxOMBuilder.getDocumentElement();
+ boolean hasCDataNode = hasCDataNode(rootElement);
+ String file = hasCDataNode ? filePath : filePath2;
ByteArrayOutputStream baos = new ByteArrayOutputStream();
((OMDocument) rootElement.getParent()).serialize(baos);
@@ -66,9 +69,8 @@
InputSource resultXML = new InputSource(new InputStreamReader(
new ByteArrayInputStream(baos.toByteArray())));
- Document dom1 = newDocument(new InputSource(new FileInputStream(filePath)));
+ Document dom1 = newDocument(new InputSource(new FileInputStream(file)));
Document dom2 = newDocument(resultXML);
-
Diff diff = compareXML(dom1, dom2);
assertXMLEqual(diff, true);
} catch (XMLStreamException e) {
@@ -84,6 +86,24 @@
fail(e.getMessage());
throw new Exception(e);
}
+ }
+
+ private boolean hasCDataNode(OMNode pNode) {
+ switch (pNode.getType()) {
+ case OMNode.CDATA_SECTION_NODE:
+ return true;
+ case OMNode.ELEMENT_NODE:
+ OMElement e = (OMElement) pNode;
+ for (Iterator iter = e.getChildren(); iter.hasNext(); ) {
+ if (hasCDataNode((OMNode) iter.next())) {
+ return true;
+ }
+ }
+ break;
+ default:
+ break;
+ }
+ return false;
}
public Document newDocument(InputSource in)
Added: webservices/commons/trunk/modules/axiom/modules/axiom-tests/test-resources/xml/spaces2.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/test-resources/xml/spaces2.xml?rev=430488&view=auto
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-tests/test-resources/xml/spaces2.xml (added)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-tests/test-resources/xml/spaces2.xml Thu Aug 10 12:10:16 2006
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<foo>
+ <bar>baz
+ <cheese id="3"/>
+ baz
+ <cheese/>
+ baz
+ </bar>
+ <doc><foo></doc>
+</foo>
\ No newline at end of file
Modified: webservices/commons/trunk/modules/axiom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/pom.xml?rev=430488&r1=430487&r2=430488&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/pom.xml Thu Aug 10 12:10:16 2006
@@ -1,9 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?><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">
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
- <groupId>org.apache.ws.commons</groupId>
- <artifactId>axiom</artifactId>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-parent</artifactId>
<name>Axiom</name>
- <version>SNAPSHOT</version>
+ <version>SNAPSHOT</version> <!-- Should better be ${axiom.version} -->
+ <packaging>pom</packaging>
<description>AXIOM API</description>
<url>http://ws.apache.org/commons/axiom/</url>
<issueManagement>
@@ -20,6 +25,15 @@
</notifier>
</notifiers>
</ciManagement>
+ <mailingLists>
+ <mailingList>
+ <name>WS Commons Developers</name>
+ <subscribe>commons-dev-subscribe@ws.apache.org</subscribe>
+ <unsubscribe>commons-dev-unsubscribe@ws.apache.org</unsubscribe>
+ <post>commons-dev@ws.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/ws-commons-dev/</archive>
+ </mailingList>
+ </mailingLists>
<inceptionYear>2004</inceptionYear>
<developers>
<developer>
@@ -159,8 +173,19 @@
<name>Chinthaka Thilakarathne</name>
<email/>
<organization>Lanka Software Foundation / University of Moratuwa</organization>
+ </contributor>
+ <contributor>
+ <name>Jochen Wiedmann</name>
+ <email>jochen.wiedmann AT gmail.com</email>
</contributor>
</contributors>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom</developerConnection>
@@ -170,81 +195,6 @@
<name>Apache Software Foundation</name>
<url>http://www.apache.org/</url>
</organization>
- <build>
- <sourceDirectory>src</sourceDirectory>
- <testSourceDirectory>test</testSourceDirectory>
- <resources>
- <resource>
- <directory>src</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- <excludes>
- <exclude>**/package.html</exclude>
- </excludes>
- </resource>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>${basedir}</directory>
- <includes>
- <include>LICENSE*</include>
- </includes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>test-resources</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.xsd</include>
- </includes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>once</forkMode>
- <childDelegation>false</childDelegation>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <excludes>
- <exclude>**/*SpacesTest.java</exclude>
- <exclude>**/*AbstractOMSerializationTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <siteDirectory>${basedir}/site</siteDirectory>
- <resourcesDirectory>${basedir}/site/resources</resourcesDirectory>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-one-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>install-maven-one-repository</goal>
- <goal>deploy-maven-one-repository</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <remoteRepositoryId>apache</remoteRepositoryId>
- <remoteRepositoryUrl>scp://people.apache.org/www/cvs.apache.org/repository</remoteRepositoryUrl>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.apache.org/repos/asf/webservices/commons/tags/axiom</tagBase>
- </configuration>
- </plugin>
- </plugins>
- </build>
<profiles>
<profile>
<id>release</id>
@@ -256,10 +206,10 @@
</activation>
<build>
<plugins>
-<!--
- Commented out, because the descriptor files are missing.
<plugin>
+ <inherited>false</inherited>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.1</version>
<executions>
<execution>
<id>src-assembly</id>
@@ -268,10 +218,9 @@
<goal>assembly</goal>
</goals>
<configuration>
- <descriptor>assembly-src.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
<finalName>axiom-${project.version}</finalName>
- <outputDirectory>target/src-package</outputDirectory>
- <workDirectory>target/assembly/work</workDirectory>
+ <tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
<execution>
@@ -281,15 +230,13 @@
<goal>assembly</goal>
</goals>
<configuration>
- <descriptor>assembly-bin.xml</descriptor>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
<finalName>axiom-${project.version}</finalName>
- <outputDirectory>target/src-package</outputDirectory>
- <workDirectory>target/assembly/work</workDirectory>
+ <tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
</executions>
</plugin>
--->
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
@@ -304,6 +251,14 @@
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.3</source>
+ <target>1.3</target>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
@@ -344,74 +299,105 @@
</releases>
</pluginRepository>
</pluginRepositories>
- <dependencies>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <exclusions>
- <exclusion>
- <artifactId>avalon-framework</artifactId>
- <groupId>avalon-framework</groupId>
- </exclusion>
- <exclusion>
- <artifactId>logkit</artifactId>
- <groupId>logkit</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>2.9.3</version>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1-beta-8</version>
- <exclusions>
- <exclusion>
- <artifactId>dom4j</artifactId>
- <groupId>dom4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xom</artifactId>
- <groupId>xom</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jdom</artifactId>
- <groupId>jdom</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>avalon-framework</artifactId>
+ <groupId>avalon-framework</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>logkit</artifactId>
+ <groupId>logkit</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>2.9.3</version>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1-beta-8</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>dom4j</artifactId>
+ <groupId>dom4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xom</artifactId>
+ <groupId>xom</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jdom</artifactId>
+ <groupId>jdom</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<reporting>
<plugins>
<plugin>
+ <inherited>false</inherited>
<artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-changes-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
@@ -426,6 +412,10 @@
<artifactId>jxr-maven-plugin</artifactId>
<version>2.0-beta-2-SNAPSHOT</version>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <inherited>false</inherited>
+ </plugin>
</plugins>
</reporting>
<distributionManagement>
@@ -444,4 +434,13 @@
<url>scpexe://people.apache.org/www/ws.apache.org/commons/axiom</url>
</site>
</distributionManagement>
-</project>
\ No newline at end of file
+ <modules>
+ <module>modules/axiom-api</module>
+ <module>modules/axiom-impl</module>
+ <module>modules/axiom-dom</module>
+ <module>modules/axiom-tests</module>
+ </modules>
+ <properties>
+ <axiom.version>SNAPSHOT</axiom.version>
+ </properties>
+</project>
Modified: webservices/commons/trunk/modules/axiom/project.properties
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/project.properties?rev=430488&r1=430487&r2=430488&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/project.properties (original)
+++ webservices/commons/trunk/modules/axiom/project.properties Thu Aug 10 12:10:16 2006
@@ -69,7 +69,7 @@
maven.xdoc.version=${pom.currentVersion}
maven.xdoc.includeProjectDocumentation=no
maven.html2xdoc.enabled=true
-maven.html2xdoc.dir=./xdocs
+maven.html2xdoc.dir=src/site/xdoc
maven.pdf.navigationFile=navigation-pdf.xml
maven.allreports.disable=true
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: commons-dev-help@ws.apache.org