#5 add custom pserver port support

[Anonymous]

Added a new option and dialog so that you can specify
the pserver port to use, defaults to 2401 if none is
specified.

[Nobody/Anonymous]

Logged In: NO

diff -u --recursive -x *.class
vaj2cvs.old/CvsClientPreferences.java
vaj2cvs/CvsClientPreferences.java
--- vaj2cvs.old/CvsClientPreferences.java Wed Feb 13
11:03:42 2002
+++ vaj2cvs/CvsClientPreferences.java Mon Apr 15 09:25:37
2002
@@ -39,6 +39,7 @@
private javax.swing.JPanel ivjJPanel2 = null;
private javax.swing.JLabel ivjlblAuthenticationType
= null;
private javax.swing.JLabel ivjlblIdentityFile =
null;
+ private javax.swing.JLabel ivjlblPServerPort = null;
IvjEventHandler ivjEventHandler = new
IvjEventHandler();
private javax.swing.JCheckBox ivjcbExpertMode =
null;
private javax.swing.JLabel ivjlblMode = null;
@@ -46,6 +47,7 @@
private javax.swing.JRadioButton
ivjPServerAuthenticate = null;
private javax.swing.JRadioButton ivjSshAutenticate
= null;
private javax.swing.JButton ivjCancelBtn = null;
+ private javax.swing.JTextField ivjpserverPort =
null;
private javax.swing.JTextField ivjidentityFileName
= null;
private javax.swing.JButton ivjSaveBtn = null;
private javax.swing.JLabel ivjJLabel1 = null;
@@ -367,6 +369,27 @@
}

/**
+ * Return the JTextField1 property value.
+ * @return javax.swing.JTextField
+ */
+/* WARNING: THIS METHOD WILL BE REGENERATED. */
+private javax.swing.JTextField getpserverPort() {
+ if (ivjpserverPort == null) {
+ try {
+ ivjpserverPort = new
javax.swing.JTextField();
+ ivjpserverPort.setName
("pserverPort");
+ // user code begin {1}
+ // user code end
+ } catch (java.lang.Throwable ivjExc) {
+ // user code begin {2}
+ // user code end
+ handleException(ivjExc);
+ }
+ }
+ return ivjpserverPort;
+}
+
+/**
* Return the JDialog1 property value.
* @return javax.swing.JDialog
*/
@@ -410,6 +433,12 @@
constraintslblIdentityFile.insets =
new java.awt.Insets(4, 4, 4, 4);
getJDialogContentPane().add
(getlblIdentityFile(), constraintslblIdentityFile);

+ java.awt.GridBagConstraints
constraintslblPServerPort = new java.awt.GridBagConstraints
();
+ constraintslblPServerPort.gridx =
0; constraintslblPServerPort.gridy = 4;
+ constraintslblPServerPort.anchor =
java.awt.GridBagConstraints.EAST;
+ constraintslblPServerPort.insets =
new java.awt.Insets(4, 4, 4, 4);
+ getJDialogContentPane().add
(getlblPServerPort(), constraintslblPServerPort);
+
java.awt.GridBagConstraints
constraintslblAuthenticationType = new
java.awt.GridBagConstraints();

constraintslblAuthenticationType.gridx = 0;

constraintslblAuthenticationType.gridy = 1;

constraintslblAuthenticationType.anchor =

java.awt.GridBagConstraints.EAST;
@@ -430,6 +459,13 @@
constraintsidentityFileName.insets
= new java.awt.Insets(4, 4, 4, 4);
getJDialogContentPane().add
(getidentityFileName(), constraintsidentityFileName);

