Support XML dumpformat 0.11

sweble-wikitext-components-parent/swc-dumpreader/pom.xml

@@ -254,6 +254,18 @@
 							<generatePackage>org.sweble.wikitext.dumpreader.export_0_10</generatePackage>
 						</configuration>
 					</execution>
+					<execution>
+						<id>compile-mw-schema-0.11</id>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+						<configuration>
+							<schemaIncludes>
+								<include>export-0.11.xsd</include>
+							</schemaIncludes>
+							<generatePackage>org.sweble.wikitext.dumpreader.export_0_11</generatePackage>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 

sweble-wikitext-components-parent/swc-dumpreader/src/main/java/org/sweble/wikitext/dumpreader/DumpReader.java

@@ -311,6 +311,10 @@ else if (header.contains("xmlns=\"http://www.mediawiki.org/xml/export-0.10/\""))
 		{
 			return ExportSchemaVersion.V0_10;
 		}
+		else if (header.contains("xmlns=\"http://www.mediawiki.org/xml/export-0.11/\""))
+		{
+			return ExportSchemaVersion.V0_11;
+		}
 		else
 		{
 			throw new IllegalArgumentException("Unknown xmlns");

sweble-wikitext-components-parent/swc-dumpreader/src/main/java/org/sweble/wikitext/dumpreader/ExportSchemaVersion.java

@@ -296,6 +296,51 @@ public Class<?> getPageType()
 			return org.sweble.wikitext.dumpreader.export_0_10.PageType.class;
 		}
 
+		@Override
+		public Class<?> getRevisionType()
+		{
+			return org.sweble.wikitext.dumpreader.export_0_10.RevisionType.class;
+		}
+	},
+
+	V0_11
+	{
+		@Override
+		public String getSchema()
+		{
+			return "/export-0.11.xsd";
+		}
+
+		@Override
+		public String getFragmentsSchema()
+		{
+			return "/export-0.11-fragments.xsd";
+		}
+
+		@Override
+		public String getContextPath()
+		{
+			return "org.sweble.wikitext.dumpreader.export_0_11";
+		}
+
+		@Override
+		public String getMediaWikiNamespace()
+		{
+			return "http://www.mediawiki.org/xml/export-0.11/";
+		}
+
+		@Override
+		public Class<?> getMediaWikiType()
+		{
+			return org.sweble.wikitext.dumpreader.export_0_10.MediaWikiType.class;
+		}
+
+		@Override
+		public Class<?> getPageType()
+		{
+			return org.sweble.wikitext.dumpreader.export_0_10.PageType.class;
+		}
+
 		@Override
 		public Class<?> getRevisionType()
 		{

sweble-wikitext-components-parent/swc-dumpreader/src/main/java/org/sweble/wikitext/dumpreader/export_0_11/MediaWikiTypeAspect.aj

@@ -0,0 +1,40 @@
+/**
+ * Copyright 2011 The Open Source Research Group,
+ *                University of Erlangen-Nürnberg
+ *
+ * Licensed 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.sweble.wikitext.dumpreader.export_0_11;
+
+import java.util.ArrayList;
+
+import org.sweble.wikitext.dumpreader.DumpReaderListener;
+
+public aspect MediaWikiTypeAspect
+{
+	public void MediaWikiType.setPageListener(final DumpReaderListener listener)
+	{
+		page = (listener == null) ? null : new ArrayList<PageType>()
+		{
+			private static final long serialVersionUID = 1L;
+
+			public boolean add(PageType page)
+			{
+				listener.handlePage(MediaWikiType.this, page);
+				return false;
+			}
+		};
+	}
+
+}

sweble-wikitext-components-parent/swc-dumpreader/src/main/java/org/sweble/wikitext/dumpreader/export_0_11/PageTypeAspect.aj

@@ -0,0 +1,75 @@
+/**
+ * Copyright 2011 The Open Source Research Group,
+ *                University of Erlangen-Nürnberg
+ *
+ * Licensed 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.sweble.wikitext.dumpreader.export_0_11;
+
+import java.util.ArrayList;
+
+import org.sweble.wikitext.dumpreader.DumpReaderListener;
+
+public aspect PageTypeAspect
+{
+	public void PageType.setRevisionListener(final DumpReaderListener listener)
+	{
+		DumpReaderListener oldListener = null;
+		if ((this.revisionOrUpload != null) && (this.revisionOrUpload instanceof MyArrayList))
+			oldListener = ((MyArrayList) this.revisionOrUpload).getListener();
+
+		if (listener != null)
+		{
+			if (oldListener != listener)
+			{
+				this.revisionOrUpload = new MyArrayList(PageType.this, listener);
+			}
+		}
+		else
+		{
+			this.revisionOrUpload = null;
+		}
+	}
+
+	public static final class MyArrayList
+			extends
+				ArrayList<Object>
+	{
+		private static final long serialVersionUID = 1L;
+
+		private final DumpReaderListener listener;
+
+		private PageType page;
+
+		public MyArrayList(
+				final PageType page,
+				final DumpReaderListener listener)
+		{
+			this.page = page;
+			this.listener = listener;
+		}
+
+		public DumpReaderListener getListener()
+		{
+			return listener;
+		}
+
+		public boolean add(Object revisionOrUpload)
+		{
+			if (listener.handleRevisionOrUploadOrLogitem(page, revisionOrUpload))
+				return super.add(revisionOrUpload);
+			return false;
+		}
+	}
+}

sweble-wikitext-components-parent/swc-dumpreader/src/main/schema/catalog.xml

@@ -46,5 +46,9 @@
   <system
     systemId="http://www.mediawiki.org/xml/export-0.10.xsd"
     uri="export-0.10.xsd" />
+
+  <system
+    systemId="http://www.mediawiki.org/xml/export-0.11.xsd"
+    uri="export-0.11.xsd" />
 
 </catalog>