Author: rfelden
Date: Tue Jul 3 15:10:05 2007
New Revision: 2
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D2&repname=3Ds=
vn_integrity
Log:
added unresolve function
error messages enhanced
Added:
trunk/server/src/main/webapp/WEB-INF/lib/
trunk/server/src/main/webapp/WEB-INF/lib/mysql-connector-java-5.0.5-bin=
.jar (with props)
Modified:
trunk/client/pom.xml
trunk/client/src/main/java/org/jahia/integrity/Application.java
trunk/client/src/main/java/org/jahia/integrity/controller/Controller.ja=
va
trunk/client/src/main/java/org/jahia/integrity/model/MyModel.java
trunk/client/src/main/java/org/jahia/integrity/view/ArrayListModel.java
trunk/client/src/main/java/org/jahia/integrity/view/MainPanel.form
trunk/client/src/main/java/org/jahia/integrity/view/MainPanel.java
trunk/client/src/main/java/org/jahia/integrity/view/MainWindow.java
trunk/client/src/main/java/org/jahia/integrityserver/IntegrityServer.ja=
va
trunk/client/src/main/java/org/jahia/integrityserver/ResolvedCommit.java
trunk/client/src/main/resources/org/jahia/integrity/resources/gui.prope=
rties
trunk/server/src/main/java/org/jahia/integrityserver/DBconnector.java
trunk/server/src/main/java/org/jahia/integrityserver/IntegrityServer.ja=
va
trunk/server/src/main/java/org/jahia/integrityserver/IntegrityServerImp=
l.java
trunk/server/src/main/webapp/index.html
Modified: trunk/client/pom.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/client/pom.xml&=
rev=3D2&repname=3Dsvn_integrity
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/client/pom.xml (original)
+++ trunk/client/pom.xml Tue Jul 3 15:10:05 2007
@@ -4,7 +4,7 @@
<groupId>org.jahia</groupId>
<artifactId>integrity</artifactId>
<packaging>jar</packaging>
- <version>1.0</version>
+ <version>1.1</version>
<name>svn integrity checker</name>
<url>http://www.jahia.net/jahia/page915.html</url>
=
Modified: trunk/client/src/main/java/org/jahia/integrity/Application.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/client/src/main=
/java/org/jahia/integrity/Application.java&rev=3D2&repname=3Dsvn_integrity
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/client/src/main/java/org/jahia/integrity/Application.java (origin=
al)
+++ trunk/client/src/main/java/org/jahia/integrity/Application.java Tue Jul=
3 15:10:05 2007
@@ -47,7 +47,7 @@
* @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") ;
+ File log =3D new File(APP_DIR, "integrity.log") ;
if (!log.exists()) {
log.createNewFile() ;
}
Modified: trunk/client/src/main/java/org/jahia/integrity/controller/Control=
ler.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/client/src/main=
/java/org/jahia/integrity/controller/Controller.java&rev=3D2&repname=3Dsvn_=
integrity
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/client/src/main/java/org/jahia/integrity/controller/Controller.ja=
va (original)
+++ trunk/client/src/main/java/org/jahia/integrity/controller/Controller.ja=
va Tue Jul 3 15:10:05 2007
@@ -85,7 +85,7 @@
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.connectionFailed"));
+ gui.error(ResourceBundle.getBundle("org/jahia/integrity/resour=
ces/gui").getString("error.connectionFailed"));
e.printStackTrace() ;
}
}
@@ -172,14 +172,14 @@
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")) ;
+ gui.error(ResourceBundle.getBundle("org/jahia/=
integrity/resources/gui").getString("error.unknown")) ;
}
} catch (Exception e) {
e.printStackTrace() ;
- gui.display(ResourceBundle.getBundle("org/jahia/in=
tegrity/resources/gui").getString("error.connectionFailed"));
+ gui.error(ResourceBundle.getBundle("org/jahia/inte=
grity/resources/gui").getString("error.connectionFailed"));
}
} else {
- gui.display(ResourceBundle.getBundle("org/jahia/integr=
ity/resources/gui").getString("error.serverDisconnected"));
+ gui.warning(ResourceBundle.getBundle("org/jahia/integr=
ity/resources/gui").getString("error.serverDisconnected"));
}
=
// benchmarking
@@ -238,13 +238,22 @@
ObjectOutput out =3D new ObjectOutputStream(bos) ;
out.writeObject(com);
out.close() ;
- remoteServer.storeResolvedCommit(bos.toByteArray()=
) ;
+ byte[] ret =3D remoteServer.storeResolvedCommit(bo=
s.toByteArray()) ;
+ ByteArrayInputStream bis =3D new ByteArrayInputStr=
eam(ret) ;
+ ObjectInput in =3D new ObjectInputStream(bis) ;
+ Object result =3D in.readObject() ;
+ if (result instanceof Boolean) {
+ if ((Boolean)result) {
+ dataModel.addResolvedCommit(com);
+ } else {
+ gui.error(ResourceBundle.getBundle("org/ja=
hia/integrity/resources/gui").getString("error.connectionFailed"));
+ }
+ }
} catch (NumberFormatException e1) {
e1.printStackTrace();
} catch(Exception e) {
e.printStackTrace();
- } finally {
- dataModel.addResolvedCommit(com);
+ gui.error(ResourceBundle.getBundle("org/jahia/inte=
grity/resources/gui").getString("error.connectionFailed"));
}
}
gui.disableHourglass();
@@ -253,6 +262,40 @@
}.start();
}
=
+
+ public void unresolveCommit(final ResolvedCommit[] coms) {
+ new Thread() {
+ public void run() {
+ gui.enableHourglass();
+ for (ResolvedCommit res : coms) {
+ try {
+ ByteArrayOutputStream bos =3D new ByteArrayOutputS=
tream() ;
+ ObjectOutput out =3D new ObjectOutputStream(bos) ;
+ out.writeObject(res);
+ out.close() ;
+ byte[] ret =3D remoteServer.unresolveCommit(bos.to=
ByteArray()) ;ByteArrayInputStream bis =3D new ByteArrayInputStream(ret) ;
+ ObjectInput in =3D new ObjectInputStream(bis) ;
+ Object result =3D in.readObject() ;
+ if (result instanceof Boolean) {
+ if ((Boolean)result) {
+ dataModel.removeResolvedCommit(res);
+ } else {
+ gui.error(ResourceBundle.getBundle("org/ja=
hia/integrity/resources/gui").getString("error.connectionFailed"));
+ }
+ }
+ } catch (NumberFormatException e1) {
+ e1.printStackTrace();
+ } catch(Exception e) {
+ e.printStackTrace();
+ gui.error(ResourceBundle.getBundle("org/jahia/inte=
grity/resources/gui").getString("error.connectionFailed"));
+ }
+ }
+ gui.disableHourglass();
+ gui.onCommitsUnresolved();
+ }
+ }.start();
+ }
+
/**
* This logs the displayed content into the provided file.
* @param file where to save
Modified: trunk/client/src/main/java/org/jahia/integrity/model/MyModel.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/client/src/main=
/java/org/jahia/integrity/model/MyModel.java&rev=3D2&repname=3Dsvn_integrity
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/client/src/main/java/org/jahia/integrity/model/MyModel.java (orig=
inal)
+++ trunk/client/src/main/java/org/jahia/integrity/model/MyModel.java Tue J=
ul 3 15:10:05 2007
@@ -317,6 +317,14 @@
}
=
/**
+ * Remove a resolved commit from the list.
+ * @param com the commit to remove
+ */
+ public void removeResolvedCommit(ResolvedCommit com) {
+ resolvedCommits.remove(com) ;
+ }
+
+ /**
* Extract data from the given list corresponding to the given author.
* 0 : godd commits list
* 1 : bad commits list
Modified: trunk/client/src/main/java/org/jahia/integrity/view/ArrayListMode=
l.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/client/src/main=
/java/org/jahia/integrity/view/ArrayListModel.java&rev=3D2&repname=3Dsvn_in=
tegrity
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/client/src/main/java/org/jahia/integrity/view/ArrayListModel.java=
(original)
+++ trunk/client/src/main/java/org/jahia/integrity/view/ArrayListModel.java=
Tue Jul 3 15:10:05 2007
@@ -38,7 +38,7 @@
return content.size();
}
=
- public Object getElementAt(int i) {
+ public T getElementAt(int i) {
return content.get(i);
}
=
Modified: trunk/client/src/main/java/org/jahia/integrity/view/MainPanel.form
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/client/src/main=
/java/org/jahia/integrity/view/MainPanel.form&rev=3D2&repname=3Dsvn_integri=
ty
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/client/src/main/java/org/jahia/integrity/view/MainPanel.form (ori=
ginal)
+++ trunk/client/src/main/java/org/jahia/integrity/view/MainPanel.form Tue =
Jul 3 15:10:05 2007
@@ -2,7 +2,7 @@
<form xmlns=3D"http://www.intellij.com/uidesigner/form/"; version=3D"1" bin=
d-to-class=3D"org.jahia.integrity.view.MainPanel">
<grid id=3D"27dc6" binding=3D"panel1" default-binding=3D"true" layout-ma=
nager=3D"BorderLayout" hgap=3D"0" vgap=3D"0">
<constraints>
- <xy x=3D"20" y=3D"20" width=3D"500" height=3D"400"/>
+ <xy x=3D"20" y=3D"20" width=3D"611" height=3D"400"/>
</constraints>
<properties/>
<border type=3D"none">
@@ -196,12 +196,21 @@
<component id=3D"7f716" class=3D"javax.swing.JButton" bindin=
g=3D"resolveCommitsButton" default-binding=3D"true">
<constraints>
<grid row=3D"0" column=3D"1" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"0" fill=3D"1" indent=3D"=
0" use-parent-layout=3D"false"/>
- <gridbag top=3D"0" left=3D"10" bottom=3D"0" right=3D"0" =
weightx=3D"0.0" weighty=3D"0.0"/>
+ <gridbag top=3D"0" left=3D"10" bottom=3D"0" right=3D"10"=
weightx=3D"0.0" weighty=3D"0.0"/>
</constraints>
<properties>
<text resource-bundle=3D"org/jahia/integrity/resources/g=
ui" key=3D"buttons.resolve"/>
</properties>
</component>
+ <component id=3D"46111" class=3D"javax.swing.JButton" bindin=
g=3D"unresolveCommitsButton">
+ <constraints>
+ <grid row=3D"0" column=3D"2" row-span=3D"1" col-span=3D"=
1" vsize-policy=3D"0" hsize-policy=3D"3" anchor=3D"0" fill=3D"1" indent=3D"=
0" use-parent-layout=3D"false"/>
+ <gridbag top=3D"0" left=3D"10" bottom=3D"0" right=3D"0" =
weightx=3D"0.0" weighty=3D"0.0"/>
+ </constraints>
+ <properties>
+ <text resource-bundle=3D"org/jahia/integrity/resources/g=
ui" key=3D"buttons.unresolve"/>
+ </properties>
+ </component>
</children>
</grid>
<tabbedpane id=3D"7358d" binding=3D"tabbedPane1" default-binding=
=3D"true">
Modified: trunk/client/src/main/java/org/jahia/integrity/view/MainPanel.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/client/src/main=
/java/org/jahia/integrity/view/MainPanel.java&rev=3D2&repname=3Dsvn_integri=
ty
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/client/src/main/java/org/jahia/integrity/view/MainPanel.java (ori=
ginal)
+++ trunk/client/src/main/java/org/jahia/integrity/view/MainPanel.java Tue =
Jul 3 15:10:05 2007
@@ -17,8 +17,8 @@
import java.io.File;
=
/**
- * @author Romain
- * @version May 22, 2007
+ * @author Romain Felden
+ * @version 2007-05-22
*/
public class MainPanel {
private Controller controller;
@@ -39,6 +39,7 @@
private JList resolvedCommitsDisplay;
private JButton resolveCommitsButton;
private JMenuBar menuBar;
+ private JButton unresolveCommitsButton;
=
=
private ArrayListModel<Pair<Commit, Commit>> goodListModel =3D new Arr=
ayListModel<Pair<Commit, Commit>>(null);
@@ -132,7 +133,15 @@
resolveCommitsButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
if (badCommitsDisplay.isShowing() && authors.getItemCount(=
) > 0 && badCommitsDisplay.getSelectedIndices().length > 0) {
- resolveCommit(badCommitsDisplay.getSelectedIndices());
+ resolveCommits(badCommitsDisplay.getSelectedIndices());
+ }
+ }
+ });
+
+ unresolveCommitsButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ if (resolvedCommitsDisplay.isShowing() && resolvedCommitsD=
isplay.getSelectedIndices().length > 0) {
+ unresolveCommits(resolvedCommitsDisplay.getSelectedInd=
ices());
}
}
});
@@ -184,10 +193,10 @@
new PrefsWindow(controller, panel1);
}
=
- private void resolveCommit(int[] indices) {
+ private void resolveCommits(int[] indices) {
StringBuffer commits =3D new StringBuffer();
for (int i =3D 0; i < indices.length; i++) {
- Commit com =3D (Commit) badListModel.getElementAt(indices[i]);
+ Commit com =3D badListModel.getElementAt(indices[i]);
commits.append(com.getRevision());
if (i < indices.length - 1) {
commits.append(",");
@@ -196,8 +205,32 @@
new CommitResolver(this, controller, authors.getSelectedItem().toS=
tring(), branch.getText(), commits.toString(), new Date(System.currentTimeM=
illis()).toString()).setVisible(true);
}
=
+ private void unresolveCommits(int[] indices) {
+ int ret =3D JOptionPane.showConfirmDialog(swingComponent(),
+ ResourceBundle.getBundle("org/jahia/integrity/resources/gu=
i").getString("unresolve.confirm"),
+ ResourceBundle.getBundle("org/jahia/integrity/resources/gu=
i").getString("notification"),
+ JOptionPane.YES_NO_OPTION,
+ JOptionPane.QUESTION_MESSAGE);
+ if (ret =3D=3D JOptionPane.YES_OPTION) {
+ ResolvedCommit[] toUnresolve =3D new ResolvedCommit[indices.le=
ngth];
+ for (int i =3D 0; i < indices.length; i++) {
+ toUnresolve[i] =3D resolvedListModel.getElementAt(i);
+ }
+ setEnableUnresolution(false);
+ controller.unresolveCommit(toUnresolve);
+ }
+ }
+
public void display(String message) {
- JOptionPane.showMessageDialog(swingComponent(), message, "Notifica=
tion", JOptionPane.INFORMATION_MESSAGE);
+ JOptionPane.showMessageDialog(swingComponent(), message, ResourceB=
undle.getBundle("org/jahia/integrity/resources/gui").getString("notificatio=
n"), JOptionPane.INFORMATION_MESSAGE);
+ }
+
+ public void error(String message) {
+ JOptionPane.showMessageDialog(swingComponent(), message, ResourceB=
undle.getBundle("org/jahia/integrity/resources/gui").getString("error"), JO=
ptionPane.ERROR_MESSAGE);
+ }
+
+ public void warning(String message) {
+ JOptionPane.showMessageDialog(swingComponent(), message, ResourceB=
undle.getBundle("org/jahia/integrity/resources/gui").getString("warning"), =
JOptionPane.WARNING_MESSAGE);
}
=
public void displayBench(String message) {
@@ -252,6 +285,14 @@
setEnableResolution(true);
}
=
+ public void onCommitsUnresolved() {
+ if (authors.getItemCount() > 0) {
+ controller.retrieveCommits(authors.getSelectedItem().toString(=
));
+ }
+ resolvedCommitsDisplay.clearSelection();
+ setEnableUnresolution(true);
+ }
+
public void clearResolved() {
resolvedListModel.replaceElements(new ArrayList<ResolvedCommit>());
resolvedListModel.fireContentChanged();
@@ -261,6 +302,10 @@
resolveCommitsButton.setEnabled(enable);
}
=
+ public void setEnableUnresolution(boolean enable) {
+ unresolveCommitsButton.setEnabled(enable);
+ }
+
public JComponent getPanel() {
return panel1;
}
@@ -465,8 +510,16 @@
gbc.gridx =3D 1;
gbc.gridy =3D 0;
gbc.fill =3D GridBagConstraints.HORIZONTAL;
- gbc.insets =3D new Insets(0, 10, 0, 0);
+ gbc.insets =3D new Insets(0, 10, 0, 10);
panel4.add(resolveCommitsButton, gbc);
+ unresolveCommitsButton =3D new JButton();
+ this.$$$loadButtonText$$$(unresolveCommitsButton, ResourceBundle.g=
etBundle("org/jahia/integrity/resources/gui").getString("buttons.unresolve"=
));
+ gbc =3D new GridBagConstraints();
+ gbc.gridx =3D 2;
+ gbc.gridy =3D 0;
+ gbc.fill =3D GridBagConstraints.HORIZONTAL;
+ gbc.insets =3D new Insets(0, 10, 0, 0);
+ panel4.add(unresolveCommitsButton, gbc);
tabbedPane1 =3D new JTabbedPane();
panel2.add(tabbedPane1, BorderLayout.CENTER);
tabbedPane1.setBorder(BorderFactory.createTitledBorder(BorderFacto=
ry.createEmptyBorder(5, 0, 0, 0), null));
Modified: trunk/client/src/main/java/org/jahia/integrity/view/MainWindow.ja=
va
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/client/src/main=
/java/org/jahia/integrity/view/MainWindow.java&rev=3D2&repname=3Dsvn_integr=
ity
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/client/src/main/java/org/jahia/integrity/view/MainWindow.java (or=
iginal)
+++ trunk/client/src/main/java/org/jahia/integrity/view/MainWindow.java Tue=
Jul 3 15:10:05 2007
@@ -38,6 +38,14 @@
main.display(message) ;
}
=
+ public void error(String message) {
+ main.error(message) ;
+ }
+
+ public void warning(String message) {
+ main.warning(message) ;
+ }
+
public void displayBench(String message) {
main.displayBench(message) ;
}
@@ -62,6 +70,10 @@
main.onCommitsResolved();
}
=
+ public void onCommitsUnresolved() {
+ main.onCommitsUnresolved() ;
+ }
+
public void clearResolved() {
main.clearResolved() ;
}
Modified: trunk/client/src/main/java/org/jahia/integrityserver/IntegritySer=
ver.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/client/src/main=
/java/org/jahia/integrityserver/IntegrityServer.java&rev=3D2&repname=3Dsvn_=
integrity
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/client/src/main/java/org/jahia/integrityserver/IntegrityServer.ja=
va (original)
+++ trunk/client/src/main/java/org/jahia/integrityserver/IntegrityServer.ja=
va Tue Jul 3 15:10:05 2007
@@ -1,13 +1,15 @@
package org.jahia.integrityserver;
=
/**
- * @author Romain
- * @version Jun 6, 2007
+ * @author Romain Felden
+ * @version 2007-06-06
*/
public interface IntegrityServer {
=
- public byte[] retrieveResolved( byte[] branch) ;
+ public byte[] retrieveResolved(byte[] branch) ;
=
- public byte[] storeResolvedCommit(byte[] comS) ;
+ public byte[] storeResolvedCommit(byte[] comS) ;
+
+ public byte[] unresolveCommit(byte[] com) ;
=
}
Modified: trunk/client/src/main/java/org/jahia/integrityserver/ResolvedComm=
it.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/client/src/main=
/java/org/jahia/integrityserver/ResolvedCommit.java&rev=3D2&repname=3Dsvn_i=
ntegrity
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/client/src/main/java/org/jahia/integrityserver/ResolvedCommit.jav=
a (original)
+++ trunk/client/src/main/java/org/jahia/integrityserver/ResolvedCommit.jav=
a Tue Jul 3 15:10:05 2007
@@ -6,8 +6,8 @@
import java.io.Serializable;
=
/**
- * @author Romain
- * @version Jun 1, 2007
+ * @author Romain Felden
+ * @version 2007-06-01
*/
public class ResolvedCommit implements Serializable {
=
Modified: trunk/client/src/main/resources/org/jahia/integrity/resources/gui=
.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/client/src/main=
/resources/org/jahia/integrity/resources/gui.properties&rev=3D2&repname=3Ds=
vn_integrity
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/client/src/main/resources/org/jahia/integrity/resources/gui.prope=
rties (original)
+++ trunk/client/src/main/resources/org/jahia/integrity/resources/gui.prope=
rties Tue Jul 3 15:10:05 2007
@@ -24,6 +24,9 @@
buttons.query =3D Start Query
buttons.saveLog =3D Save displayed log
buttons.resolve =3D Resolve commits...
+buttons.unresolve =3D Unresolve commits...
+
+unresolve.confirm =3D Do you really want to unresolve the selected commits=
?
=
tabs.good =3D Good commits
tabs.missing =3D Missing trunk commits
@@ -37,8 +40,12 @@
menu.edit.prefs =3D Preferences
menu.help.about =3D About Integrity
=
+notification =3D Notification
+warning =3D Warning
+error =3D Error
+
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
+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 manually resolve missing ones.<P><P>© 2007 Jahia<html>
Modified: trunk/server/src/main/java/org/jahia/integrityserver/DBconnector.=
java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/server/src/main=
/java/org/jahia/integrityserver/DBconnector.java&rev=3D2&repname=3Dsvn_inte=
grity
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/server/src/main/java/org/jahia/integrityserver/DBconnector.java (=
original)
+++ trunk/server/src/main/java/org/jahia/integrityserver/DBconnector.java T=
ue Jul 3 15:10:05 2007
@@ -90,6 +90,32 @@
return list ;
}
=
+ /**
+ * Remove a commit from the resolved commits list.
+ *
+ * @param com the commit to unresolve
+ * @throws SQLException if something bad happened
+ */
+ public static synchronized void unresolveCommit(ResolvedCommit com) th=
rows SQLException {
+ Connection conn =3D DBconnector() ;
+ if (conn =3D=3D null) {
+ System.err.println("no database connection") ;
+ return ;
+ }
+
+ String branch =3D com.getBranch() ;
+ long revision =3D com.getRevision() ;
+ String str =3D "DELETE FROM `"+ branch + "` WHERE `revision`=3D"+r=
evision ;
+ PreparedStatement statement =3D conn.prepareStatement(str);
+ statement.executeUpdate();
+ }
+
+ /**
+ * Create the table for the given branch if it does not exist already.
+ *
+ * @param branch the branch
+ * @throws SQLException if the table has already been created
+ */
private static synchronized void createTable(String branch) throws SQL=
Exception{
Connection conn =3D DBconnector() ;
if (conn =3D=3D null) {
Modified: trunk/server/src/main/java/org/jahia/integrityserver/IntegritySer=
ver.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/server/src/main=
/java/org/jahia/integrityserver/IntegrityServer.java&rev=3D2&repname=3Dsvn_=
integrity
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/server/src/main/java/org/jahia/integrityserver/IntegrityServer.ja=
va (original)
+++ trunk/server/src/main/java/org/jahia/integrityserver/IntegrityServer.ja=
va Tue Jul 3 15:10:05 2007
@@ -10,4 +10,6 @@
=
public byte[] storeResolvedCommit(byte[] comS) ;
=
+ public byte[] unresolveCommit(byte[] com) ;
+
}
Modified: trunk/server/src/main/java/org/jahia/integrityserver/IntegritySer=
verImpl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/server/src/main=
/java/org/jahia/integrityserver/IntegrityServerImpl.java&rev=3D2&repname=3D=
svn_integrity
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/server/src/main/java/org/jahia/integrityserver/IntegrityServerImp=
l.java (original)
+++ trunk/server/src/main/java/org/jahia/integrityserver/IntegrityServerImp=
l.java Tue Jul 3 15:10:05 2007
@@ -16,7 +16,6 @@
ObjectInput in =3D new ObjectInputStream(bis) ;
Object branch =3D in.readObject() ;
if (branch instanceof String) {
- System.err.println((String) branch) ;
ArrayList<ResolvedCommit> resolved =3D DBconnector.retriev=
eResolvedCommit((String) branch) ;
ByteArrayOutputStream bos =3D new ByteArrayOutputStream() ;
ObjectOutput out =3D new ObjectOutputStream(bos) ;
@@ -65,6 +64,48 @@
} catch (SQLException e) {
e.printStackTrace();
}
+ try {
+ ByteArrayOutputStream bos =3D new ByteArrayOutputStream() ;
+ ObjectOutput out =3D new ObjectOutputStream(bos) ;
+ out.writeObject(false);
+ out.close() ;
+ return bos.toByteArray() ;
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return null ;
+ }
+
+ public byte[] unresolveCommit(byte[] com) {
+ try {
+ ByteArrayInputStream bis =3D new ByteArrayInputStream(com) ;
+ ObjectInput in =3D new ObjectInputStream(bis) ;
+ Object commit =3D in.readObject() ;
+ if (commit instanceof ResolvedCommit) {
+ ResolvedCommit resolved =3D (ResolvedCommit) commit ;
+ DBconnector.unresolveCommit(resolved);
+ ByteArrayOutputStream bos =3D new ByteArrayOutputStream() ;
+ ObjectOutput out =3D new ObjectOutputStream(bos) ;
+ out.writeObject(true);
+ out.close() ;
+ return bos.toByteArray() ;
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ try {
+ ByteArrayOutputStream bos =3D new ByteArrayOutputStream() ;
+ ObjectOutput out =3D new ObjectOutputStream(bos) ;
+ out.writeObject(false);
+ out.close() ;
+ return bos.toByteArray() ;
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
return null ;
}
=
Added: trunk/server/src/main/webapp/WEB-INF/lib/mysql-connector-java-5.0.5-=
bin.jar
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/server/s=
rc/main/webapp/WEB-INF/lib/mysql-connector-java-5.0.5-bin.jar&rev=3D2&repna=
me=3Dsvn_integrity
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
Binary file - no diff available.
Modified: trunk/server/src/main/webapp/index.html
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/server/src/main=
/webapp/index.html&rev=3D2&repname=3Dsvn_integrity
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/server/src/main/webapp/index.html (original)
+++ trunk/server/src/main/webapp/index.html Tue Jul 3 15:10:05 2007
@@ -1,7 +1,7 @@
<html>
=
<head>
- <title>Integrity Server</head>
+ <title>Integrity Server</title>
</head>
=
<body>
@@ -10,7 +10,7 @@
<div>Connection url is <a href=3D".">this very host</a>, and
xml-rpc pat=
h is 'xmlrpc'</div>
<br>
<div/>
- <div>If you experience any issue, please contact God...</div>
+ <div>If you experience any issue, please contact Romain Felden
(<a href=
=3D"mailto:[EMAIL PROTECTED]">rfelden_at_jahia_dot_org</a>)...</div>
</body>
=
</html>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