+ java.awt.GridBagConstraints
constraintspserverPort= new java.awt.GridBagConstraints();
+ constraintspserverPort.gridx = 1;
constraintspserverPort.gridy = 4;
+ constraintspserverPort.fill =
java.awt.GridBagConstraints.HORIZONTAL;
+ constraintspserverPort.weightx =
1.0;
+ constraintspserverPort.insets = new
java.awt.Insets(4, 4, 4, 4);
+ getJDialogContentPane().add
(getpserverPort(), constraintspserverPort);
+
java.awt.GridBagConstraints
constraintscbExpertMode = new java.awt.GridBagConstraints();
constraintscbExpertMode.gridx = 1;
constraintscbExpertMode.gridy = 0;
constraintscbExpertMode.anchor =
java.awt.GridBagConstraints.WEST;
@@ -443,7 +479,7 @@
getJDialogContentPane().add
(getlblMode(), constraintslblMode);

        java.awt.GridBagConstraints

constraintsJPanel2 = new java.awt.GridBagConstraints();
- constraintsJPanel2.gridx = 1;
constraintsJPanel2.gridy = 4;
+ constraintsJPanel2.gridx = 1;
constraintsJPanel2.gridy = 5;
constraintsJPanel2.fill =
java.awt.GridBagConstraints.BOTH;
constraintsJPanel2.insets = new
java.awt.Insets(4, 4, 4, 4);
getJDialogContentPane().add
(getJPanel2(), constraintsJPanel2);
@@ -604,6 +640,22 @@
return ivjlblIdentityFile;
}

