Added password encoding.
This commit is contained in:
parent
a3c2ee9539
commit
891603dea2
5 changed files with 89 additions and 91 deletions
|
@ -11,7 +11,7 @@
|
|||
</buildFile>
|
||||
<buildFile url="file://$PROJECT_DIR$/webstart.xml">
|
||||
<additionalClassPath />
|
||||
<antReference projectDefault="true" />
|
||||
<antReference name="Local Ant" />
|
||||
<customJdkName value="" />
|
||||
<maximumHeapSize value="128" />
|
||||
<properties />
|
||||
|
|
137
LifeBlogger.iws
137
LifeBlogger.iws
|
@ -71,7 +71,7 @@
|
|||
<option name="PUT_FOCUS_INTO_COMMENT" value="true" />
|
||||
<option name="SHOW_CHECKIN_OPTIONS" value="true" />
|
||||
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Added licenses." />
|
||||
<option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
|
||||
<option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
|
||||
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
|
||||
|
@ -113,9 +113,9 @@
|
|||
</component>
|
||||
<component name="FileEditorManager" split-orientation="vertical" split-proportion="0.5">
|
||||
<first-group selected-file="file://$PROJECT_DIR$/src/net/thauvin/lifeblogger/LifeMediaObject.java">
|
||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/lifeblogger/LifeBlog.java" pinned="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/lifeblogger/LifeMediaObject.java" pinned="false">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="54" column="22" selection-start="2017" selection-end="2017" vertical-scroll-proportion="0.22568807">
|
||||
<state line="117" column="43" selection-start="3715" selection-end="3715" vertical-scroll-proportion="2.4542253">
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
|
@ -124,7 +124,7 @@
|
|||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/lifeblogger/LifeBlogger.java" pinned="false">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="136" column="23" selection-start="3661" selection-end="3661" vertical-scroll-proportion="0.2440367">
|
||||
<state line="543" column="85" selection-start="13608" selection-end="13608" vertical-scroll-proportion="0.346831">
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
|
@ -133,32 +133,14 @@
|
|||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/lifeblogger/ReleaseInfo.java" pinned="false">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="15" column="44" selection-start="434" selection-end="434" vertical-scroll-proportion="0.22568807">
|
||||
<state line="28" column="53" selection-start="795" selection-end="795" vertical-scroll-proportion="0.19894366">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/lifeblogger/LifeFTP.java" pinned="false">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="85" column="26" selection-start="2834" selection-end="2834" vertical-scroll-proportion="0.22568807">
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/lifeblogger/LifeMediaObjResponse.java" pinned="false">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="27" column="13" selection-start="1401" selection-end="1401" vertical-scroll-proportion="0.034862384">
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/lifeblogger/LifeMediaObject.java" pinned="false">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="120" column="26" selection-start="3692" selection-end="3692" vertical-scroll-proportion="2.3486238">
|
||||
<state line="54" column="19" selection-start="2104" selection-end="2104" vertical-scroll-proportion="0.346831">
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
|
@ -181,14 +163,14 @@
|
|||
<component name="J2EEProjectPane" />
|
||||
<component name="NamedScopeManager" />
|
||||
<component name="PackagesPane">
|
||||
<expanded_node url="" module="LifeBlogger" type="module" />
|
||||
<expanded_node url="net.thauvin.lifeblogger" module="LifeBlogger" type="package" />
|
||||
<expanded_node url="net.thauvin" module="LifeBlogger" type="package" />
|
||||
<expanded_node url="net" module="LifeBlogger" type="package" />
|
||||
<expanded_node url="" module="LifeBlogger" type="module" />
|
||||
</component>
|
||||
<component name="ProjectPane">
|
||||
<expanded_node url="file://$PROJECT_DIR$" module="LifeBlogger" type="directory" />
|
||||
<expanded_node url="" module="LifeBlogger" type="module" />
|
||||
<expanded_node url="file://$PROJECT_DIR$" module="LifeBlogger" type="directory" />
|
||||
</component>
|
||||
<component name="ProjectView">
|
||||
<navigator currentView="ProjectPane" splitterProportion="0.5">
|
||||
|
@ -197,7 +179,7 @@
|
|||
<showModules />
|
||||
<showLibraryContents />
|
||||
<hideEmptyPackages />
|
||||
<showStructure ProjectPane="false" />
|
||||
<showStructure PackagesPane="false" ProjectPane="false" />
|
||||
<autoscrollToSource />
|
||||
<autoscrollFromSource />
|
||||
</navigator>
|
||||
|
@ -215,20 +197,6 @@
|
|||
</component>
|
||||
<component name="RunManager">
|
||||
<activeType name="Application" />
|
||||
<configuration selected="false" default="true" type="WebLogic Instance" factoryName="Local">
|
||||
<option name="WORKING_DIRECTORY" />
|
||||
<option name="HOST" value="localhost" />
|
||||
<option name="PORT" value="7001" />
|
||||
<option name="LOCAL" value="true" />
|
||||
<option name="OPEN_IN_BROWSER" value="true" />
|
||||
<option name="OPEN_IN_BROWSER_URL" value="/" />
|
||||
<option name="COMMON_VM_ARGUMENTS" value="" />
|
||||
<option name="DOMAIN_PATH" value="" />
|
||||
<option name="USER" value="weblogic" />
|
||||
<option name="PASSWORD" value="weblogic" />
|
||||
<option name="SERVER_NAME" value="myserver" />
|
||||
<option name="DOMAIN_NAME" value="mydomain" />
|
||||
</configuration>
|
||||
<configuration selected="false" default="true" type="JUnit" factoryName="JUnit">
|
||||
<module name="" />
|
||||
<option name="PACKAGE_NAME" />
|
||||
|
@ -243,6 +211,20 @@
|
|||
<value defaultName="wholeProject" />
|
||||
</option>
|
||||
</configuration>
|
||||
<configuration selected="false" default="true" type="WebLogic Instance" factoryName="Local">
|
||||
<option name="WORKING_DIRECTORY" />
|
||||
<option name="HOST" value="localhost" />
|
||||
<option name="PORT" value="7001" />
|
||||
<option name="LOCAL" value="true" />
|
||||
<option name="OPEN_IN_BROWSER" value="true" />
|
||||
<option name="OPEN_IN_BROWSER_URL" value="/" />
|
||||
<option name="COMMON_VM_ARGUMENTS" value="" />
|
||||
<option name="DOMAIN_PATH" value="" />
|
||||
<option name="USER" value="weblogic" />
|
||||
<option name="PASSWORD" value="weblogic" />
|
||||
<option name="SERVER_NAME" value="myserver" />
|
||||
<option name="DOMAIN_NAME" value="mydomain" />
|
||||
</configuration>
|
||||
<configuration selected="false" default="true" type="Remote" factoryName="Remote">
|
||||
<option name="USE_SOCKET_TRANSPORT" value="true" />
|
||||
<option name="SERVER_MODE" value="false" />
|
||||
|
@ -333,14 +315,14 @@
|
|||
<editor active="false" />
|
||||
<layout>
|
||||
<window_info id="Properties File Structure" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.16428572" order="4" />
|
||||
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
|
||||
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33024693" order="8" />
|
||||
<window_info id="Regex" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33024693" order="9" />
|
||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" />
|
||||
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.35306123" order="0" />
|
||||
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.21734694" order="0" />
|
||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33024693" order="1" />
|
||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
|
||||
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33024693" order="10" />
|
||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39969134" order="6" />
|
||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39969134" order="6" x="66" y="104" width="924" height="583" />
|
||||
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="11" />
|
||||
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.13163266" order="1" />
|
||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33024693" order="2" />
|
||||
|
@ -439,7 +421,12 @@
|
|||
<buildFile url="file://$PROJECT_DIR$/webstart.xml">
|
||||
<antCommandLine value="" />
|
||||
<runInBackground value="false" />
|
||||
<targetFilters />
|
||||
<targetFilters>
|
||||
<filter targetName="init" isVisible="false" />
|
||||
<filter targetName="build" isVisible="true" />
|
||||
<filter targetName="clean" isVisible="false" />
|
||||
<filter targetName="ftp" isVisible="false" />
|
||||
</targetFilters>
|
||||
<treeView value="true" />
|
||||
<verbose value="true" />
|
||||
<viewClosedWhenNoErrors value="false" />
|
||||
|
@ -481,13 +468,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/lifeblogger/main.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="7" column="67" selection-start="313" selection-end="313" vertical-scroll-proportion="0.3429395">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/lifeblogger/metaweblog.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="4" column="21" selection-start="308" selection-end="308" vertical-scroll-proportion="0.19596542">
|
||||
|
@ -511,16 +491,32 @@
|
|||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/lifeblogger/LifeBlog.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="54" column="22" selection-start="2017" selection-end="2017" vertical-scroll-proportion="0.22568807">
|
||||
<state line="54" column="22" selection-start="2096" selection-end="2096" vertical-scroll-proportion="0.26903552">
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/lifeblogger/LifeBlogger.java">
|
||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/lifeblogger/LifeFTP.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="136" column="23" selection-start="3661" selection-end="3661" vertical-scroll-proportion="0.2440367">
|
||||
<state line="85" column="26" selection-start="2912" selection-end="2912" vertical-scroll-proportion="0.26903552">
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/lifeblogger/main.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="7" column="41" selection-start="287" selection-end="287" vertical-scroll-proportion="0.32162163">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/lifeblogger/LifeMediaObject.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="117" column="43" selection-start="3715" selection-end="3715" vertical-scroll-proportion="2.4542253">
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
|
@ -529,32 +525,23 @@
|
|||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/lifeblogger/ReleaseInfo.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="15" column="44" selection-start="434" selection-end="434" vertical-scroll-proportion="0.22568807">
|
||||
<state line="28" column="53" selection-start="795" selection-end="795" vertical-scroll-proportion="0.19894366">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/lifeblogger/LifeFTP.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="85" column="26" selection-start="2834" selection-end="2834" vertical-scroll-proportion="0.22568807">
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/lifeblogger/LifeMediaObject.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="120" column="26" selection-start="3692" selection-end="3692" vertical-scroll-proportion="2.3486238">
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/lifeblogger/LifeMediaObjResponse.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="27" column="13" selection-start="1401" selection-end="1401" vertical-scroll-proportion="0.034862384">
|
||||
<state line="54" column="19" selection-start="2104" selection-end="2104" vertical-scroll-proportion="0.346831">
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/lifeblogger/LifeBlogger.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="543" column="85" selection-start="13608" selection-end="13608" vertical-scroll-proportion="0.346831">
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
|
|
|
@ -43,8 +43,6 @@ import java.awt.*;
|
|||
|
||||
import java.io.*;
|
||||
|
||||
import java.net.URL;
|
||||
|
||||
import java.sql.Connection;
|
||||
import java.sql.DriverManager;
|
||||
import java.sql.ResultSet;
|
||||
|
@ -73,6 +71,7 @@ public class LifeBlogger extends Thinlet
|
|||
System.getProperty("user.home") + File.separator + ReleaseInfo.getProject() + ".properties";
|
||||
private static final String JDBC_PREFIX = "jdbc:sqlite:/";
|
||||
private static final String DATABASE = "\\DataBase\\NokiaLifeblogDataBase.db";
|
||||
private static final String DEFAULT_ACTION = "ftp";
|
||||
private final Properties _prefs = new Properties();
|
||||
private File _homeDir = new File(System.getProperty("user.home") + "\\My Documents\\NokiaLifeblogData");
|
||||
private String _action;
|
||||
|
@ -114,7 +113,7 @@ public class LifeBlogger extends Thinlet
|
|||
}
|
||||
|
||||
_homeDir = new File(_prefs.getProperty("home", _homeDir.getAbsolutePath()));
|
||||
_action = _prefs.getProperty("via", "ftp");
|
||||
_action = _prefs.getProperty("via", DEFAULT_ACTION);
|
||||
|
||||
try
|
||||
{
|
||||
|
@ -126,7 +125,19 @@ public class LifeBlogger extends Thinlet
|
|||
}
|
||||
|
||||
final Object main = parse("main.xml");
|
||||
setBoolean(find(main, _action), "selected", true);
|
||||
|
||||
final Object via = find(main, _action);
|
||||
|
||||
if (via != null)
|
||||
{
|
||||
setBoolean(via, "selected", true);
|
||||
}
|
||||
else
|
||||
{
|
||||
_action = DEFAULT_ACTION;
|
||||
setBoolean(find(main, _action), "selected", true);
|
||||
}
|
||||
|
||||
add(main);
|
||||
}
|
||||
|
||||
|
@ -371,7 +382,7 @@ public class LifeBlogger extends Thinlet
|
|||
{
|
||||
_prefs.put("host", host);
|
||||
_prefs.put("login", login);
|
||||
_prefs.put("password", password);
|
||||
_prefs.put("password", Base64.encodeBytes(password.getBytes(), Base64.DONT_BREAK_LINES));
|
||||
_prefs.put("path", path);
|
||||
|
||||
savePrefs();
|
||||
|
@ -426,7 +437,7 @@ public class LifeBlogger extends Thinlet
|
|||
{
|
||||
_prefs.put("mw-host", host);
|
||||
_prefs.put("mw-login", login);
|
||||
_prefs.put("mw-password", password);
|
||||
_prefs.put("mw-password", Base64.encodeBytes(password.getBytes(), Base64.DONT_BREAK_LINES));
|
||||
_prefs.put("mw-id", blogID);
|
||||
|
||||
savePrefs();
|
||||
|
@ -533,7 +544,7 @@ public class LifeBlogger extends Thinlet
|
|||
setString(find(ftp, "filename"), "text", file.substring(file.lastIndexOf('\\') + 1));
|
||||
setString(find(ftp, "host"), "text", _prefs.getProperty("host", ""));
|
||||
setString(find(ftp, "login"), "text", _prefs.getProperty("login", "anonymous"));
|
||||
setString(find(ftp, "password"), "text", _prefs.getProperty("password", ""));
|
||||
setString(find(ftp, "password"), "text", new String(Base64.decode(_prefs.getProperty("password", ""))));
|
||||
add(ftp);
|
||||
requestFocus(find(ftp, "host"));
|
||||
}
|
||||
|
@ -554,7 +565,7 @@ public class LifeBlogger extends Thinlet
|
|||
setString(find(mw, "filename"), "text", file.substring(file.lastIndexOf('\\') + 1));
|
||||
setString(find(mw, "host"), "text", _prefs.getProperty("mw-host", ""));
|
||||
setString(find(mw, "login"), "text", _prefs.getProperty("mw-login", "anonymous"));
|
||||
setString(find(mw, "password"), "text", _prefs.getProperty("mw-password", ""));
|
||||
setString(find(mw, "password"), "text", new String(Base64.decode(_prefs.getProperty("mw-password", ""))));
|
||||
setString(find(mw, "blogid"), "text", _prefs.getProperty("mw-id", ""));
|
||||
add(mw);
|
||||
requestFocus(find(mw, "host"));
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/* Created by JReleaseInfo AntTask from Open Source Competence Group */
|
||||
/* Creation date Thu Jul 22 04:13:17 PDT 2004 */
|
||||
/* Creation date Thu Jul 22 16:15:30 PDT 2004 */
|
||||
package net.thauvin.lifeblogger;
|
||||
|
||||
import java.util.Date;
|
||||
|
@ -12,21 +12,21 @@ import java.util.Date;
|
|||
public class ReleaseInfo {
|
||||
|
||||
|
||||
/** buildDate (set during build process to 1090494797296L). */
|
||||
private static Date buildDate = new Date(1090494797296L);
|
||||
/** buildDate (set during build process to 1090538130250L). */
|
||||
private static Date buildDate = new Date(1090538130250L);
|
||||
|
||||
/**
|
||||
* Get buildDate (set during build process to Thu Jul 22 04:13:17 PDT 2004).
|
||||
* Get buildDate (set during build process to Thu Jul 22 16:15:30 PDT 2004).
|
||||
* @return Date buildDate
|
||||
*/
|
||||
public static final Date getBuildDate() { return buildDate; }
|
||||
|
||||
|
||||
/**
|
||||
* Get buildNumber (set during build process to 77).
|
||||
* Get buildNumber (set during build process to 95).
|
||||
* @return int buildNumber
|
||||
*/
|
||||
public static final int getBuildNumber() { return 77; }
|
||||
public static final int getBuildNumber() { return 95; }
|
||||
|
||||
|
||||
/** version (set during build process to "0.1.0"). */
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
</menu>
|
||||
<menu text="Blog" mnemonic="0">
|
||||
<checkboxmenuitem name="ftp" text="Via FTP" group="via" mnemonic="4" action="setAction(this.name)"/>
|
||||
<checkboxmenuitem name="mv" text="Via MetaWeblog" group="via" mnemonic="4" action="setAction(this.name)"/>
|
||||
<checkboxmenuitem name="mw" text="Via MetaWeblog" group="via" mnemonic="4" action="setAction(this.name)"/>
|
||||
</menu>
|
||||
<menu text="Help" mnemonic="0">
|
||||
<menuitem text="About" action="about()" icon="/icon/about.gif" mnemonic="0"/>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue