Author: veithen
Date: Sat Jul 12 11:28:04 2014
New Revision: 1609904
URL: http://svn.apache.org/r1609904
Log:
Add modules for
* core aspects that don't depend on the Axiom object model API;
* pure DOM aspects.
They may be used in the future to build a pure DOM (and maybe a pure SAAJ)
implementation.
Added:
webservices/axiom/trunk/aspects/ (with props)
webservices/axiom/trunk/aspects/core-aspects/ (with props)
webservices/axiom/trunk/aspects/core-aspects/pom.xml (with props)
webservices/axiom/trunk/aspects/core-aspects/src/
webservices/axiom/trunk/aspects/core-aspects/src/main/
webservices/axiom/trunk/aspects/core-aspects/src/main/java/
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNode.java
- copied, changed from r1609770,
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreChildNode.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNodeSupport.aj
- copied, changed from r1609770,
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreChildNodeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java
- copied, changed from r1609263,
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreParentNode.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNodeSupport.aj
- copied, changed from r1609263,
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreParentNodeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferringParentNode.java
- copied, changed from r1609263,
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/DeferringParentNode.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferringParentNodeSupport.aj
- copied, changed from r1609263,
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/DeferringParentNodeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NonDeferringParentNode.java
- copied, changed from r1609263,
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/NonDeferringParentNode.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NonDeferringParentNodeSupport.aj
- copied, changed from r1609263,
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/NonDeferringParentNodeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/resources/
webservices/axiom/trunk/aspects/dom-aspects/ (with props)
webservices/axiom/trunk/aspects/dom-aspects/pom.xml (with props)
webservices/axiom/trunk/aspects/dom-aspects/src/
webservices/axiom/trunk/aspects/dom-aspects/src/main/
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMChildNode.java
- copied, changed from r1609770,
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMChildNode.java
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMChildNodeSupport.aj
- copied, changed from r1609770,
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMChildNodeSupport.aj
webservices/axiom/trunk/aspects/dom-aspects/src/main/resources/
webservices/axiom/trunk/aspects/dom-aspects/src/test/
webservices/axiom/trunk/aspects/dom-aspects/src/test/java/
webservices/axiom/trunk/aspects/dom-aspects/src/test/resources/
webservices/axiom/trunk/aspects/pom.xml (with props)
Removed:
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreChildNode.java
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreChildNodeSupport.aj
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreParentNode.java
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreParentNodeSupport.aj
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/DeferringParentNode.java
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/DeferringParentNodeSupport.aj
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/NonDeferringParentNode.java
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/NonDeferringParentNodeSupport.aj
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMChildNode.java
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMChildNodeSupport.aj
Modified:
webservices/axiom/trunk/buildutils/shade-osgi/src/main/java/org/apache/axiom/buildutils/shade/osgi/OSGiManifestResourceTransformer.java
webservices/axiom/trunk/modules/axiom-common-impl/pom.xml
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IContainer.java
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IDocument.java
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IElement.java
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/INode.java
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerSupport.aj
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMElementSupport.aj
webservices/axiom/trunk/modules/axiom-dom/pom.xml
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
webservices/axiom/trunk/modules/axiom-impl/pom.xml
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPElement.java
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java
webservices/axiom/trunk/pom.xml
Propchange: webservices/axiom/trunk/aspects/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jul 12 11:28:04 2014
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings
Propchange: webservices/axiom/trunk/aspects/core-aspects/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jul 12 11:28:04 2014
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings
Added: webservices/axiom/trunk/aspects/core-aspects/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/pom.xml?rev=1609904&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/pom.xml (added)
+++ webservices/axiom/trunk/aspects/core-aspects/pom.xml Sat Jul 12 11:28:04
2014
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<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/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>aspects</artifactId>
+ <version>1.2.15-SNAPSHOT</version>
+ </parent>
+ <artifactId>core-aspects</artifactId>
+ <name>Core Aspects</name>
+ <packaging>bundle</packaging>
+ <dependencies>
+ <dependency>
+ <!-- This dependency will eventually go away -->
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange: webservices/axiom/trunk/aspects/core-aspects/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNode.java
(from r1609770,
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreChildNode.java)
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNode.java?p2=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNode.java&p1=webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreChildNode.java&r1=1609770&r2=1609904&rev=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreChildNode.java
(original)
+++
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNode.java
Sat Jul 12 11:28:04 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.om.impl.common;
+package org.apache.axiom.core;
public interface CoreChildNode {
CoreParentNode coreGetParent();
Copied:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNodeSupport.aj
(from r1609770,
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreChildNodeSupport.aj)
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNodeSupport.aj?p2=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNodeSupport.aj&p1=webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreChildNodeSupport.aj&r1=1609770&r2=1609904&rev=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreChildNodeSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNodeSupport.aj
Sat Jul 12 11:28:04 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.om.impl.common;
+package org.apache.axiom.core;
import org.apache.axiom.om.NodeUnavailableException;
import org.apache.axiom.om.OMException;
Copied:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java
(from r1609263,
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreParentNode.java)
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java?p2=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java&p1=webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreParentNode.java&r1=1609263&r2=1609904&rev=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreParentNode.java
(original)
+++
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNode.java
Sat Jul 12 11:28:04 2014
@@ -16,17 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.om.impl.common;
+package org.apache.axiom.core;
-import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DocumentFragment;
/**
- * Interface for parent nodes. This interface is implemented by {@link
OMContainer} implementations
- * as well as nodes that can have children, but that are not {@link
OMContainer} implementations
- * (such as DOOM's {@link Attr} and {@link DocumentFragment} implementations).
+ * Interface for parent nodes.
*/
public interface CoreParentNode {
int INCOMPLETE = 0;
Copied:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNodeSupport.aj
(from r1609263,
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreParentNodeSupport.aj)
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNodeSupport.aj?p2=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNodeSupport.aj&p1=webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreParentNodeSupport.aj&r1=1609263&r2=1609904&rev=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreParentNodeSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreParentNodeSupport.aj
Sat Jul 12 11:28:04 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.om.impl.common;
+package org.apache.axiom.core;
import org.apache.axiom.om.NodeUnavailableException;
import org.apache.axiom.om.OMContainer;
Copied:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferringParentNode.java
(from r1609263,
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/DeferringParentNode.java)
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferringParentNode.java?p2=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferringParentNode.java&p1=webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/DeferringParentNode.java&r1=1609263&r2=1609904&rev=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/DeferringParentNode.java
(original)
+++
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferringParentNode.java
Sat Jul 12 11:28:04 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.om.impl.common;
+package org.apache.axiom.core;
/**
* Marker interface for {@link CoreParentNode} implementations that support
deferred parsing.
Copied:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferringParentNodeSupport.aj
(from r1609263,
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/DeferringParentNodeSupport.aj)
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferringParentNodeSupport.aj?p2=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferringParentNodeSupport.aj&p1=webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/DeferringParentNodeSupport.aj&r1=1609263&r2=1609904&rev=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/DeferringParentNodeSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferringParentNodeSupport.aj
Sat Jul 12 11:28:04 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.om.impl.common;
+package org.apache.axiom.core;
import org.apache.axiom.om.OMXMLParserWrapper;
Copied:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NonDeferringParentNode.java
(from r1609263,
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/NonDeferringParentNode.java)
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NonDeferringParentNode.java?p2=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NonDeferringParentNode.java&p1=webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/NonDeferringParentNode.java&r1=1609263&r2=1609904&rev=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/NonDeferringParentNode.java
(original)
+++
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NonDeferringParentNode.java
Sat Jul 12 11:28:04 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.om.impl.common;
+package org.apache.axiom.core;
/**
* Marker interface for {@link CoreParentNode} implementations that don't
support deferred parsing.
Copied:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NonDeferringParentNodeSupport.aj
(from r1609263,
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/NonDeferringParentNodeSupport.aj)
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NonDeferringParentNodeSupport.aj?p2=webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NonDeferringParentNodeSupport.aj&p1=webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/NonDeferringParentNodeSupport.aj&r1=1609263&r2=1609904&rev=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/NonDeferringParentNodeSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NonDeferringParentNodeSupport.aj
Sat Jul 12 11:28:04 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.om.impl.common;
+package org.apache.axiom.core;
import org.apache.axiom.om.OMXMLParserWrapper;
Propchange: webservices/axiom/trunk/aspects/dom-aspects/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jul 12 11:28:04 2014
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings
Added: webservices/axiom/trunk/aspects/dom-aspects/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/pom.xml?rev=1609904&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/pom.xml (added)
+++ webservices/axiom/trunk/aspects/dom-aspects/pom.xml Sat Jul 12 11:28:04 2014
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<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/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>aspects</artifactId>
+ <version>1.2.15-SNAPSHOT</version>
+ </parent>
+ <artifactId>dom-aspects</artifactId>
+ <name>DOM Aspects</name>
+ <packaging>bundle</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>core-aspects</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange: webservices/axiom/trunk/aspects/dom-aspects/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMChildNode.java
(from r1609770,
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMChildNode.java)
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMChildNode.java?p2=webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMChildNode.java&p1=webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMChildNode.java&r1=1609770&r2=1609904&rev=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMChildNode.java
(original)
+++
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMChildNode.java
Sat Jul 12 11:28:04 2014
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.om.impl.dom;
+package org.apache.axiom.dom;
-import org.apache.axiom.om.impl.common.CoreChildNode;
+import org.apache.axiom.core.CoreChildNode;
import org.w3c.dom.Node;
public interface DOMChildNode extends Node, CoreChildNode{
Copied:
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMChildNodeSupport.aj
(from r1609770,
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMChildNodeSupport.aj)
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMChildNodeSupport.aj?p2=webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMChildNodeSupport.aj&p1=webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMChildNodeSupport.aj&r1=1609770&r2=1609904&rev=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMChildNodeSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMChildNodeSupport.aj
Sat Jul 12 11:28:04 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.om.impl.dom;
+package org.apache.axiom.dom;
import org.w3c.dom.Node;
Added: webservices/axiom/trunk/aspects/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/pom.xml?rev=1609904&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/pom.xml (added)
+++ webservices/axiom/trunk/aspects/pom.xml Sat Jul 12 11:28:04 2014
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<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/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom</artifactId>
+ <version>1.2.15-SNAPSHOT</version>
+ </parent>
+ <artifactId>aspects</artifactId>
+ <name>Aspects</name>
+ <packaging>pom</packaging>
+ <modules>
+ <module>core-aspects</module>
+ <module>dom-aspects</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-compile</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>aspectj-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <complianceLevel>1.5</complianceLevel>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!-- Note: Aspect libraries are not intended to be used as an
OSGi bundle.
+ We generate OSGi metadata only for the shading process in
the implementations. -->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <excludeDependencies>true</excludeDependencies>
+ <instructions>
+ <Export-Package>*;-noimport:=true</Export-Package>
+ <Import-Package>
+ <!-- aspectjrt is not an OSGi bundle; we don't
need to generate imports because
+ the implementations include these classes
into the final JARs -->
+ !org.aspectj.*,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange: webservices/axiom/trunk/aspects/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
webservices/axiom/trunk/buildutils/shade-osgi/src/main/java/org/apache/axiom/buildutils/shade/osgi/OSGiManifestResourceTransformer.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/buildutils/shade-osgi/src/main/java/org/apache/axiom/buildutils/shade/osgi/OSGiManifestResourceTransformer.java?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/buildutils/shade-osgi/src/main/java/org/apache/axiom/buildutils/shade/osgi/OSGiManifestResourceTransformer.java
(original)
+++
webservices/axiom/trunk/buildutils/shade-osgi/src/main/java/org/apache/axiom/buildutils/shade/osgi/OSGiManifestResourceTransformer.java
Sat Jul 12 11:28:04 2014
@@ -49,7 +49,9 @@ import org.osgi.framework.BundleExceptio
* </ul>
*/
public class OSGiManifestResourceTransformer implements ResourceTransformer {
- private Manifest shadedManifest;
+ private Manifest originalManifest;
+ private final Set<String> importedPackages = new LinkedHashSet<String>();
+ private final Set<String> packagesExportedFromIncludedJARs = new
LinkedHashSet<String>();
public boolean canTransformResource(String resource) {
return resource.equals(JarFile.MANIFEST_NAME);
@@ -75,30 +77,28 @@ public class OSGiManifestResourceTransfo
}
public void processResource(String resource, InputStream is,
List<Relocator> relocators) throws IOException {
+ Manifest manifest = new Manifest(is);
+ Attributes attributes = manifest.getMainAttributes();
+ importedPackages.addAll(extractPackages(attributes, "Import-Package"));
// We know that the first invocation of processResource is for the
project's
// manifest (see the existing ManifestResourceTransformer's source
code)
- if (shadedManifest == null) {
- shadedManifest = new Manifest(is);
+ if (originalManifest == null) {
+ originalManifest = manifest;
} else {
- Manifest manifest = new Manifest(is);
- Attributes includedAttributes = manifest.getMainAttributes();
- Attributes shadedAttributes = shadedManifest.getMainAttributes();
- Set<String> shadedImportPackages = new LinkedHashSet<String>(
- extractPackages(shadedAttributes, "Import-Package"));
- shadedImportPackages.removeAll(extractPackages(includedAttributes,
"Export-Package"));
- shadedImportPackages.addAll(extractPackages(includedAttributes,
"Import-Package"));
- shadedAttributes.putValue("Import-Package",
- StringUtils.join(shadedImportPackages.iterator(), ","));
+
packagesExportedFromIncludedJARs.addAll(extractPackages(attributes,
"Export-Package"));
}
is.close();
}
public boolean hasTransformedResource() {
- return shadedManifest != null;
+ return originalManifest != null;
}
public void modifyOutputStream(JarOutputStream os) throws IOException {
+ importedPackages.removeAll(packagesExportedFromIncludedJARs);
+ originalManifest.getMainAttributes().putValue("Import-Package",
+ StringUtils.join(importedPackages.iterator(), ","));
os.putNextEntry(new JarEntry(JarFile.MANIFEST_NAME));
- shadedManifest.write(os);
+ originalManifest.write(os);
}
}
Modified: webservices/axiom/trunk/modules/axiom-common-impl/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/pom.xml?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-common-impl/pom.xml (original)
+++ webservices/axiom/trunk/modules/axiom-common-impl/pom.xml Sat Jul 12
11:28:04 2014
@@ -51,6 +51,11 @@
<artifactId>aspectjrt</artifactId>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>core-aspects</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified:
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IContainer.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IContainer.java?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IContainer.java
(original)
+++
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IContainer.java
Sat Jul 12 11:28:04 2014
@@ -18,6 +18,7 @@
*/
package org.apache.axiom.om.impl.common;
+import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.OMContainerEx;
Modified:
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IDocument.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IDocument.java?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IDocument.java
(original)
+++
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IDocument.java
Sat Jul 12 11:28:04 2014
@@ -18,6 +18,7 @@
*/
package org.apache.axiom.om.impl.common;
+import org.apache.axiom.core.DeferringParentNode;
import org.apache.axiom.om.OMDocument;
public interface IDocument extends OMDocument, IContainer, DeferringParentNode
{
Modified:
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IElement.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IElement.java?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IElement.java
(original)
+++
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IElement.java
Sat Jul 12 11:28:04 2014
@@ -18,6 +18,7 @@
*/
package org.apache.axiom.om.impl.common;
+import org.apache.axiom.core.DeferringParentNode;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.impl.OMElementEx;
Modified:
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/INode.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/INode.java?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/INode.java
(original)
+++
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/INode.java
Sat Jul 12 11:28:04 2014
@@ -18,6 +18,7 @@
*/
package org.apache.axiom.om.impl.common;
+import org.apache.axiom.core.CoreChildNode;
import org.apache.axiom.om.impl.OMNodeEx;
public interface INode extends OMNodeEx, CoreChildNode, ISerializable {
Modified:
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerSupport.aj?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerSupport.aj
(original)
+++
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerSupport.aj
Sat Jul 12 11:28:04 2014
@@ -25,6 +25,8 @@ import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.sax.SAXSource;
+import org.apache.axiom.core.CoreChildNode;
+import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.om.NodeUnavailableException;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
Modified:
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMElementSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMElementSupport.aj?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMElementSupport.aj
(original)
+++
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMElementSupport.aj
Sat Jul 12 11:28:04 2014
@@ -31,6 +31,7 @@ import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
Modified: webservices/axiom/trunk/modules/axiom-dom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/pom.xml?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/pom.xml (original)
+++ webservices/axiom/trunk/modules/axiom-dom/pom.xml Sat Jul 12 11:28:04 2014
@@ -49,6 +49,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>dom-aspects</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>${stax.impl.groupid}</groupId>
<artifactId>${stax.impl.artifact}</artifactId>
</dependency>
@@ -126,8 +131,16 @@
<aspectLibraries>
<aspectLibrary>
<groupId>${project.groupId}</groupId>
+ <artifactId>core-aspects</artifactId>
+ </aspectLibrary>
+ <aspectLibrary>
+ <groupId>${project.groupId}</groupId>
<artifactId>axiom-common-impl</artifactId>
</aspectLibrary>
+ <aspectLibrary>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>dom-aspects</artifactId>
+ </aspectLibrary>
</aspectLibraries>
</configuration>
</execution>
@@ -157,6 +170,7 @@
<configuration>
<artifactSet>
<includes>
+
<include>${project.groupId}:*-aspects</include>
<include>${project.groupId}:axiom-common-impl</include>
<include>org.aspectj:aspectjrt</include>
</includes>
Modified:
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
(original)
+++
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
Sat Jul 12 11:28:04 2014
@@ -19,6 +19,7 @@
package org.apache.axiom.om.impl.dom;
+import org.apache.axiom.core.NonDeferringParentNode;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMConstants;
@@ -27,7 +28,6 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.impl.OMAttributeEx;
-import org.apache.axiom.om.impl.common.NonDeferringParentNode;
import org.apache.axiom.om.impl.common.OMNamedInformationItemHelper;
import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.common.serializer.push.Serializer;
Modified:
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java
(original)
+++
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java
Sat Jul 12 11:28:04 2014
@@ -18,12 +18,13 @@
*/
package org.apache.axiom.om.impl.dom;
+import org.apache.axiom.core.CoreChildNode;
+import org.apache.axiom.core.CoreParentNode;
+import org.apache.axiom.dom.DOMChildNode;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.common.CoreChildNode;
-import org.apache.axiom.om.impl.common.CoreParentNode;
import org.w3c.dom.Element;
public abstract class ChildNode extends NodeImpl implements DOMChildNode {
Modified:
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java
(original)
+++
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java
Sat Jul 12 11:28:04 2014
@@ -19,12 +19,12 @@
package org.apache.axiom.om.impl.dom;
+import org.apache.axiom.core.NonDeferringParentNode;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.impl.common.IContainer;
-import org.apache.axiom.om.impl.common.NonDeferringParentNode;
import org.apache.axiom.om.impl.common.serializer.push.Serializer;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Node;
Modified:
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
(original)
+++
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
Sat Jul 12 11:28:04 2014
@@ -19,6 +19,9 @@
package org.apache.axiom.om.impl.dom;
+import org.apache.axiom.core.CoreChildNode;
+import org.apache.axiom.core.CoreParentNode;
+import org.apache.axiom.dom.DOMChildNode;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMConstants;
@@ -29,10 +32,8 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.common.CoreChildNode;
import org.apache.axiom.om.impl.common.IContainer;
import org.apache.axiom.om.impl.common.IElement;
-import org.apache.axiom.om.impl.common.CoreParentNode;
import org.apache.axiom.om.impl.common.NamespaceIterator;
import org.apache.axiom.om.impl.common.OMChildElementIterator;
import org.apache.axiom.om.impl.common.OMNamedInformationItemHelper;
Modified:
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
(original)
+++
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
Sat Jul 12 11:28:04 2014
@@ -19,6 +19,8 @@
package org.apache.axiom.om.impl.dom;
+import org.apache.axiom.core.CoreChildNode;
+import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMException;
@@ -30,8 +32,6 @@ import org.apache.axiom.om.OMSerializabl
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
import org.apache.axiom.om.impl.builder.StAXBuilder;
-import org.apache.axiom.om.impl.common.CoreChildNode;
-import org.apache.axiom.om.impl.common.CoreParentNode;
import org.apache.axiom.om.impl.common.INode;
import org.apache.axiom.om.impl.common.InformationItem;
import org.apache.axiom.om.impl.common.serializer.push.OutputException;
Modified:
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
(original)
+++
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
Sat Jul 12 11:28:04 2014
@@ -19,11 +19,11 @@
package org.apache.axiom.om.impl.dom;
+import org.apache.axiom.core.CoreChildNode;
+import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMSourcedElement;
-import org.apache.axiom.om.impl.common.CoreChildNode;
-import org.apache.axiom.om.impl.common.CoreParentNode;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
Modified: webservices/axiom/trunk/modules/axiom-impl/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/pom.xml?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/pom.xml (original)
+++ webservices/axiom/trunk/modules/axiom-impl/pom.xml Sat Jul 12 11:28:04 2014
@@ -120,6 +120,10 @@
<aspectLibraries>
<aspectLibrary>
<groupId>${project.groupId}</groupId>
+ <artifactId>core-aspects</artifactId>
+ </aspectLibrary>
+ <aspectLibrary>
+ <groupId>${project.groupId}</groupId>
<artifactId>axiom-common-impl</artifactId>
</aspectLibrary>
</aspectLibraries>
@@ -150,6 +154,7 @@
<configuration>
<artifactSet>
<includes>
+
<include>${project.groupId}:*-aspects</include>
<include>${project.groupId}:axiom-common-impl</include>
<include>org.aspectj:aspectjrt</include>
</includes>
Modified:
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
(original)
+++
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
Sat Jul 12 11:28:04 2014
@@ -19,15 +19,15 @@
package org.apache.axiom.om.impl.llom;
+import org.apache.axiom.core.CoreChildNode;
+import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMInformationItem;
import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.impl.common.CoreChildNode;
import org.apache.axiom.om.impl.common.IContainer;
-import org.apache.axiom.om.impl.common.CoreParentNode;
import org.apache.axiom.om.impl.common.INode;
/** Class OMNodeImpl */
Modified:
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
(original)
+++
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
Sat Jul 12 11:28:04 2014
@@ -19,6 +19,8 @@
package org.apache.axiom.om.impl.llom;
+import org.apache.axiom.core.CoreChildNode;
+import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMContainer;
@@ -36,8 +38,6 @@ import org.apache.axiom.om.OMXMLParserWr
import org.apache.axiom.om.OMXMLStreamReaderConfiguration;
import org.apache.axiom.om.QNameAwareOMDataSource;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.impl.common.CoreChildNode;
-import org.apache.axiom.om.impl.common.CoreParentNode;
import org.apache.axiom.om.impl.common.OMDataSourceUtil;
import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.common.serializer.push.OutputException;
Modified:
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPElement.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPElement.java?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPElement.java
(original)
+++
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPElement.java
Sat Jul 12 11:28:04 2014
@@ -19,11 +19,11 @@
package org.apache.axiom.soap.impl.llom;
+import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.common.CoreParentNode;
import org.apache.axiom.om.impl.llom.OMElementImpl;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPProcessingException;
Modified:
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java
(original)
+++
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java
Sat Jul 12 11:28:04 2014
@@ -19,6 +19,7 @@
package org.apache.axiom.soap.impl.llom;
+import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMContainer;
@@ -29,7 +30,6 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.common.CoreParentNode;
import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.llom.OMAttributeImpl;
import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
Modified: webservices/axiom/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1609904&r1=1609903&r2=1609904&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Sat Jul 12 11:28:04 2014
@@ -906,5 +906,6 @@
<module>distribution</module>
<module>code-coverage</module>
<module>testing</module>
+ <module>aspects</module>
</modules>
</project>