+private javax.swing.JLabel getlblPServerPort() {
+ if (ivjlblPServerPort == null) {
+ try {
+ ivjlblPServerPort = new
javax.swing.JLabel();
+ ivjlblPServerPort.setName
("lblPServerPort");
+ ivjlblPServerPort.setText("pserver
port:");
+ // user code begin {1}
+ // user code end
+ } catch (java.lang.Throwable ivjExc) {
+ // user code begin {2}
+ // user code end
+ handleException(ivjExc);
+ }
+ }
+ return ivjlblPServerPort;
+}

/**
* Return the lblExpertMode property value.
@@ -745,6 +797,7 @@
getcbUsingBrokenNtServer().setSelected
(brokenNTServer);

    getidentityFileName\(\).setText

(CvsData.getRootString( SSH_IDENTITY ));
+ getpserverPort().setText
(CvsData.getRootString( PSERVER_PORT ));
// user code end
initConnections();
connEtoM1();
@@ -802,6 +855,8 @@
String.valueOf(getSshAutenticate
().isSelected()));

CvsData.setRootString\( SSH\_IDENTITY,

getidentityFileName().getText());
+
+ CvsData.setRootString( PSERVER_PORT, getpserverPort
().getText());

CvsData.setRootString\( BROKEN\_NT\_CVS, 
        String.valueOf

(getcbUsingBrokenNtServer().isSelected()));
diff -u --recursive -x *.class
vaj2cvs.old/CvsConnection.java vaj2cvs/CvsConnection.java
--- vaj2cvs.old/CvsConnection.java Wed Feb 13 11:03:42
2002
+++ vaj2cvs/CvsConnection.java Mon Apr 15 09:39:09 2002
@@ -167,6 +167,18 @@
}
}

+public static int getCvsPort() {
+ String portStr = CvsData.getRootString
(PSERVER_PORT);
+
+ int port = DEFAULT_PSERVER_PORT;
+ try {
+ port = Integer.parseInt(portStr);
+ } catch (NumberFormatException nfe) {
+ System.out.println("bad pserver port : " +
portStr + ", using default pserver port : " +
DEFAULT_PSERVER_PORT);
+ }
+ return port;
+}
+
/**
* CvsConnection constructor comment.
*/
@@ -736,7 +748,7 @@
{
InetAddress addr = InetAddress.getByName(
_serverHostname );

- _socket = new Socket( addr, 2401 );
+ _socket = new Socket( addr, CvsConnection.getCvsPort
() );
_socket.setTcpNoDelay( true );

\_outStream = new BufferedOutputStream\(

_socket.getOutputStream(), 2048 );
diff -u --recursive -x *.class
vaj2cvs.old/CvsConstants.java vaj2cvs/CvsConstants.java
--- vaj2cvs.old/CvsConstants.java Wed Feb 13 11:03:42
2002
+++ vaj2cvs/CvsConstants.java Mon Apr 15 09:40:44 2002
@@ -32,16 +32,18 @@
final static String TEMPDIR = null; //
Override default here.
final static boolean DELETE_FILES = true; //
Override default here.
final static boolean VERBOSE_IMPORT = false; //
Override default here.
+ final static int DEFAULT_PSERVER_PORT = 2401; //
Override default here.

final static RootArg SERVER\_HOSTNAME = new RootArg

( "ServerHostname" );
final static RootArg REPOSITORY_PATH = new RootArg
( "RepositoryPath" );
final static RootArg USERNAME = new RootArg
( "Username" );
final static RootArg PASSWORD = new RootArg
( "DateTime" ); // Intentional obfuscation.
final static RootArg TEMPLATE = new RootArg
( "Template" ); // Only keep one for all of VAJ.
- final static RootArg EXPERT_MODE = new
RootArg( "ExpertMode" );
+ final static RootArg EXPERT_MODE = new RootArg
( "ExpertMode" );
final static RootArg USING_SSH = new RootArg
( "UsingSsh" );
final static RootArg SSH_IDENTITY = new RootArg
( "SshIdentity" );
final static RootArg BROKEN_NT_CVS = new RootArg
( "BrokenNTServer" );
+ final static RootArg PSERVER_PORT = new RootArg
( "PServerPort" );

// Example of related data:

//   ":pserver:username@serverhostname:/usr/local/cv

sroot"
diff -u --recursive -x *.class
vaj2cvs.old/PServerCapture.java vaj2cvs/PServerCapture.java
--- vaj2cvs.old/PServerCapture.java Wed Feb 13 11:03:42
2002
+++ vaj2cvs/PServerCapture.java Mon Apr 15 09:40:14 2002
@@ -7,8 +7,6 @@
*/
final class PServerCapture
{
- private static final int CVS_PORT = 2401;
-
private Socket _clientSocket;
private Socket _serverSocket;
private BufferedReader _clientIn;
@@ -19,6 +17,7 @@
private Thread _readServerThread;

private volatile boolean \_isClosing = false;

+
/**
* This method was created in VisualAge.
* @param socket java.net.Socket
@@ -90,7 +89,7 @@

\_clientSocket = clientSocket;
clientSocket.setTcpNoDelay\( true \);

- _serverSocket = new Socket( InetAddress.getByName(
serverName ), CVS_PORT );
+ _serverSocket = new Socket( InetAddress.getByName(
serverName ), CvsConnection.getCvsPort() );
_serverSocket.setTcpNoDelay( true );
_clientIn = new BufferedReader( new
InputStreamReader( _clientSocket.getInputStream() ) );
_serverIn = new BufferedReader( new
InputStreamReader( _serverSocket.getInputStream() ) );
@@ -168,7 +167,7 @@
System.exit( 1 );
}

- ServerSocket serverSocket = new ServerSocket(
CVS_PORT, 10 );
+ ServerSocket serverSocket = new ServerSocket(
CvsConnection.getCvsPort(), 10 );
while ( true )
{
Socket clientSocket = serverSocket.accept();
diff -u --recursive -x *.class vaj2cvs.old/PServerTest.java
vaj2cvs/PServerTest.java
--- vaj2cvs.old/PServerTest.java Wed Feb 13 11:03:42
2002
+++ vaj2cvs/PServerTest.java Mon Apr 15 09:38:58 2002
@@ -21,7 +21,6 @@
* @author: Eric Gasoine
*/
public final class PServerTest {
- private static final int CVS_PORT = 2401;

private Socket         \_serverSocket;
private BufferedReader \_serverIn;

@@ -66,7 +65,7 @@
}
};

- _serverSocket = new Socket( InetAddress.getByName(
serverName ), CVS_PORT );
+ _serverSocket = new Socket( InetAddress.getByName(
serverName ), CvsConnection.getCvsPort() );
_serverSocket.setTcpNoDelay( true );
_serverIn = new BufferedReader( new
InputStreamReader( _serverSocket.getInputStream() ) );
_serverOut = new BufferedWriter( new
OutputStreamWriter( _serverSocket.getOutputStream() ) );