I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* Moved PetName and PetNameDB to core.

Browse Source 
* Implement PetNameNamingService.
This commit is contained in:
ragnarok
2005-09-18 05:28:51 +00:00
committed by zzz
parent 2a272f465c
commit 6be0c4b694
13 changed files with 80 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/syndie/java/src/net/i2p/syndie/BlogManager.java
View File

@ -4,6 +4,8 @@ import java.io.*;
import java.text.*; import java.text.*;
import java.util.*; import java.util.*;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
import net.i2p.client.naming.PetName;
import net.i2p.client.naming.PetNameDB;
import net.i2p.data.*; import net.i2p.data.*;
import net.i2p.syndie.data.*; import net.i2p.syndie.data.*;
import net.i2p.syndie.sml.*; import net.i2p.syndie.sml.*;

1
apps/syndie/java/src/net/i2p/syndie/User.java
View File

@ -4,6 +4,7 @@ import java.io.UnsupportedEncodingException;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
import net.i2p.client.naming.PetNameDB;
import net.i2p.data.*; import net.i2p.data.*;
/** /**

1
apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java
View File

@ -4,6 +4,7 @@ import java.io.*;
import java.text.*; import java.text.*;
import java.util.*; import java.util.*;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
import net.i2p.client.naming.PetName;
import net.i2p.data.*; import net.i2p.data.*;
import net.i2p.syndie.*; import net.i2p.syndie.*;
import net.i2p.syndie.data.*; import net.i2p.syndie.data.*;

2
apps/syndie/java/src/net/i2p/syndie/web/ArchiveViewerBean.java
View File

@ -4,6 +4,8 @@ import java.io.*;
import java.text.*; import java.text.*;
import java.util.*; import java.util.*;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
import net.i2p.client.naming.PetName;
import net.i2p.client.naming.PetNameDB;
import net.i2p.data.*; import net.i2p.data.*;
import net.i2p.syndie.*; import net.i2p.syndie.*;
import net.i2p.syndie.data.*; import net.i2p.syndie.data.*;

1
apps/syndie/java/src/net/i2p/syndie/web/PostBean.java
View File

@ -3,6 +3,7 @@ package net.i2p.syndie.web;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
import net.i2p.client.naming.PetName;
import net.i2p.syndie.*; import net.i2p.syndie.*;
import net.i2p.syndie.data.BlogURI; import net.i2p.syndie.data.BlogURI;
import net.i2p.syndie.sml.HTMLPreviewRenderer; import net.i2p.syndie.sml.HTMLPreviewRenderer;

1
apps/syndie/java/src/net/i2p/syndie/web/RemoteArchiveBean.java
View File

@ -5,6 +5,7 @@ import java.text.*;
import java.util.*; import java.util.*;
import java.util.zip.*; import java.util.zip.*;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
import net.i2p.client.naming.PetNameDB;
import net.i2p.data.*; import net.i2p.data.*;
import net.i2p.util.EepGet; import net.i2p.util.EepGet;
import net.i2p.util.EepGetScheduler; import net.i2p.util.EepGetScheduler;

2
apps/syndie/jsp/_bodyindex.jsp
View File

@ -1,4 +1,4 @@
<%@page contentType="text/html; charset=UTF-8" import="net.i2p.syndie.web.ArchiveViewerBean, net.i2p.syndie.*" %> <%@page contentType="text/html; charset=UTF-8" import="net.i2p.syndie.web.ArchiveViewerBean, net.i2p.syndie.*, net.i2p.client.naming.PetName" %>
<% request.setCharacterEncoding("UTF-8"); %> <% request.setCharacterEncoding("UTF-8"); %>
<jsp:useBean scope="session" class="net.i2p.syndie.User" id="user" /><% <jsp:useBean scope="session" class="net.i2p.syndie.User" id="user" /><%
if (user.getAuthenticated() && (null != request.getParameter("action")) ) { if (user.getAuthenticated() && (null != request.getParameter("action")) ) {

2
apps/syndie/jsp/addresses.jsp
View File

@ -1,4 +1,4 @@
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" import="net.i2p.data.Base64, net.i2p.syndie.web.*, net.i2p.syndie.sml.*, net.i2p.syndie.data.*, net.i2p.syndie.*, org.mortbay.servlet.MultiPartRequest, java.util.*, java.io.*" %><% <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" import="net.i2p.data.Base64, net.i2p.syndie.web.*, net.i2p.syndie.sml.*, net.i2p.syndie.data.*, net.i2p.syndie.*, net.i2p.client.naming.PetName, net.i2p.client.naming.PetNameDB, org.mortbay.servlet.MultiPartRequest, java.util.*, java.io.*" %><%
request.setCharacterEncoding("UTF-8"); %><jsp:useBean scope="session" class="net.i2p.syndie.User" id="user" request.setCharacterEncoding("UTF-8"); %><jsp:useBean scope="session" class="net.i2p.syndie.User" id="user"
/><!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 TRANSITIONAL//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd"> /><!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 TRANSITIONAL//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
<html> <html>

2
apps/syndie/jsp/post.jsp
View File

@ -1,4 +1,4 @@
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" import="net.i2p.data.Base64, net.i2p.syndie.web.*, net.i2p.syndie.sml.*, net.i2p.syndie.data.*, net.i2p.syndie.*, org.mortbay.servlet.MultiPartRequest, java.util.*" %><% <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" import="net.i2p.data.Base64, net.i2p.client.naming.PetName, net.i2p.client.naming.PetNameDB, net.i2p.syndie.web.*, net.i2p.syndie.sml.*, net.i2p.syndie.data.*, net.i2p.syndie.*, org.mortbay.servlet.MultiPartRequest, java.util.*" %><%
request.setCharacterEncoding("UTF-8"); request.setCharacterEncoding("UTF-8");
%><jsp:useBean scope="session" class="net.i2p.syndie.User" id="user" %><jsp:useBean scope="session" class="net.i2p.syndie.User" id="user"
/><jsp:useBean scope="session" class="net.i2p.syndie.web.PostBean" id="post" /><jsp:useBean scope="session" class="net.i2p.syndie.web.PostBean" id="post"

2
apps/syndie/jsp/remote.jsp
View File

@ -1,4 +1,4 @@
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" import="net.i2p.syndie.web.*, net.i2p.syndie.*, net.i2p.syndie.sml.*, java.util.*" %><% <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" import="net.i2p.client.naming.PetName, net.i2p.syndie.web.*, net.i2p.syndie.*, net.i2p.syndie.sml.*, java.util.*" %><%
request.setCharacterEncoding("UTF-8"); request.setCharacterEncoding("UTF-8");
%><jsp:useBean scope="session" class="net.i2p.syndie.web.RemoteArchiveBean" id="remote" %><jsp:useBean scope="session" class="net.i2p.syndie.web.RemoteArchiveBean" id="remote"
/><jsp:useBean scope="session" class="net.i2p.syndie.User" id="user" /><jsp:useBean scope="session" class="net.i2p.syndie.User" id="user"

2
apps/syndie/java/src/net/i2p/syndie/PetName.java → core/java/src/net/i2p/client/naming/PetName.java
View File

@ -1,4 +1,4 @@
package net.i2p.syndie; package net.i2p.client.naming;
import java.util.*; import java.util.*;
import net.i2p.data.DataHelper; import net.i2p.data.DataHelper;

3
apps/syndie/java/src/net/i2p/syndie/PetNameDB.java → core/java/src/net/i2p/client/naming/PetNameDB.java
View File

@ -1,8 +1,9 @@
package net.i2p.syndie; package net.i2p.client.naming;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;
/** /**
* *
*/ */

