Author: rfelden
Date: Fri Jun 8 17:03:51 2007
New Revision: 55
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D55&repname=3D=
jahia_upgrade
Log:
integrity-server : deployable war file, without mysqlconnector (TODO, inclu=
de with maven2)
integrity : fully functional client (default settings for jahia's instranet)
Removed:
trunk/integrity/lib/
trunk/integrity/src/main/java/org/jahia/database/
Modified:
trunk/integrity-server/src/main/java/org/jahia/integrityserver/Integrit=
yServerImpl.java
trunk/integrity-server/src/main/resources/org/jahia/integrityserver/mys=
ql.properties
trunk/integrity-server/src/main/webapp/WEB-INF/web.xml
trunk/integrity/src/main/java/org/jahia/integrity/Application.java
trunk/integrity/src/main/java/org/jahia/integrity/controller/Controller=
.java
trunk/integrity/src/main/java/org/jahia/integrity/model/MyModel.java
trunk/integrity/src/main/java/org/jahia/integrity/view/ArrayListModel.j=
ava
trunk/integrity/src/main/java/org/jahia/integrity/view/MainPanel.java
trunk/integrity/src/main/java/org/jahia/integrity/view/MainWindow.java
trunk/integrity/src/main/java/org/jahia/integrity/view/PrefsWindow.java
trunk/integrity/src/main/resources/org/jahia/integrity/resources/gui.pr=
operties
Modified: trunk/integrity-server/src/main/java/org/jahia/integrityserver/In=
tegrityServerImpl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/integrity-serve=
r/src/main/java/org/jahia/integrityserver/IntegrityServerImpl.java&rev=3D55=
&repname=3Djahia_upgrade
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/integrity-server/src/main/java/org/jahia/integrityserver/Integrit=
yServerImpl.java (original)
+++ trunk/integrity-server/src/main/java/org/jahia/integrityserver/Integrit=
yServerImpl.java Fri Jun 8 17:03:51 2007
@@ -25,7 +25,17 @@
return bos.toByteArray() ;
}
} catch (SQLException e) {
- e.printStackTrace();
+ //e.printStackTrace();
+ String noTable =3D "noTable" ;
+ ByteArrayOutputStream bos =3D new ByteArrayOutputStream() ;
+ try {
+ ObjectOutput out =3D new ObjectOutputStream(bos) ;
+ out.writeObject(noTable);
+ out.close() ;
+ return bos.toByteArray() ;
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
} catch (IOException e) {
e.printStackTrace();
} catch (ClassNotFoundException e) {
Modified: trunk/integrity-server/src/main/resources/org/jahia/integrityserv=
er/mysql.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/integrity-serve=
r/src/main/resources/org/jahia/integrityserver/mysql.properties&rev=3D55&re=
pname=3Djahia_upgrade
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/integrity-server/src/main/resources/org/jahia/integrityserver/mys=
ql.properties (original)
+++ trunk/integrity-server/src/main/resources/org/jahia/integrityserver/mys=
ql.properties Fri Jun 8 17:03:51 2007
@@ -1,6 +1,6 @@
# MYSQL CONFIGURATION FILE
-db.login =3D jahia
-db.password =3D jahia
+db.login =3D integrity
+db.password =3D integrity
db.host =3D 127.0.0.1
db.port =3D 3306
db.base =3D integrity
\ No newline at end of file
Modified: trunk/integrity-server/src/main/webapp/WEB-INF/web.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/integrity-serve=
r/src/main/webapp/WEB-INF/web.xml&rev=3D55&repname=3Djahia_upgrade
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/integrity-server/src/main/webapp/WEB-INF/web.xml (original)
+++ trunk/integrity-server/src/main/webapp/WEB-INF/web.xml Fri Jun 8 17:03=
:51 2007
@@ -5,10 +5,34 @@
xsi:schemaLocation=3D"http://java.sun.com/xml/ns/j2ee http://java.sun.=
com/xml/ns/j2ee/web-app_2_4.xsd"
version=3D"2.4">
=
- <display-name>Integrity Server</display-name>
- <description>
- Integrity svn analyzer Database Server
- </description>
+ <display-name>Integrity Server</display-name>
+ <description>
+ Integrity svn analyzer database Server
+ </description>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>integrity</web-resource-name>
+ <description>integrity xmlrpc webservice</description>
+ <url-pattern>/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>integrity</role-name>
+ </auth-constraint>
+ <user-data-constraint>
+ <description>null</description>
+ <transport-guarantee>NONE</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>Integrity svn analyzer database server</realm-name>
+ </login-config>
+
+ <security-role>
+ <role-name>integrity</role-name>
+ </security-role>
=
<servlet>
<servlet-name>XmlRpcServlet</servlet-name>
Modified: trunk/integrity/src/main/java/org/jahia/integrity/Application.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/integrity/src/m=
ain/java/org/jahia/integrity/Application.java&rev=3D55&repname=3Djahia_upgr=
ade
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/integrity/src/main/java/org/jahia/integrity/Application.java (ori=
ginal)
+++ trunk/integrity/src/main/java/org/jahia/integrity/Application.java Fri =
Jun 8 17:03:51 2007
@@ -4,6 +4,10 @@
=
import javax.swing.*;
import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.FileOutputStream;
+import java.sql.Timestamp;
=
/**
* This application aims at finding changes that have been committed into =
a given branch but not in the trunk.
@@ -25,6 +29,12 @@
=
public static void main(String[] args) {
try {
+ logToFile();
+ } catch (IOException e) {
+ System.out.println("Unable to log errors to a file, displaying=
them on the standard stream:") ;
+ System.out.println(e.toString()) ;
+ }
+ try {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassNa=
me());
} catch(Exception e) {
System.err.println("Error setting native look and feel: " + e);
@@ -32,4 +42,18 @@
new Controller() ;
}
=
+ /**
+ * Redirect the err and out stream to a file "fc_log.txt" at the appli=
cation root.
+ * @throws java.io.IOException if a problem occured with the file
+ */
+ private static void logToFile() throws IOException {
+ File log =3D new File(APP_DIR, "integrity_log.log") ;
+ if (!log.exists()) {
+ log.createNewFile() ;
+ }
+ PrintStream logStream =3D new PrintStream(new FileOutputStream(log=
, true), true) ;
+ System.setOut(logStream) ;
+ System.setErr(logStream);
+ }
+
}
Modified: trunk/integrity/src/main/java/org/jahia/integrity/controller/Cont=
roller.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/integrity/src/m=
ain/java/org/jahia/integrity/controller/Controller.java&rev=3D55&repname=3D=
jahia_upgrade
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/integrity/src/main/java/org/jahia/integrity/controller/Controller=
.java (original)
+++ trunk/integrity/src/main/java/org/jahia/integrity/controller/Controller=
.java Fri Jun 8 17:03:51 2007
@@ -31,7 +31,7 @@
=
private IntegrityServer remoteServer ;
=
- XmlRpcClient client ;
+ private String currentBranch =3D "" ;
=
/**
* Constructor creating the ui and the data model.
@@ -74,29 +74,18 @@
=
try {
XmlRpcClientConfigImpl config =3D new XmlRpcClientConfigImpl()=
;
- config.setServerURL(new URL(dataModel.getProperty("xmlrpc.host=
")+"/"+dataModel.getProperty("xmlrpc.path")));
+ String url =3D "http://"; + dataModel.getProperty("host") +
+ "/" + dataModel.getProperty("path") ;
+ config.setServerURL(new URL(url));
+ config.setBasicUserName(dataModel.getProperty("login"));
+ config.setBasicPassword(dataModel.getProperty("password"));
XmlRpcClient client =3D new XmlRpcClient();
client.setTransportFactory(new XmlRpcCommonsTransportFactory(c=
lient));
client.setConfig(config);
ClientFactory factory =3D new ClientFactory(client);
remoteServer =3D (IntegrityServer) factory.newInstance(Integri=
tyServer.class);
} catch (java.net.MalformedURLException e) {
- gui.display(ResourceBundle.getBundle("org/jahia/integrity/reso=
urces/gui").getString("error.wrongUrlFormat"));
- e.printStackTrace() ;
- }
- }
-
- /**
- * Initialize the connection.
- */
- public void initRemoteServer2() {
- try {
- XmlRpcClientConfigImpl config =3D new XmlRpcClientConfigImpl();
- config.setServerURL(new URL(dataModel.getProperty("xmlrpc.host=
")+"/"+dataModel.getProperty("xmlrpc.path")));
- client =3D new XmlRpcClient();
- client.setConfig(config);
- } catch (java.net.MalformedURLException e) {
- gui.display(ResourceBundle.getBundle("org/jahia/integrity/reso=
urces/gui").getString("error.wrongUrlFormat"));
+ gui.display(ResourceBundle.getBundle("org/jahia/integrity/reso=
urces/gui").getString("error.connectionFailed"));
e.printStackTrace() ;
}
}
@@ -155,6 +144,8 @@
public void run() {
gui.enableHourglass();
=
+ boolean error =3D true ;
+
// benchmarking
long time =3D System.currentTimeMillis() ;
=
@@ -170,29 +161,42 @@
out.writeObject(branch);
out.close() ;
byte[] ret =3D remoteServer.retrieveResolved(bos.t=
oByteArray()) ;
-// Object[] params =3D new Object[]{bos.toByteArray=
()};
-// byte[] ret =3D (byte[])client.execute("Integrity=
ServerImpl.retrieveResolved", params) ;
ByteArrayInputStream bis =3D new ByteArrayInputStr=
eam(ret) ;
ObjectInput in =3D new ObjectInputStream(bis) ;
Object commits =3D in.readObject() ;
if (commits instanceof ArrayList) {
dataModel.updateResolvedCommits((ArrayList<Res=
olvedCommit>) commits) ;
+ error =3D false ;
+ } else if (commits instanceof String) {
+ if (commits.equals("noTable")) {
+ gui.display(ResourceBundle.getBundle("org/=
jahia/integrity/resources/gui").getString("error.noTable")) ;
+ }
+ } else {
+ gui.display(ResourceBundle.getBundle("org/jahi=
a/integrity/resources/gui").getString("error.unknown")) ;
}
} catch (Exception e) {
- // this exception may occur if the table does not =
exist yet
e.printStackTrace() ;
- gui.display(e.getMessage());
+ gui.display(ResourceBundle.getBundle("org/jahia/in=
tegrity/resources/gui").getString("error.connectionFailed"));
}
} else {
- gui.display(ResourceBundle.getBundle("org/jahia/integr=
ity/resources/gui").getString("error.dbDisconnected"));
+ gui.display(ResourceBundle.getBundle("org/jahia/integr=
ity/resources/gui").getString("error.serverDisconnected"));
}
=
// benchmarking
time =3D System.currentTimeMillis() - time ;
gui.displayBench(time + "ms");
=
- gui.disableHourglass();
+
gui.onQueryTreated(authors);
+ String newBranch =3D query.getBranch() ;
+ if (!currentBranch.equals(newBranch)) {
+ currentBranch =3D newBranch ;
+ if (error) {
+ dataModel.updateResolvedCommits(new ArrayList<Reso=
lvedCommit>()) ;
+ gui.clearResolved() ;
+ }
+ }
+ gui.disableHourglass();
}
}.start() ;
}
@@ -235,8 +239,6 @@
out.writeObject(com);
out.close() ;
remoteServer.storeResolvedCommit(bos.toByteArray()=
) ;
-// Object[] params =3D new Object[]{bos.toByteArray=
()};
-// client.execute("IntegrityServerImpl.storeResolve=
dCommit", params) ;
} catch (NumberFormatException e1) {
e1.printStackTrace();
} catch(Exception e) {
Modified: trunk/integrity/src/main/java/org/jahia/integrity/model/MyModel.j=
ava
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/integrity/src/m=
ain/java/org/jahia/integrity/model/MyModel.java&rev=3D55&repname=3Djahia_up=
grade
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/integrity/src/main/java/org/jahia/integrity/model/MyModel.java (o=
riginal)
+++ trunk/integrity/src/main/java/org/jahia/integrity/model/MyModel.java Fr=
i Jun 8 17:03:51 2007
@@ -49,7 +49,7 @@
*/
private void loadSettings() {
settings =3D new Properties() ;
- try {
+ try {
File settingsF =3D new File(Application.APP_DIR, "settings.pro=
perties") ;
if (settingsF.exists()) {
FileInputStream is =3D new FileInputStream(settingsF) ;
@@ -59,6 +59,17 @@
} catch (IOException e) {
e.printStackTrace();
}
+ =
+ // init default values
+ if (!settings.containsKey("host")) {
+ settings.setProperty("host", "intranet.jahia.com/integrity") ;
+ }
+ if (!settings.containsKey("path")) {
+ settings.setProperty("path", "xmlrpc") ;
+ }
+ if (!settings.containsKey("login")) {
+ settings.setProperty("login", "jahia") ;
+ }
}
=
/**
@@ -83,10 +94,10 @@
* @param path database port
*/
public void saveSettings(String dbuser, String dbpassword, String host=
, String path) {
- settings.setProperty("db.login", dbuser) ;
- settings.setProperty("db.password", dbpassword) ;
- settings.setProperty("xmlrpc.path", path) ;
- settings.setProperty("xmlrpc.host", host) ;
+ settings.setProperty("login", dbuser) ;
+ settings.setProperty("password", dbpassword) ;
+ settings.setProperty("path", path) ;
+ settings.setProperty("host", host) ;
=
try {
File settingsF =3D new File(Application.APP_DIR, "settings.pro=
perties") ;
Modified: trunk/integrity/src/main/java/org/jahia/integrity/view/ArrayListM=
odel.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/integrity/src/m=
ain/java/org/jahia/integrity/view/ArrayListModel.java&rev=3D55&repname=3Dja=
hia_upgrade
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/integrity/src/main/java/org/jahia/integrity/view/ArrayListModel.j=
ava (original)
+++ trunk/integrity/src/main/java/org/jahia/integrity/view/ArrayListModel.j=
ava Fri Jun 8 17:03:51 2007
@@ -11,25 +11,29 @@
* @version 2007-02-19
* @author Romain Felden
*/
-public class ArrayListModel implements ListModel {
+public class ArrayListModel<T> implements ListModel {
=
- ArrayList content ;
+ ArrayList<T> content ;
ArrayList<ListDataListener> listenerList ;
=
- public ArrayListModel(ArrayList list) {
+ public ArrayListModel(ArrayList<T> list) {
if (list =3D=3D null) {
- content =3D new ArrayList() ;
+ content =3D new ArrayList<T>() ;
} else {
content =3D list ;
}
listenerList =3D new ArrayList<ListDataListener>();
}
=
- public void replaceElements(ArrayList elements) {
+ public void replaceElements(ArrayList<T> elements) {
content.clear();
content.addAll(elements) ;
}
=
+ public void clear() {
+ content.clear() ;
+ }
+
public int getSize() {
return content.size();
}
Modified: trunk/integrity/src/main/java/org/jahia/integrity/view/MainPanel.=
java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/integrity/src/m=
ain/java/org/jahia/integrity/view/MainPanel.java&rev=3D55&repname=3Djahia_u=
pgrade
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/integrity/src/main/java/org/jahia/integrity/view/MainPanel.java (=
original)
+++ trunk/integrity/src/main/java/org/jahia/integrity/view/MainPanel.java F=
ri Jun 8 17:03:51 2007
@@ -41,9 +41,9 @@
private JMenuBar menuBar;
=
=
- private ArrayListModel goodListModel =3D new ArrayListModel(null);
- private ArrayListModel badListModel =3D new ArrayListModel(null);
- private ArrayListModel resolvedListModel =3D new ArrayListModel(null);
+ private ArrayListModel<Pair<Commit, Commit>> goodListModel =3D new Arr=
ayListModel<Pair<Commit, Commit>>(null);
+ private ArrayListModel<Commit> badListModel =3D new ArrayListModel<Com=
mit>(null);
+ private ArrayListModel<ResolvedCommit> resolvedListModel =3D new Array=
ListModel<ResolvedCommit>(null);
=
public MainPanel(final Controller controller) {
this.controller =3D controller;
@@ -218,6 +218,12 @@
for (String auth : authorList) {
authors.addItem(auth);
}
+ if (authorList.length < 1) {
+ goodListModel.clear();
+ goodListModel.fireContentChanged();
+ badListModel.clear();
+ badListModel.fireContentChanged();
+ }
}
=
/**
@@ -246,6 +252,11 @@
setEnableResolution(true);
}
=
+ public void clearResolved() {
+ resolvedListModel.replaceElements(new ArrayList<ResolvedCommit>());
+ resolvedListModel.fireContentChanged();
+ }
+
public void setEnableResolution(boolean enable) {
resolveCommitsButton.setEnabled(enable);
}
Modified: trunk/integrity/src/main/java/org/jahia/integrity/view/MainWindow=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/integrity/src/m=
ain/java/org/jahia/integrity/view/MainWindow.java&rev=3D55&repname=3Djahia_=
upgrade
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/integrity/src/main/java/org/jahia/integrity/view/MainWindow.java =
(original)
+++ trunk/integrity/src/main/java/org/jahia/integrity/view/MainWindow.java =
Fri Jun 8 17:03:51 2007
@@ -62,4 +62,8 @@
main.onCommitsResolved();
}
=
+ public void clearResolved() {
+ main.clearResolved() ;
+ }
+
}
Modified: trunk/integrity/src/main/java/org/jahia/integrity/view/PrefsWindo=
w.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/integrity/src/m=
ain/java/org/jahia/integrity/view/PrefsWindow.java&rev=3D55&repname=3Djahia=
_upgrade
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/integrity/src/main/java/org/jahia/integrity/view/PrefsWindow.java=
(original)
+++ trunk/integrity/src/main/java/org/jahia/integrity/view/PrefsWindow.java=
Fri Jun 8 17:03:51 2007
@@ -48,10 +48,10 @@
}
}, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_=
ANCESTOR_OF_FOCUSED_COMPONENT);
=
- setTextFieldContent(host, controller.getProperty("xmlrpc.host"));
- setTextFieldContent(path, controller.getProperty("xmlrpc.path"));
- setTextFieldContent(login, controller.getProperty("db.login"));
- setTextFieldContent(password, controller.getProperty("db.password"=
));
+ setTextFieldContent(host, controller.getProperty("host"));
+ setTextFieldContent(path, controller.getProperty("path"));
+ setTextFieldContent(login, controller.getProperty("login"));
+ setTextFieldContent(password, controller.getProperty("password"));
=
setTitle(ResourceBundle.getBundle("org/jahia/integrity/resources/g=
ui").getString("prefs.title"));
setSize(350, 250);
Modified: trunk/integrity/src/main/resources/org/jahia/integrity/resources/=
gui.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/integrity/src/m=
ain/resources/org/jahia/integrity/resources/gui.properties&rev=3D55&repname=
=3Djahia_upgrade
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/integrity/src/main/resources/org/jahia/integrity/resources/gui.pr=
operties (original)
+++ trunk/integrity/src/main/resources/org/jahia/integrity/resources/gui.pr=
operties Fri Jun 8 17:03:51 2007
@@ -37,6 +37,8 @@
menu.edit.prefs =3D Preferences
menu.help.about =3D About Integrity
=
-error.dbDisconnected =3D <html>Database is currently not connected.<P>You =
are missing the commit resolution feature.<P>Check the preferences (Edit ->=
Preferences) and then<P>reconnect to the database (File -> Reconnect to da=
tabase).</html>
-error.wrongUrlFormat =3D <html>The remote server connection failed.<P>Plea=
se check your URL settings and try again.<P>(Edit -> Preferences and then F=
ile -> Reconnect to server)</html>
+error.unknown =3D <html>An unknown error occurred.<P>Check the application=
log (home/.integrity/integrity.log)<P>or contact the server administrator.=
</html>
+error.noTable =3D <html>The table corresponding to this branch does not ex=
ist yet.<P>The first commit resolution will create it automatically.</html>
+error.serverDisconnected =3D <html>Database server is currently not connec=
ted.<P>You are missing the commit resolution feature.<P>Check the preferenc=
es (Edit -> Preferences) and then<P>reconnect to the server (File -> Reconn=
ect to server).</html>
+error.connectionFailed =3D <html>The remote database server connection fai=
led.<P>Please check your URL settings and try again.<P>(Edit -> Preferences=
and then File -> Reconnect to server)<P><P>You may check the application l=
og (home/.integrity/integrity.log)</html>
about.box =3D <html>Integrity is a svn analyzer.<P><P>It shows changes com=
mitted in a given branch but not in the trunk<P>of your repository, and all=
ows you to resolve manually missing ones.<P><P>© 2007 Jahia<html>
\ No newline at end of file
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
