ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1611547 - in /webservices/axiom/trunk: ./ aspects/dom-aspects/src/main/java/org/apache/axiom/dom/ implementations/ implementations/dom/ implementations/dom/src/ implementations/dom/src/main/ implementations/dom/src/main/java/ implementatio...
Date Fri, 18 Jul 2014 07:04:08 GMT
Author: veithen
Date: Fri Jul 18 07:04:07 2014
New Revision: 1611547

URL: http://svn.apache.org/r1611547
Log:
Added some infrastructure for a pure DOM implementation.

Added:
    webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocument.java
  (with props)
    webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragment.java
  (with props)
    webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj
  (with props)
    webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElement.java
  (with props)
    webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNode.java
  (with props)
    webservices/axiom/trunk/implementations/   (with props)
    webservices/axiom/trunk/implementations/dom/   (with props)
    webservices/axiom/trunk/implementations/dom/pom.xml   (with props)
    webservices/axiom/trunk/implementations/dom/src/
    webservices/axiom/trunk/implementations/dom/src/main/
    webservices/axiom/trunk/implementations/dom/src/main/java/
    webservices/axiom/trunk/implementations/dom/src/main/java/org/
    webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/
    webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/
    webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/
    webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/
    webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/AttrImpl.java
  (with props)
    webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/DocumentFragmentImpl.java
  (with props)
    webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/DocumentImpl.java
  (with props)
    webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/ElementImpl.java
  (with props)
    webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/LeafNode.java
  (with props)
    webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/NodeImpl.java
  (with props)
    webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/RootNode.java
  (with props)
    webservices/axiom/trunk/implementations/pom.xml   (with props)
Modified:
    webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMChildNode.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/DocumentImpl.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/pom.xml

Modified: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMChildNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMChildNode.java?rev=1611547&r1=1611546&r2=1611547&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMChildNode.java
(original)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMChildNode.java
Fri Jul 18 07:04:07 2014
@@ -19,8 +19,7 @@
 package org.apache.axiom.dom;
 
 import org.apache.axiom.core.CoreChildNode;
-import org.w3c.dom.Node;
 
-public interface DOMChildNode extends Node, CoreChildNode {
+public interface DOMChildNode extends DOMNode, CoreChildNode {
 
 }

Added: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocument.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocument.java?rev=1611547&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocument.java
(added)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocument.java
Fri Jul 18 07:04:07 2014
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+package org.apache.axiom.dom;
+
+import org.apache.axiom.core.CoreDocument;
+import org.w3c.dom.Document;
+
+public interface DOMDocument extends Document, CoreDocument {
+
+}

Propchange: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocument.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragment.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragment.java?rev=1611547&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragment.java
(added)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragment.java
Fri Jul 18 07:04:07 2014
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+package org.apache.axiom.dom;
+
+import org.apache.axiom.core.CoreDocumentFragment;
+import org.w3c.dom.DocumentFragment;
+
+public interface DOMDocumentFragment extends DocumentFragment, CoreDocumentFragment {
+
+}

Propchange: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentFragment.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj?rev=1611547&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj
(added)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj
Fri Jul 18 07:04:07 2014
@@ -0,0 +1,52 @@
+/*
+ * 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.
+ */
+package org.apache.axiom.dom;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+public aspect DOMDocumentSupport {
+    public final String DOMDocument.getNodeName() {
+        return "#document";
+    }
+
+    public final short DOMDocument.getNodeType() {
+        return Node.DOCUMENT_NODE;
+    }
+
+    public final String DOMDocument.getPrefix() {
+        return null;
+    }
+
+    public final String DOMDocument.getLocalName() {
+        return null;
+    }
+
+    public final String DOMDocument.lookupNamespaceURI(String specifiedPrefix) {
+        Element documentElement = getDocumentElement();
+        return documentElement == null ? null
+                : documentElement.lookupNamespaceURI(specifiedPrefix);
+    }
+    
+    public final String DOMDocument.lookupPrefix(String namespaceURI) {
+        Element documentElement = getDocumentElement();
+        return documentElement == null ? null
+                : getDocumentElement().lookupPrefix(namespaceURI);
+    }
+}

Propchange: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMDocumentSupport.aj
------------------------------------------------------------------------------
    svn:eol-style = native

Added: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElement.java?rev=1611547&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElement.java
(added)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElement.java
Fri Jul 18 07:04:07 2014
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+package org.apache.axiom.dom;
+
+import org.apache.axiom.core.CoreElement;
+import org.w3c.dom.Element;
+
+public interface DOMElement extends DOMChildNode, Element, CoreElement {
+
+}

Propchange: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElement.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNode.java?rev=1611547&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNode.java
(added)
+++ webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNode.java
Fri Jul 18 07:04:07 2014
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+package org.apache.axiom.dom;
+
+import org.apache.axiom.core.CoreNode;
+import org.w3c.dom.Node;
+
+public interface DOMNode extends Node, CoreNode {
+
+}

Propchange: webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMNode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/axiom/trunk/implementations/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 18 07:04:07 2014
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: webservices/axiom/trunk/implementations/dom/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 18 07:04:07 2014
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Added: webservices/axiom/trunk/implementations/dom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/dom/pom.xml?rev=1611547&view=auto
==============================================================================
--- webservices/axiom/trunk/implementations/dom/pom.xml (added)
+++ webservices/axiom/trunk/implementations/dom/pom.xml Fri Jul 18 07:04:07 2014
@@ -0,0 +1,67 @@
+<?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>implementations</artifactId>
+        <version>1.2.15-SNAPSHOT</version>
+    </parent>
+    <artifactId>dom</artifactId>
+    <name>DOM Implementation</name>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>dom-aspects</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>aspectj-maven-plugin</artifactId>
+                <configuration>
+                    <aspectLibraries>
+                        <aspectLibrary>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>core-aspects</artifactId>
+                        </aspectLibrary>
+                        <aspectLibrary>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>dom-aspects</artifactId>
+                        </aspectLibrary>
+                    </aspectLibraries>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: webservices/axiom/trunk/implementations/dom/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/AttrImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/AttrImpl.java?rev=1611547&view=auto
==============================================================================
--- webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/AttrImpl.java
(added)
+++ webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/AttrImpl.java
Fri Jul 18 07:04:07 2014
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+package org.apache.axiom.dom.impl;
+
+// TODO: will become final
+abstract class AttrImpl extends RootNode {
+
+}

Propchange: webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/AttrImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/DocumentFragmentImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/DocumentFragmentImpl.java?rev=1611547&view=auto
==============================================================================
--- webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/DocumentFragmentImpl.java
(added)
+++ webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/DocumentFragmentImpl.java
Fri Jul 18 07:04:07 2014
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+package org.apache.axiom.dom.impl;
+
+import org.apache.axiom.dom.DOMDocumentFragment;
+
+// TODO: will become final
+abstract class DocumentFragmentImpl extends RootNode implements DOMDocumentFragment {
+
+}

Propchange: webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/DocumentFragmentImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/DocumentImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/DocumentImpl.java?rev=1611547&view=auto
==============================================================================
--- webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/DocumentImpl.java
(added)
+++ webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/DocumentImpl.java
Fri Jul 18 07:04:07 2014
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+package org.apache.axiom.dom.impl;
+
+import org.apache.axiom.dom.DOMDocument;
+
+// TODO: will become final
+abstract class DocumentImpl extends RootNode implements DOMDocument {
+
+}

Propchange: webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/DocumentImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/ElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/ElementImpl.java?rev=1611547&view=auto
==============================================================================
--- webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/ElementImpl.java
(added)
+++ webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/ElementImpl.java
Fri Jul 18 07:04:07 2014
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+package org.apache.axiom.dom.impl;
+
+import org.apache.axiom.dom.DOMElement;
+
+// TODO: will become final
+abstract class ElementImpl extends NodeImpl implements DOMElement {
+
+}

Propchange: webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/ElementImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/LeafNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/LeafNode.java?rev=1611547&view=auto
==============================================================================
--- webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/LeafNode.java
(added)
+++ webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/LeafNode.java
Fri Jul 18 07:04:07 2014
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+package org.apache.axiom.dom.impl;
+
+abstract class LeafNode extends NodeImpl {
+
+}

Propchange: webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/LeafNode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/NodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/NodeImpl.java?rev=1611547&view=auto
==============================================================================
--- webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/NodeImpl.java
(added)
+++ webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/NodeImpl.java
Fri Jul 18 07:04:07 2014
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+package org.apache.axiom.dom.impl;
+
+import org.apache.axiom.dom.DOMNode;
+
+abstract class NodeImpl implements DOMNode {
+
+}

Propchange: webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/NodeImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/RootNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/RootNode.java?rev=1611547&view=auto
==============================================================================
--- webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/RootNode.java
(added)
+++ webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/RootNode.java
Fri Jul 18 07:04:07 2014
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+package org.apache.axiom.dom.impl;
+
+abstract class RootNode extends NodeImpl {
+
+}

Propchange: webservices/axiom/trunk/implementations/dom/src/main/java/org/apache/axiom/dom/impl/RootNode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: webservices/axiom/trunk/implementations/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/pom.xml?rev=1611547&view=auto
==============================================================================
--- webservices/axiom/trunk/implementations/pom.xml (added)
+++ webservices/axiom/trunk/implementations/pom.xml Fri Jul 18 07:04:07 2014
@@ -0,0 +1,102 @@
+<?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>implementations</artifactId>
+    <name>Implementations</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>dom</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>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <excludeDependencies>true</excludeDependencies>
+                    <instructions>
+                        <Private-Package>org.apache.axiom.*</Private-Package>
+                        <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-shade-plugin</artifactId>
+                <configuration>
+                    <artifactSet>
+                        <includes>
+                            <include>${project.groupId}:*-aspects</include>
+                            <include>${project.groupId}:axiom-common-impl</include>
+                            <include>org.aspectj:aspectjrt</include>
+                        </includes>
+                    </artifactSet>
+                    <transformers>
+                        <transformer implementation="org.apache.axiom.buildutils.shade.osgi.OSGiManifestResourceTransformer"
/>
+                    </transformers>
+                    <createSourcesJar>true</createSourcesJar>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>${project.groupId}</groupId>
+                        <artifactId>shade-osgi</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                    <skipDeploy>true</skipDeploy>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: webservices/axiom/trunk/implementations/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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=1611547&r1=1611546&r2=1611547&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
Fri Jul 18 07:04:07 2014
@@ -19,8 +19,8 @@
 
 package org.apache.axiom.om.impl.dom;
 
-import org.apache.axiom.core.CoreDocumentFragment;
 import org.apache.axiom.core.NonDeferringParentNode;
+import org.apache.axiom.dom.DOMDocumentFragment;
 import org.apache.axiom.om.OMCloneOptions;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNode;
@@ -28,7 +28,6 @@ import org.apache.axiom.om.OMOutputForma
 import org.apache.axiom.om.impl.common.IContainer;
 import org.apache.axiom.om.impl.common.serializer.push.Serializer;
 import org.w3c.dom.DOMException;
-import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.Node;
 
 import javax.xml.stream.XMLStreamException;
@@ -36,7 +35,7 @@ import javax.xml.stream.XMLStreamWriter;
 
 // TODO: we should not implement IContainer here
 public class DocumentFragmentImpl extends RootNode implements
-        DocumentFragment, IContainer, CoreDocumentFragment, NonDeferringParentNode {
+        DOMDocumentFragment, IContainer, NonDeferringParentNode {
 
     /** @param ownerDocument  */
     public DocumentFragmentImpl(OMFactory factory) {

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java?rev=1611547&r1=1611546&r2=1611547&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
Fri Jul 18 07:04:07 2014
@@ -20,6 +20,7 @@
 package org.apache.axiom.om.impl.dom;
 
 import org.apache.axiom.core.CoreChildNode;
+import org.apache.axiom.dom.DOMDocument;
 import org.apache.axiom.om.OMCloneOptions;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;
@@ -62,7 +63,7 @@ import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Vector;
 
-public class DocumentImpl extends RootNode implements Document, IDocument {
+public class DocumentImpl extends RootNode implements DOMDocument, IDocument {
     private String xmlVersion;
 
     private String xmlEncoding;
@@ -95,17 +96,6 @@ public class DocumentImpl extends RootNo
         internalSerialize(serializer, format, cache, !format.isIgnoreXMLDeclaration());
     }
 
-    // /
-    // /org.w3c.dom.Node methods
-    // /
-    public String getNodeName() {
-        return "#document";
-    }
-
-    public short getNodeType() {
-        return Node.DOCUMENT_NODE;
-    }
-
     // /org.w3c.dom.Document methods
     // /
 
@@ -569,18 +559,6 @@ public class DocumentImpl extends RootNo
         defaultBuild();
     }
 
-    public final String lookupNamespaceURI(String specifiedPrefix) {
-        Element documentElement = getDocumentElement();
-        return documentElement == null ? null
-                : documentElement.lookupNamespaceURI(specifiedPrefix);
-    }
-    
-    public final String lookupPrefix(String namespaceURI) {
-        Element documentElement = getDocumentElement();
-        return documentElement == null ? null
-                : getDocumentElement().lookupPrefix(namespaceURI);
-    }
-
     public final void checkChild(OMNode child) {
         if (child instanceof OMElement) {
             if (getOMDocumentElement() != null) {
@@ -594,15 +572,7 @@ public class DocumentImpl extends RootNo
     protected void checkDocumentElement(OMElement element) {
     }
 
-    public final String getPrefix() {
-        return null;
-    }
-
     public final void setPrefix(String prefix) throws DOMException {
         throw DOMUtil.newDOMException(DOMException.NAMESPACE_ERR);
     }
-
-    public final String getLocalName() {
-        return null;
-    }
 }

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=1611547&r1=1611546&r2=1611547&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
Fri Jul 18 07:04:07 2014
@@ -20,7 +20,7 @@
 package org.apache.axiom.om.impl.dom;
 
 import org.apache.axiom.core.CoreChildNode;
-import org.apache.axiom.dom.DOMChildNode;
+import org.apache.axiom.dom.DOMElement;
 import org.apache.axiom.om.OMAttribute;
 import org.apache.axiom.om.OMCloneOptions;
 import org.apache.axiom.om.OMConstants;
@@ -58,7 +58,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 
 /** Implementation of the org.w3c.dom.Element and org.apache.axiom.om.Element interfaces.
*/
-public class ElementImpl extends ParentNode implements Element, IElement, NamedNode, DOMChildNode,
+public class ElementImpl extends ParentNode implements DOMElement, IElement, NamedNode,
         OMConstants {
 
     private static final Log log = LogFactory.getLog(ElementImpl.class);

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=1611547&r1=1611546&r2=1611547&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
Fri Jul 18 07:04:07 2014
@@ -21,8 +21,8 @@ package org.apache.axiom.om.impl.dom;
 
 import org.apache.axiom.core.CoreChildNode;
 import org.apache.axiom.core.CoreDocument;
-import org.apache.axiom.core.CoreNode;
 import org.apache.axiom.core.CoreParentNode;
+import org.apache.axiom.dom.DOMNode;
 import org.apache.axiom.om.OMCloneOptions;
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.OMFactory;
@@ -52,7 +52,7 @@ import java.util.Hashtable;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 
-public abstract class NodeImpl extends InformationItem implements Node, CoreNode {
+public abstract class NodeImpl extends InformationItem implements DOMNode {
 
     /** Holds the user data objects */
     private Hashtable userData; // Will be initialized in setUserData()

Modified: webservices/axiom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1611547&r1=1611546&r2=1611547&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Fri Jul 18 07:04:07 2014
@@ -918,5 +918,6 @@
         <module>code-coverage</module>
         <module>testing</module>
         <module>aspects</module>
+        <module>implementations</module>
     </modules>
 </project>



Mime
View raw message