65
core/java/src/net/i2p/client/naming/PetNameNamingService.java Normal file
View File

@ -0,0 +1,65 @@
package net.i2p.client.naming;
import java.io.File;
import java.io.IOException;
import java.util.Iterator;
import java.util.Properties;
import net.i2p.I2PAppContext;
import net.i2p.data.DataHelper;
import net.i2p.data.Destination;
public class PetNameNamingService extends NamingService {
private PetNameDB _petnameDb;
public final static String PROP_PETNAME_FILE = "i2p.petnamefile";
public final static String DEFAULT_PETNAME_FILE = "petnames.txt";
public PetNameNamingService(I2PAppContext context) {
super(context);
_petnameDb = new PetNameDB();
String file = _context.getProperty(PROP_PETNAME_FILE, DEFAULT_PETNAME_FILE);
//If the petnamedb file doesn't exist, create it, using the
//contents of hosts.txt.
File nameFile = new File(file);
if (!nameFile.exists()) {
Properties hosts = new Properties();
File hostsFile = new File("hosts.txt");
if (hostsFile.exists() && hostsFile.canRead()) {
try {
DataHelper.loadProps(hosts, hostsFile);
} catch (IOException ioe) {
}
}
Iterator iter = hosts.keySet().iterator();
while (iter.hasNext()) {
String hostname = (String)iter.next();
PetName pn = new PetName(hostname, "i2p", "http", hosts.getProperty(hostname));
_petnameDb.set(hostname, pn);
}
try {
_petnameDb.store(file);
} catch (IOException ioe) {
}
}
try {
_petnameDb.load(file);
} catch (IOException ioe) {
}
}
public Destination lookup(String hostname) {
PetName name = _petnameDb.get(hostname);
if (name != null && name.getNetwork().equals("i2p")) {
return lookupBase64(name.getLocation());
} else {
return lookupBase64(hostname);
}
}
public String reverseLookup(Destination dest) {
return _petnameDb.getNameByLocation(dest.toBase64());
}
}