| Index: trunk/mwdumper/.classpath |
| — | — | @@ -1,12 +1,7 @@ |
| 2 | 2 | <?xml version="1.0" encoding="UTF-8"?> |
| 3 | 3 | <classpath> |
| 4 | | - <classpathentry kind="src" path="src"/> |
| 5 | | - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> |
| 6 | | - <classpathentry kind="lib" path="libs/junit.jar"/> |
| 7 | | - <classpathentry kind="lib" path="libs/mysql-connector-java-3.1.11-bin.jar"/> |
| 8 | | - <classpathentry kind="lib" path="libs/postgresql-8.2-504.jdbc3.jar"/> |
| 9 | | - <classpathentry kind="lib" path="libs/xercesImpl.jar"/> |
| 10 | | - <classpathentry kind="lib" path="libs/xml-apis.jar"/> |
| 11 | | - <classpathentry kind="lib" path="libs/swing-layout-1.0.jar"/> |
| 12 | | - <classpathentry kind="output" path="bin"/> |
| | 4 | + <classpathentry excluding="**/*Test.java|org/apache/commons/compress/bzip2/BZip2Constants.java|org/apache/commons/compress/bzip2/CBZip2InputStream.java|org/apache/commons/compress/bzip2/CBZip2OutputStream.java|org/apache/commons/compress/bzip2/CRC.java" including="**/*.java" kind="src" output="build/classes" path="src"/> |
| | 5 | + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> |
| | 6 | + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/> |
| | 7 | + <classpathentry kind="output" path="build/classes"/> |
| 13 | 8 | </classpath> |
| Index: trunk/mwdumper/.project |
| — | — | @@ -10,8 +10,14 @@ |
| 11 | 11 | <arguments> |
| 12 | 12 | </arguments> |
| 13 | 13 | </buildCommand> |
| | 14 | + <buildCommand> |
| | 15 | + <name>org.eclipse.m2e.core.maven2Builder</name> |
| | 16 | + <arguments> |
| | 17 | + </arguments> |
| | 18 | + </buildCommand> |
| 14 | 19 | </buildSpec> |
| 15 | 20 | <natures> |
| | 21 | + <nature>org.eclipse.m2e.core.maven2Nature</nature> |
| 16 | 22 | <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> |
| 17 | 23 | <nature>org.eclipse.jdt.core.javanature</nature> |
| 18 | 24 | <nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature> |
| Index: trunk/mwdumper/src/org/mediawiki/importer/RevisionListFilter.java |
| — | — | @@ -34,13 +34,13 @@ |
| 35 | 35 | |
| 36 | 36 | public class RevisionListFilter implements DumpWriter { |
| 37 | 37 | DumpWriter sink; |
| 38 | | - protected TreeSet revIds; |
| | 38 | + protected TreeSet<Integer> revIds; |
| 39 | 39 | protected Page currentPage; |
| 40 | 40 | protected boolean pageWritten; |
| 41 | 41 | |
| 42 | 42 | public RevisionListFilter(DumpWriter sink, String sourceFileName) throws IOException { |
| 43 | 43 | this.sink = sink; |
| 44 | | - revIds = new TreeSet(); |
| | 44 | + revIds = new TreeSet<Integer>(); |
| 45 | 45 | BufferedReader input = new BufferedReader(new InputStreamReader( |
| 46 | 46 | new FileInputStream(sourceFileName), "utf-8")); |
| 47 | 47 | String line = input.readLine(); |
| Index: trunk/mwdumper/src/org/mediawiki/importer/NamespaceSet.java |
| — | — | @@ -31,12 +31,12 @@ |
| 32 | 32 | import java.util.Iterator; |
| 33 | 33 | |
| 34 | 34 | public class NamespaceSet { |
| 35 | | - Map byname; |
| 36 | | - Map bynumber; |
| | 35 | + Map<String, Integer> byname; |
| | 36 | + Map<Integer, String> bynumber; |
| 37 | 37 | |
| 38 | 38 | public NamespaceSet() { |
| 39 | | - byname = new HashMap(); |
| 40 | | - bynumber = new LinkedHashMap(); |
| | 39 | + byname = new HashMap<String, Integer>(); |
| | 40 | + bynumber = new LinkedHashMap<Integer, String>(); |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | public void add(int index, String prefix) { |
| — | — | @@ -57,11 +57,11 @@ |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | public String getPrefix(Integer index) { |
| 61 | | - return (String)bynumber.get(index); |
| | 61 | + return bynumber.get(index); |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | public Integer getIndex(String prefix) { |
| 65 | | - return (Integer)byname.get(prefix); |
| | 65 | + return byname.get(prefix); |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | public String getColonPrefix(Integer index) { |
| — | — | @@ -71,7 +71,7 @@ |
| 72 | 72 | return prefix; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | | - public Iterator orderedEntries() { |
| | 75 | + public Iterator<Map.Entry<Integer, String>> orderedEntries() { |
| 76 | 76 | return bynumber.entrySet().iterator(); |
| 77 | 77 | } |
| 78 | 78 | } |
| Index: trunk/mwdumper/src/org/mediawiki/importer/Buffer.java |
| — | — | @@ -31,7 +31,7 @@ |
| 32 | 32 | |
| 33 | 33 | private Buffer() {} |
| 34 | 34 | |
| 35 | | - private static final IdentityHashMap BUFFERS = new IdentityHashMap(); |
| | 35 | + private static final IdentityHashMap<Thread, char[]> BUFFERS = new IdentityHashMap<Thread, char[]>(); |
| 36 | 36 | |
| 37 | 37 | private static Thread lastThread; |
| 38 | 38 | private static char[] lastBuffer; |
| — | — | @@ -44,7 +44,7 @@ |
| 45 | 45 | buffer = lastBuffer; |
| 46 | 46 | } else { |
| 47 | 47 | lastThread = thread; |
| 48 | | - buffer = lastBuffer = (char[]) BUFFERS.get(thread); |
| | 48 | + buffer = lastBuffer = BUFFERS.get(thread); |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | if (buffer == null) { |
| Index: trunk/mwdumper/src/org/mediawiki/importer/Page.java |
| — | — | @@ -30,12 +30,12 @@ |
| 31 | 31 | public class Page { |
| 32 | 32 | public Title Title; |
| 33 | 33 | public int Id; |
| 34 | | - public Hashtable DiscussionThreadingInfo; |
| | 34 | + public Hashtable<String,Object> DiscussionThreadingInfo; |
| 35 | 35 | public String Restrictions; |
| 36 | 36 | |
| 37 | 37 | public Page() { |
| 38 | 38 | // <restrictions> is optional... |
| 39 | 39 | Restrictions = ""; |
| 40 | | - DiscussionThreadingInfo = new Hashtable(); |
| | 40 | + DiscussionThreadingInfo = new Hashtable<String, Object>(); |
| 41 | 41 | } |
| 42 | 42 | } |
| Index: trunk/mwdumper/src/org/mediawiki/importer/ListFilter.java |
| — | — | @@ -32,11 +32,11 @@ |
| 33 | 33 | import java.util.HashMap; |
| 34 | 34 | |
| 35 | 35 | public class ListFilter extends PageFilter { |
| 36 | | - protected HashMap list; |
| | 36 | + protected HashMap<String, String> list; |
| 37 | 37 | |
| 38 | 38 | public ListFilter(DumpWriter sink, String sourceFileName) throws IOException { |
| 39 | 39 | super(sink); |
| 40 | | - list = new HashMap(); |
| | 40 | + list = new HashMap<String, String>(); |
| 41 | 41 | BufferedReader input = new BufferedReader(new InputStreamReader( |
| 42 | 42 | new FileInputStream(sourceFileName), "utf-8")); |
| 43 | 43 | String line = input.readLine(); |
| Index: trunk/mwdumper/src/org/mediawiki/importer/MultiWriter.java |
| — | — | @@ -29,57 +29,57 @@ |
| 30 | 30 | import java.util.ArrayList; |
| 31 | 31 | |
| 32 | 32 | public class MultiWriter implements DumpWriter { |
| 33 | | - ArrayList sinks; |
| | 33 | + ArrayList<DumpWriter> sinks; |
| 34 | 34 | |
| 35 | 35 | public MultiWriter() { |
| 36 | | - sinks = new ArrayList(); |
| | 36 | + sinks = new ArrayList<DumpWriter>(); |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | public void close() throws IOException { |
| 40 | 40 | for (int i = 0; i < sinks.size(); i++) { |
| 41 | | - DumpWriter sink = (DumpWriter)sinks.get(i); |
| | 41 | + DumpWriter sink = sinks.get(i); |
| 42 | 42 | sink.close(); |
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | public void writeStartWiki() throws IOException { |
| 47 | 47 | for (int i = 0; i < sinks.size(); i++) { |
| 48 | | - DumpWriter sink = (DumpWriter)sinks.get(i); |
| | 48 | + DumpWriter sink = sinks.get(i); |
| 49 | 49 | sink.writeStartWiki(); |
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | public void writeEndWiki() throws IOException { |
| 54 | 54 | for (int i = 0; i < sinks.size(); i++) { |
| 55 | | - DumpWriter sink = (DumpWriter)sinks.get(i); |
| | 55 | + DumpWriter sink = sinks.get(i); |
| 56 | 56 | sink.writeEndWiki(); |
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | public void writeSiteinfo(Siteinfo info) throws IOException { |
| 61 | 61 | for (int i = 0; i < sinks.size(); i++) { |
| 62 | | - DumpWriter sink = (DumpWriter)sinks.get(i); |
| | 62 | + DumpWriter sink = sinks.get(i); |
| 63 | 63 | sink.writeSiteinfo(info); |
| 64 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | public void writeStartPage(Page page) throws IOException { |
| 68 | 68 | for (int i = 0; i < sinks.size(); i++) { |
| 69 | | - DumpWriter sink = (DumpWriter)sinks.get(i); |
| | 69 | + DumpWriter sink = sinks.get(i); |
| 70 | 70 | sink.writeStartPage(page); |
| 71 | 71 | } |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | public void writeEndPage() throws IOException { |
| 75 | 75 | for (int i = 0; i < sinks.size(); i++) { |
| 76 | | - DumpWriter sink = (DumpWriter)sinks.get(i); |
| | 76 | + DumpWriter sink = sinks.get(i); |
| 77 | 77 | sink.writeEndPage(); |
| 78 | 78 | } |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | public void writeRevision(Revision revision) throws IOException { |
| 82 | 82 | for (int i = 0; i < sinks.size(); i++) { |
| 83 | | - DumpWriter sink = (DumpWriter)sinks.get(i); |
| | 83 | + DumpWriter sink = sinks.get(i); |
| 84 | 84 | sink.writeRevision(revision); |
| 85 | 85 | } |
| 86 | 86 | } |
| Index: trunk/mwdumper/src/org/mediawiki/importer/SqlWriter.java |
| — | — | @@ -151,8 +151,8 @@ |
| 152 | 152 | stream.writeComment("-- Case: " + commentSafe(info.Case)); |
| 153 | 153 | stream.writeComment("--"); |
| 154 | 154 | stream.writeComment("-- Namespaces:"); |
| 155 | | - for (Iterator i = info.Namespaces.orderedEntries(); i.hasNext();) { |
| 156 | | - Map.Entry e = (Map.Entry)i.next(); |
| | 155 | + for (Iterator<Map.Entry<Integer, String>> i = info.Namespaces.orderedEntries(); i.hasNext();) { |
| | 156 | + Map.Entry<Integer, String> e = i.next(); |
| 157 | 157 | stream.writeComment("-- " + e.getKey() + ": " + e.getValue()); |
| 158 | 158 | } |
| 159 | 159 | stream.writeComment(""); |
| — | — | @@ -171,10 +171,10 @@ |
| 172 | 172 | return text; |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | | - private HashMap insertBuffers = new HashMap(); |
| | 175 | + private HashMap<String, StringBuffer> insertBuffers = new HashMap<String, StringBuffer>(); |
| 176 | 176 | private static final int blockSize = 1024 * 512; // default 512k inserts |
| 177 | 177 | protected void bufferInsertRow(String table, Object[][] row) throws IOException { |
| 178 | | - StringBuffer sql = (StringBuffer)insertBuffers.get(table); |
| | 178 | + StringBuffer sql = insertBuffers.get(table); |
| 179 | 179 | if (sql != null) { |
| 180 | 180 | if (traits.supportsMultiRowInsert() && (sql.length() < blockSize)) { |
| 181 | 181 | sql.append(','); |
| — | — | @@ -192,14 +192,14 @@ |
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | protected void flushInsertBuffer(String table) throws IOException { |
| 196 | | - stream.writeStatement((CharSequence)insertBuffers.get(table)); |
| | 196 | + stream.writeStatement(insertBuffers.get(table)); |
| 197 | 197 | insertBuffers.remove(table); |
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | protected void flushInsertBuffers() throws IOException { |
| 201 | | - Iterator iter = insertBuffers.values().iterator(); |
| | 201 | + Iterator<StringBuffer> iter = insertBuffers.values().iterator(); |
| 202 | 202 | while (iter.hasNext()) { |
| 203 | | - stream.writeStatement((CharSequence)iter.next()); |
| | 203 | + stream.writeStatement(iter.next()); |
| 204 | 204 | } |
| 205 | 205 | insertBuffers.clear(); |
| 206 | 206 | } |
| Index: trunk/mwdumper/src/org/mediawiki/importer/NamespaceFilter.java |
| — | — | @@ -29,7 +29,7 @@ |
| 30 | 30 | |
| 31 | 31 | public class NamespaceFilter extends PageFilter { |
| 32 | 32 | boolean invert; |
| 33 | | - HashMap matches; |
| | 33 | + HashMap<Integer, String> matches; |
| 34 | 34 | |
| 35 | 35 | public NamespaceFilter(DumpWriter sink, String configString) { |
| 36 | 36 | super(sink); |
| — | — | @@ -37,7 +37,7 @@ |
| 38 | 38 | invert = configString.startsWith("!"); |
| 39 | 39 | if (invert) |
| 40 | 40 | configString = configString.substring(1); |
| 41 | | - matches = new HashMap(); |
| | 41 | + matches = new HashMap<Integer, String>(); |
| 42 | 42 | |
| 43 | 43 | String[] namespaceKeys = { |
| 44 | 44 | "NS_MAIN", |
| Index: trunk/mwdumper/src/org/mediawiki/importer/SphinxWriter.java |
| — | — | @@ -27,12 +27,7 @@ |
| 28 | 28 | |
| 29 | 29 | import java.io.IOException; |
| 30 | 30 | import java.io.OutputStream; |
| 31 | | -import java.text.DateFormat; |
| 32 | | -import java.text.SimpleDateFormat; |
| 33 | 31 | import java.util.Calendar; |
| 34 | | -import java.util.Iterator; |
| 35 | | -import java.util.Map; |
| 36 | | -import java.util.TimeZone; |
| 37 | 32 | |
| 38 | 33 | /** |
| 39 | 34 | * Generates XML stream suitable for the Sphinx search engine's xmlpipe input. |
| Index: trunk/mwdumper/src/org/mediawiki/importer/XmlDumpReader.java |
| — | — | @@ -106,8 +106,8 @@ |
| 107 | 107 | // -------------------------- |
| 108 | 108 | // SAX handler interface methods: |
| 109 | 109 | |
| 110 | | - private static final Map startElements = new HashMap(64); |
| 111 | | - private static final Map endElements = new HashMap(64); |
| | 110 | + private static final Map<String, String> startElements = new HashMap<String, String>(64); |
| | 111 | + private static final Map<String, String> endElements = new HashMap<String, String>(64); |
| 112 | 112 | static { |
| 113 | 113 | startElements.put("revision","revision"); |
| 114 | 114 | startElements.put("contributor","contributor"); |
| — | — | @@ -163,7 +163,7 @@ |
| 164 | 164 | deleted = (d!=null && d.equals("deleted")); |
| 165 | 165 | |
| 166 | 166 | try { |
| 167 | | - qName = (String)startElements.get(qName); |
| | 167 | + qName = startElements.get(qName); |
| 168 | 168 | if (qName == null) |
| 169 | 169 | return; |
| 170 | 170 | // frequent tags: |
| — | — | @@ -196,7 +196,7 @@ |
| 197 | 197 | |
| 198 | 198 | public void endElement(String uri, String localname, String qName) throws SAXException { |
| 199 | 199 | try { |
| 200 | | - qName = (String)endElements.get(qName); |
| | 200 | + qName = endElements.get(qName); |
| 201 | 201 | if (qName == null) |
| 202 | 202 | return; |
| 203 | 203 | // frequent tags: |
| Index: trunk/mwdumper/src/org/mediawiki/importer/XmlDumpWriter.java |
| — | — | @@ -80,8 +80,8 @@ |
| 81 | 81 | writer.textElement("case", info.Case); |
| 82 | 82 | |
| 83 | 83 | writer.openElement("namespaces"); |
| 84 | | - for (Iterator i = info.Namespaces.orderedEntries(); i.hasNext();) { |
| 85 | | - Map.Entry e = (Map.Entry)i.next(); |
| | 84 | + for (Iterator<Map.Entry<Integer, String>> i = info.Namespaces.orderedEntries(); i.hasNext();) { |
| | 85 | + Map.Entry<Integer, String> e = i.next(); |
| 86 | 86 | writer.textElement("namespace", e.getValue().toString(), new String[][] { |
| 87 | 87 | {"key", e.getKey().toString()}}); |
| 88 | 88 | } |
| Index: trunk/mwdumper/src/org/mediawiki/importer/XmlWriter.java |
| — | — | @@ -14,13 +14,13 @@ |
| 15 | 15 | public class XmlWriter { |
| 16 | 16 | OutputStream stream; |
| 17 | 17 | String encoding; |
| 18 | | - ArrayList stack; |
| | 18 | + ArrayList<String> stack; |
| 19 | 19 | BufferedWriter writer; |
| 20 | 20 | |
| 21 | 21 | public XmlWriter(OutputStream stream) throws IOException { |
| 22 | 22 | this.stream = stream; |
| 23 | 23 | encoding = "utf-8"; |
| 24 | | - stack = new ArrayList(); |
| | 24 | + stack = new ArrayList<String>(); |
| 25 | 25 | writer = new BufferedWriter(new OutputStreamWriter(stream, "UTF8")); |
| 26 | 26 | } |
| 27 | 27 | |
| — | — | @@ -171,7 +171,7 @@ |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | private String[] deindent() { |
| 175 | | - String element = (String)stack.remove(stack.size() - 1); |
| | 175 | + String element = stack.remove(stack.size() - 1); |
| 176 | 176 | String space = spaces(stack.size()); |
| 177 | 177 | return new String[] {element, space}; |
| 178 | 178 | } |
| Index: trunk/mwdumper/src/org/mediawiki/dumper/Tools.java |
| — | — | @@ -11,8 +11,8 @@ |
| 12 | 12 | import java.io.OutputStream; |
| 13 | 13 | import java.util.zip.GZIPInputStream; |
| 14 | 14 | |
| 15 | | -import org.apache.commons.compress.bzip2.CBZip2InputStream; |
| 16 | | -import org.apache.commons.compress.bzip2.CBZip2OutputStream; |
| | 15 | +import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; |
| | 16 | +import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream; |
| 17 | 17 | |
| 18 | 18 | public class Tools { |
| 19 | 19 | static final int IN_BUF_SZ = 1024 * 1024; |
| — | — | @@ -39,7 +39,7 @@ |
| 40 | 40 | int second = infile.read(); |
| 41 | 41 | if (first != 'B' || second != 'Z') |
| 42 | 42 | throw new IOException("Didn't find BZ file signature in .bz2 file"); |
| 43 | | - return new CBZip2InputStream(infile); |
| | 43 | + return new BZip2CompressorInputStream(infile); |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | static OutputStream openStandardOutput() { |
| — | — | @@ -51,7 +51,7 @@ |
| 52 | 52 | // bzip2 expects a two-byte 'BZ' signature header |
| 53 | 53 | outfile.write('B'); |
| 54 | 54 | outfile.write('Z'); |
| 55 | | - return new CBZip2OutputStream(outfile); |
| | 55 | + return new BZip2CompressorOutputStream(outfile); |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | static OutputStream createOutputFile(String param) throws IOException, FileNotFoundException { |
| Index: trunk/mwdumper/src/org/mediawiki/dumper/gui/DumperGui.java |
| — | — | @@ -250,6 +250,7 @@ |
| 251 | 251 | System.setProperty("apple.laf.useScreenMenuBar", "true"); |
| 252 | 252 | System.setProperty("com.apple.mrj.application.apple.menu.about.name", "MediaWiki Import"); |
| 253 | 253 | |
| | 254 | + @SuppressWarnings("unused") |
| 254 | 255 | DumperGui manager = new DumperGui(); |
| 255 | 256 | } |
| 256 | 257 | |
| Index: trunk/mwdumper/src/org/mediawiki/dumper/gui/DumperWindow.java |
| — | — | @@ -26,6 +26,10 @@ |
| 27 | 27 | * @author brion |
| 28 | 28 | */ |
| 29 | 29 | public class DumperWindow extends DumperWindowForm { |
| | 30 | + /** |
| | 31 | + * |
| | 32 | + */ |
| | 33 | + private static final long serialVersionUID = 154925660542049290L; |
| 30 | 34 | protected DumperGui backend; |
| 31 | 35 | private int dbtype = DumperGui.DBTYPE_MYSQL; |
| 32 | 36 | |
| — | — | @@ -160,7 +164,7 @@ |
| 161 | 165 | backend.connect(dbtype, serverText.getText(), |
| 162 | 166 | portText.getText(), |
| 163 | 167 | userText.getText(), |
| 164 | | - passwordText.getText()); |
| | 168 | + new String(passwordText.getPassword())); |
| 165 | 169 | } |
| 166 | 170 | |
| 167 | 171 | protected void onDbTypeButtonActionPerformed(java.awt.event.ActionEvent evt) { |
| Index: trunk/mwdumper/src/org/mediawiki/dumper/gui/DumperWindowForm.java |
| — | — | @@ -12,6 +12,11 @@ |
| 13 | 13 | */ |
| 14 | 14 | public class DumperWindowForm extends javax.swing.JFrame { |
| 15 | 15 | |
| | 16 | + /** |
| | 17 | + * |
| | 18 | + */ |
| | 19 | + private static final long serialVersionUID = 9045740449396873205L; |
| | 20 | + |
| 16 | 21 | /** Creates new form DumperWindow */ |
| 17 | 22 | public DumperWindowForm() { |
| 18 | 23 | initComponents(); |
| Index: trunk/mwdumper/src/org/mediawiki/dumper/Dumper.java |
| — | — | @@ -66,7 +66,6 @@ |
| 67 | 67 | import java.sql.Connection; |
| 68 | 68 | import java.sql.DriverManager; |
| 69 | 69 | import java.util.zip.GZIPOutputStream; |
| 70 | | -import java.lang.ClassNotFoundException; |
| 71 | 70 | |
| 72 | 71 | import java.text.ParseException; |
| 73 | 72 | |
| Index: trunk/mwdumper/pom.xml |
| — | — | @@ -10,18 +10,17 @@ |
| 11 | 11 | <url>http://www.mediawiki.org/wiki/MWDumper</url> |
| 12 | 12 | |
| 13 | 13 | <dependencies> |
| 14 | | - <!-- provided in source. todo: use package. --> |
| 15 | | - <!-- <dependency> |
| 16 | | - <groupId>commons-compress</groupId> |
| 17 | | - <artifactId>commons-compress</artifactId> |
| 18 | | - <version>20050911</version> |
| 19 | | - <scope>compile</scope> |
| 20 | | - </dependency> --> |
| | 14 | + <dependency> |
| | 15 | + <groupId>org.apache.commons</groupId> |
| | 16 | + <artifactId>commons-compress</artifactId> |
| | 17 | + <version>1.3</version> |
| | 18 | + <scope>compile</scope> |
| | 19 | + </dependency> |
| 21 | 20 | <dependency> |
| 22 | | - <groupId>net.java.dev.swing-layout</groupId> |
| 23 | | - <artifactId>swing-layout</artifactId> |
| 24 | | - <version>1.0.1</version> |
| 25 | | - <scope>compile</scope> |
| | 21 | + <groupId>net.java.dev.swing-layout</groupId> |
| | 22 | + <artifactId>swing-layout</artifactId> |
| | 23 | + <version>1.0.1</version> |
| | 24 | + <scope>compile</scope> |
| 26 | 25 | </dependency> |
| 27 | 26 | <dependency> |
| 28 | 27 | <groupId>mysql</groupId> |
| — | — | @@ -52,7 +51,7 @@ |
| 53 | 52 | <artifactId>junit</artifactId> |
| 54 | 53 | <version>3.8</version> |
| 55 | 54 | <scope>test</scope> |
| 56 | | - </dependency> |
| | 55 | + </dependency> |
| 57 | 56 | </dependencies> |
| 58 | 57 | <build> |
| 59 | 58 | <directory>build</directory> <!-- where the jar goes --> |
| — | — | @@ -63,8 +62,8 @@ |
| 64 | 63 | <groupId>org.apache.maven.plugins</groupId> |
| 65 | 64 | <artifactId>maven-compiler-plugin</artifactId> |
| 66 | 65 | <configuration> |
| 67 | | - <source>1.4</source> <!-- enable assertions --> |
| 68 | | - <target>1.4</target> |
| | 66 | + <source>1.6</source> <!-- enable assertions --> |
| | 67 | + <target>1.6</target> |
| 69 | 68 | <excludes> <!-- exclude tests here --> |
| 70 | 69 | <exclude>**/*Test.java</exclude> |
| 71 | 70 | </excludes> |
| Index: trunk/mwdumper/.settings/org.eclipse.jdt.core.prefs |
| — | — | @@ -0,0 +1,6 @@ |
| | 2 | +#Wed Feb 08 17:38:09 CET 2012
|
| | 3 | +eclipse.preferences.version=1
|
| | 4 | +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
|
| | 5 | +org.eclipse.jdt.core.compiler.compliance=1.6
|
| | 6 | +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
| | 7 | +org.eclipse.jdt.core.compiler.source=1.6
|
| Property changes on: trunk/mwdumper/.settings/org.eclipse.jdt.core.prefs |
| ___________________________________________________________________ |
| Added: svn:keywords |
| 1 | 8 | + LastChangedDate LastChangedRevision LastChangedBy Id |
| Index: trunk/mwdumper/.settings/org.eclipse.m2e.core.prefs |
| — | — | @@ -0,0 +1,5 @@ |
| | 2 | +#Wed Feb 08 17:38:08 CET 2012
|
| | 3 | +activeProfiles=
|
| | 4 | +eclipse.preferences.version=1
|
| | 5 | +resolveWorkspaceProjects=true
|
| | 6 | +version=1
|
| Property changes on: trunk/mwdumper/.settings/org.eclipse.m2e.core.prefs |
| ___________________________________________________________________ |
| Added: svn:keywords |
| 1 | 7 | + LastChangedDate LastChangedRevision LastChangedBy Id |