[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv/panel BackupPanel.java, 1.1.1.1, 1.2 BlankPanel.java, 1.1.1.1, 1.2 DSLogViewer.java, 1.1.1.1, 1.2 LogPanel.java, 1.1.1.1, 1.2 MappingNodeBckPanel.java, 1.1.1.1, 1.2 NewLDBMPanel.java, 1.1.1.1, 1.2 RestorePanel.java, 1.1.1.1, 1.2
Nathan Kinder (nkinder)
fedora-directory-commits at redhat.com
Mon Jul 2 19:44:11 UTC 2007
- Previous message (by thread): [Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv/node MonitorResourceObject.java, 1.1.1.1, 1.2
- Next message (by thread): [Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv/also Danny-Atul-To.jpg, NONE, 1.1 files.lst, 1.1, 1.2 Danny, Atul, To.jpg, 1.1.1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: nkinder
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5440/src/com/netscape/admin/dirserv/panel
Modified Files:
BackupPanel.java BlankPanel.java DSLogViewer.java
LogPanel.java MappingNodeBckPanel.java NewLDBMPanel.java
RestorePanel.java
Log Message:
Resolves: 246513
Summary: Removed server root concept from Directory Console.
Index: BackupPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/BackupPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- BackupPanel.java 18 Jul 2005 00:55:52 -0000 1.1.1.1
+++ BackupPanel.java 2 Jul 2007 19:44:09 -0000 1.2
@@ -47,12 +47,9 @@
public void init() {
- String instDir = getInstanceDirectory();
- if ( instDir != null ) {
- _baseDir = instDir + "/bak";
- }
+ _baseDir = DSUtil.getDefaultBackupPath(getModel().getServerInfo());
- _myPanel.setLayout( new GridBagLayout() );
+ _myPanel.setLayout( new GridBagLayout() );
createFileArea( _myPanel );
setDefaultDirectory();
Index: BlankPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/BlankPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- BlankPanel.java 18 Jul 2005 00:55:53 -0000 1.1.1.1
+++ BlankPanel.java 2 Jul 2007 19:44:09 -0000 1.2
@@ -1029,13 +1029,6 @@
return true;
}
- /**
- * Get the directory where the server instance lives
- */
- protected String getInstanceDirectory() {
- return (String)getModel().getServerInfo().get( "serverroot" );
- }
-
static protected boolean requiresConfirmation( String item ) {
return DSUtil.requiresConfirmation( item );
}
Index: DSLogViewer.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/DSLogViewer.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- DSLogViewer.java 18 Jul 2005 00:55:56 -0000 1.1.1.1
+++ DSLogViewer.java 2 Jul 2007 19:44:09 -0000 1.2
@@ -89,6 +89,8 @@
_cbFilename.removeAllItems();
LDAPConnection ldc = getModel().getServerInfo().getLDAPConnection();
String attrs[] = { _configAttr, _configListAttr };
+ String logfile;
+ int i;
try {
LDAPEntry entry = ldc.read( _configDN, attrs );
if ( entry != null ) {
@@ -96,14 +98,42 @@
if ( attr != null ) {
Enumeration en = attr.getStringValues();
while ( en.hasMoreElements() ) {
- _cbFilename.addItem( (String)en.nextElement() );
+ // Chop off the path. We only want the filename.
+ logfile = (String)en.nextElement();
+ if ((i = logfile.lastIndexOf('/')) >= 0 ) {
+ // Make sure we're not at the end of the string
+ if ( logfile.length() > (i + 1) ) {
+ logfile = logfile.substring(i + 1);
+ } else {
+ logfile = "";
+ }
+ }
+
+ // Check if string is empty before adding
+ if (logfile.length() > 0) {
+ _cbFilename.addItem(logfile);
+ }
}
}
attr = entry.getAttribute( attrs[1] );
if ( attr != null ) {
Enumeration en = attr.getStringValues();
while ( en.hasMoreElements() ) {
- _cbFilename.addItem( (String)en.nextElement() );
+ // Chop off the path. We only want the filename.
+ logfile = (String)en.nextElement();
+ if ((i = logfile.lastIndexOf('/')) >= 0 ) {
+ // Make sure we're not at the end of the string
+ if ( logfile.length() > (i + 1) ) {
+ logfile = logfile.substring(i + 1);
+ } else {
+ logfile = "";
+ }
+ }
+
+ // Check if string is empty before adding
+ if (logfile.length() > 0) {
+ _cbFilename.addItem(logfile);
+ }
}
}
} else {
Index: LogPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/LogPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- LogPanel.java 18 Jul 2005 00:55:59 -0000 1.1.1.1
+++ LogPanel.java 2 Jul 2007 19:44:09 -0000 1.2
@@ -440,7 +440,7 @@
// server, logging is implicitly disabled if there is no
// log file specified.
if (_tfLog.getText().trim().length() == 0) {
- String path = getInstanceDirectory() + File.separator + "logs" + File.separator + LOG_BASE_NAME;
+ String path = DSUtil.getDefaultLogPath(getModel().getServerInfo()) + File.separator + LOG_BASE_NAME;
_cbEnabled.setSelected(false);
_cbRotationSyncEnabled.setSelected(false);
_tfLog.setText(path);
Index: MappingNodeBckPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/MappingNodeBckPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- MappingNodeBckPanel.java 18 Jul 2005 00:55:59 -0000 1.1.1.1
+++ MappingNodeBckPanel.java 2 Jul 2007 19:44:09 -0000 1.2
@@ -548,18 +548,23 @@
checkBckNumber();
} else if ( e.getSource().equals( _bLibBrowse )){
- String file = getInstanceDirectory();
- String[] extensions = { "so","dll","sl","dl", "a" };
- String[] descriptions = { DSUtil._resource.getString( "filefilter", "dynamic-lib-so" ),
+ if (isLocal()) {
+ String file = "";
+ String[] extensions = { "so","dll","sl","dl", "a" };
+ String[] descriptions = { DSUtil._resource.getString( "filefilter", "dynamic-lib-so" ),
DSUtil._resource.getString( "filefilter", "dynamic-lib-dll"),
DSUtil._resource.getString( "filefilter", "dynamic-lib-sl"),
DSUtil._resource.getString( "filefilter", "dynamic-lib-dl"),
DSUtil._resource.getString( "filefilter", "dynamic-lib-a")};
- file = DSFileDialog.getFileName(file, false, extensions,
+ file = DSFileDialog.getFileName(file, false, extensions,
descriptions, this);
- if ( file != null) {
- _LibText.setText( file );
- }
+ if ( file != null) {
+ _LibText.setText( file );
+ }
+ } else {
+ // Must be local to browse
+ DSUtil.showErrorDialog( getModel().getFrame(), "error-not-local", "", _section);
+ }
} else {
Debug.println(" MappingNodeSettingPanel.actionPerformed() : wrong action performed");
}
@@ -631,12 +636,12 @@
if(( _isLibDirty ) &&
(( sFunction == null ) ||
(sFunction.trim().length() == 0)) ) {
- DSUtil.showErrorDialog( getModel().getFrame(),"error-no-funct", "");
+ DSUtil.showErrorDialog( getModel().getFrame(), "error-no-funct", "", _section);
return;
}
if(( _isFctDirty ) &&
(( sLib == null) || ( sLib.trim().length() == 0 ))) {
- DSUtil.showErrorDialog( getModel().getFrame(),"error-no-lib","");
+ DSUtil.showErrorDialog( getModel().getFrame(), "error-no-lib", "", _section);
return;
}
prepSaveDistrib( attrs );
@@ -706,12 +711,12 @@
if(( _isLibDirty ) &&
(( sFunction == null ) ||
(sFunction.trim().length() == 0)) ) {
- DSUtil.showErrorDialog( getModel().getFrame(),"error-no-funct", "");
+ DSUtil.showErrorDialog( getModel().getFrame(), "error-no-funct", "", _section);
return( false ) ;
}
if(( _isFctDirty ) &&
(( sLib == null) || ( sLib.trim().length() == 0 ))) {
- DSUtil.showErrorDialog( getModel().getFrame(),"error-no-lib","");
+ DSUtil.showErrorDialog( getModel().getFrame(), "error-no-lib", "", _section);
return( false );
}
prepSaveDistrib( attrs );
Index: NewLDBMPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/NewLDBMPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- NewLDBMPanel.java 18 Jul 2005 00:56:01 -0000 1.1.1.1
+++ NewLDBMPanel.java 2 Jul 2007 19:44:09 -0000 1.2
@@ -61,10 +61,7 @@
// Physical DB info
createFileArea( _myPanel );
- String instDir = getInstanceDirectory();
- if ( instDir != null ) {
- _baseDir = instDir;
- }
+ _baseDir = DSUtil.getDefaultDBPath( getModel().getServerInfo() );
AbstractDialog dlg = getAbstractDialog();
if ( dlg != null ) {
Index: RestorePanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/RestorePanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- RestorePanel.java 18 Jul 2005 00:56:03 -0000 1.1.1.1
+++ RestorePanel.java 2 Jul 2007 19:44:09 -0000 1.2
@@ -56,10 +56,7 @@
_myPanel.setLayout( new GridBagLayout() );
createFileArea( _myPanel, dirList );
- String instDir = getInstanceDirectory();
- if ( instDir != null ) {
- _baseDir = instDir + "/bak";
- }
+ String _baseDir = DSUtil.getDefaultBackupPath(getModel().getServerInfo());
SimpleDialog dlg = getSimpleDialog();
if ( dlg != null ) {
- Previous message (by thread): [Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv/node MonitorResourceObject.java, 1.1.1.1, 1.2
- Next message (by thread): [Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv/also Danny-Atul-To.jpg, NONE, 1.1 files.lst, 1.1, 1.2 Danny, Atul, To.jpg, 1.1.1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Fedora-directory-commits
mailing list