[Mc4j-cvs] mc4j/src/org/mc4j/console Welcome.html,1.2,1.3 ConnectAction.java,1.15,1.16 mc4j-mf-layer
Brought to you by:
ghinkl
Menu
▾
▴
[Mc4j-cvs] mc4j/src/org/mc4j/console Welcome.html,1.2,1.3 ConnectAction.java,1.15,1.16 mc4j-mf-layer.xml,1.4,1.5 IConnectionNode.java,1.9,1.10 ManagementNode.java,1.28,1.29
|
From: Greg H. <gh...@us...> - 2006-04-12 19:14:30
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20162/src/org/mc4j/console Modified Files: Welcome.html ConnectAction.java mc4j-mf-layer.xml IConnectionNode.java ManagementNode.java Log Message: Merging EMS into head for the 2.0 release work Index: ConnectAction.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/ConnectAction.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ConnectAction.java 5 Oct 2004 05:16:19 -0000 1.15 --- ConnectAction.java 12 Apr 2006 19:13:55 -0000 1.16 *************** *** 17,24 **** package org.mc4j.console; ! import java.awt.Dialog; ! ! import javax.swing.SwingUtilities; ! import org.openide.DialogDisplayer; import org.openide.ErrorManager; --- 17,24 ---- package org.mc4j.console; ! import org.mc4j.console.connection.ConnectionNode; ! import org.mc4j.console.connection.persistence.ConnectionSetDatabase; ! import org.mc4j.console.connection.wizard.ConnectionDescriptor; ! import org.mc4j.ems.connection.settings.ConnectionSettings; import org.openide.DialogDisplayer; import org.openide.ErrorManager; *************** *** 28,34 **** import org.openide.util.actions.NodeAction; ! import org.mc4j.console.connection.persistence.ConnectionSetDatabase; ! import org.mc4j.console.connection.persistence.ConnectionSettings; ! import org.mc4j.console.connection.wizard.ConnectionDescriptor; /** --- 28,33 ---- import org.openide.util.actions.NodeAction; ! import javax.swing.*; ! import java.awt.*; /** *************** *** 49,53 **** final ConnectionDescriptor desc = new ConnectionDescriptor(); ! desc.getSettings().setLibraryURI(((ManagementNode)node).getLibraryURI()); final Dialog dlg = DialogDisplayer.getDefault().createDialog(desc); --- 48,53 ---- final ConnectionDescriptor desc = new ConnectionDescriptor(); ! // desc.getSettings().setLibraryURI(((ManagementNode)node).getLibraryURI()); ! final Dialog dlg = DialogDisplayer.getDefault().createDialog(desc); *************** *** 71,75 **** ConnectionSetDatabase.addNode(settings); ! IConnectionNode connectionNode = ManagementNode.buildConnection(settings); try { --- 71,76 ---- ConnectionSetDatabase.addNode(settings); ! IConnectionNode connectionNode = new ConnectionNode(settings); ! //ManagementNode.buildConnection(settings); try { Index: IConnectionNode.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/IConnectionNode.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** IConnectionNode.java 13 Oct 2004 05:05:33 -0000 1.9 --- IConnectionNode.java 12 Apr 2006 19:13:55 -0000 1.10 *************** *** 17,21 **** package org.mc4j.console; ! import org.mc4j.console.connection.persistence.ConnectionSettings; /** --- 17,21 ---- package org.mc4j.console; ! import org.mc4j.ems.connection.settings.ConnectionSettings; /** Index: ManagementNode.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/ManagementNode.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** ManagementNode.java 14 Mar 2005 15:16:18 -0000 1.28 --- ManagementNode.java 12 Apr 2006 19:13:55 -0000 1.29 *************** *** 17,40 **** package org.mc4j.console; ! import org.mc4j.console.connection.install.ConnectionTypeDescriptor; ! import org.mc4j.console.connection.install.GeronimoConnectionTypeDescriptor; ! import org.mc4j.console.connection.install.J2SE5ConnectionTypeDescriptor; ! import org.mc4j.console.connection.install.JBossConnectionTypeDescriptor; ! import org.mc4j.console.connection.install.JDMKConnectionTypeDescriptor; ! import org.mc4j.console.connection.install.JSR160ConnectionTypeDescriptor; ! import org.mc4j.console.connection.install.Mx4jConnectionTypeDescriptor; ! import org.mc4j.console.connection.install.Oc4jConnectionTypeDescriptor; ! import org.mc4j.console.connection.install.PramatiConnectionTypeDescriptor; ! import org.mc4j.console.connection.install.SJSASConnectionTypeDescriptor; ! import org.mc4j.console.connection.install.Tomcat55ConnectionTypeDescriptor; ! import org.mc4j.console.connection.install.Weblogic9ConnectionTypeDescriptor; ! import org.mc4j.console.connection.install.Weblogic9Jsr77ConnectionTypeDescriptor; ! import org.mc4j.console.connection.install.WeblogicConnectionTypeDescriptor; ! import org.mc4j.console.connection.install.WebsphereConnectionTypeDescriptor; ! import org.mc4j.console.connection.install.WebsphereStudioConnectionTypeDescriptor; import org.mc4j.console.connection.persistence.ConnectionSetDatabase; ! import org.mc4j.console.connection.persistence.ConnectionSettings; import org.openide.ErrorManager; - import org.openide.modules.InstalledFileLocator; import org.openide.nodes.AbstractNode; import org.openide.nodes.Children; --- 17,26 ---- package org.mc4j.console; ! ! import org.mc4j.console.connection.ConnectionNode; import org.mc4j.console.connection.persistence.ConnectionSetDatabase; ! import org.mc4j.ems.connection.settings.ConnectionSettings; ! import org.mc4j.ems.connection.support.metadata.ConnectionTypeDescriptor; import org.openide.ErrorManager; import org.openide.nodes.AbstractNode; import org.openide.nodes.Children; *************** *** 47,51 **** import java.io.File; import java.io.FileFilter; - import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; --- 33,36 ---- *************** *** 95,99 **** return null; } else { ! return new Action[] { NodeAction.get(ConnectAction.class) }; --- 80,84 ---- return null; } else { ! return new Action[]{ NodeAction.get(ConnectAction.class) }; *************** *** 116,139 **** ConnectionSettings desc = (ConnectionSettings) iter.next(); ! IConnectionNode connectionNode = null; ! ! ! //IOProvider.getDefault().getStdOut().println( ! // "[" + installType + "] Reconnecting to saved connection: " + ! // desc.getConnectionName() + "@" + desc.getServerUrl()); ! ! this.libraryURI = desc.getLibraryURI(); ! ! try { ! // Load each connection and try-catch so that one connection problem ! // won't screw up the rest ! connectionNode = buildConnection(desc); ! this.getChildren().add( new Node[] { (Node) connectionNode }); ! } catch(Exception e) { ! // Lets just kill it ! ConnectionSetDatabase.removeNode(desc); ! //ErrorManager.getDefault().notify(e); ! } --- 101,107 ---- ConnectionSettings desc = (ConnectionSettings) iter.next(); ! ConnectionNode connectionNode = new ConnectionNode(desc); ! this.getChildren().add(new Node[]{(Node) connectionNode}); *************** *** 153,175 **** - public static final ConnectionTypeDescriptor[] CONNECTION_DESCRIPTORS = - new ConnectionTypeDescriptor[] { - new JBossConnectionTypeDescriptor(), - new Tomcat55ConnectionTypeDescriptor(), - new JDMKConnectionTypeDescriptor(), - new J2SE5ConnectionTypeDescriptor(), - new JSR160ConnectionTypeDescriptor(), - new GeronimoConnectionTypeDescriptor(), - new Mx4jConnectionTypeDescriptor(), - new Oc4jConnectionTypeDescriptor(), - new PramatiConnectionTypeDescriptor(), - new SJSASConnectionTypeDescriptor(), - new WeblogicConnectionTypeDescriptor(), - new Weblogic9ConnectionTypeDescriptor(), - new Weblogic9Jsr77ConnectionTypeDescriptor(), - new WebsphereConnectionTypeDescriptor(), - new WebsphereStudioConnectionTypeDescriptor()}; public static ClassLoader buildClassLoader(ConnectionSettings settings) { // TODO GH: Build a factory --- 121,128 ---- + /* + public static ClassLoader buildClassLoader(ConnectionSettings settings) { // TODO GH: Build a factory *************** *** 177,181 **** File[] cpEntries = settings.getClassPathEntries(); ! int cpEntriesLength = (cpEntries==null?0:cpEntries.length); File[] extrasFiles = getExtras(settings.getConnectionType()); URL[] cpURLs = new URL[cpEntriesLength + extrasFiles.length]; --- 130,134 ---- File[] cpEntries = settings.getClassPathEntries(); ! int cpEntriesLength = (cpEntries == null ? 0 : cpEntries.length); File[] extrasFiles = getExtras(settings.getConnectionType()); URL[] cpURLs = new URL[cpEntriesLength + extrasFiles.length]; *************** *** 209,212 **** --- 162,166 ---- return null; } + */ /** *************** *** 223,227 **** protected synchronized Class loadClass(String name, boolean resolve) ! throws ClassNotFoundException { Class c = findLoadedClass(name); if (c == null) { --- 177,181 ---- protected synchronized Class loadClass(String name, boolean resolve) ! throws ClassNotFoundException { Class c = findLoadedClass(name); if (c == null) { *************** *** 232,236 **** } catch (SecurityException se) { int i = name.lastIndexOf('.'); ! String pkgname = name.substring(0, i); // Check if package already loaded. Package pkg = getPackage(pkgname); --- 186,190 ---- } catch (SecurityException se) { int i = name.lastIndexOf('.'); ! String pkgname = name.substring(0, i); // Check if package already loaded. Package pkg = getPackage(pkgname); *************** *** 242,247 **** resolveClass(c); } ! } catch(ClassNotFoundException cnfe) { ! c = super.loadClass(name,resolve); } } else { --- 196,201 ---- resolveClass(c); } ! } catch (ClassNotFoundException cnfe) { ! c = super.loadClass(name, resolve); } } else { *************** *** 298,302 **** try { ! ClassLoader loader = buildClassLoader(settings); Class clazz = Class.forName(className, true, loader); --- 252,256 ---- try { ! ClassLoader loader = null;//buildClassLoader(settings); Class clazz = Class.forName(className, true, loader); *************** *** 316,328 **** public static File[] getExtras(final ConnectionTypeDescriptor serverType) { - File extrasFile = - InstalledFileLocator.getDefault().locate("mc4jlib/mc4j_common.jar","org.mc4j.console",false); - if (!extrasFile.exists()) { - ErrorManager.getDefault().notify( - new RuntimeException("Unable to locate mc4j_common.jar in the mc4jlib folder") - ); - } ! File mc4jLibDir = extrasFile.getParentFile(); File[] commonLibs = mc4jLibDir.listFiles(new FileFilter() { --- 270,275 ---- public static File[] getExtras(final ConnectionTypeDescriptor serverType) { ! File mc4jLibDir = new File("mc4jlib");//extrasFile.getParentFile(); File[] commonLibs = mc4jLibDir.listFiles(new FileFilter() { *************** *** 335,343 **** - File[] tempDirs = mc4jLibDir.listFiles(new FileFilter() { public boolean accept(File file) { return (file.isDirectory() && ! file.getName().equals(serverType.getExtrasLibrary())); } }); --- 282,289 ---- File[] tempDirs = mc4jLibDir.listFiles(new FileFilter() { public boolean accept(File file) { return (file.isDirectory() && ! file.getName().equals(serverType.getExtrasLibrary())); } }); *************** *** 359,366 **** File[] results = new File[commonLibs.length + serverLibs.length + 1]; ! System.arraycopy(commonLibs,0,results,0,commonLibs.length); ! System.arraycopy(serverLibs,0,results,commonLibs.length,serverLibs.length); ! results[results.length-1] = new File("dashboards"); return results; --- 305,312 ---- File[] results = new File[commonLibs.length + serverLibs.length + 1]; ! System.arraycopy(commonLibs, 0, results, 0, commonLibs.length); ! System.arraycopy(serverLibs, 0, results, commonLibs.length, serverLibs.length); ! results[results.length - 1] = new File("dashboards"); return results; *************** *** 368,372 **** - public ClassLoader getDelegatedClassLoader() { return delegatedClassLoader; --- 314,317 ---- Index: Welcome.html =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/Welcome.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Welcome.html 19 Jan 2005 14:11:44 -0000 1.2 --- Welcome.html 12 Apr 2006 19:13:55 -0000 1.3 *************** *** 9,13 **** <tr> <td width="100%"> ! <span style="font-size: 24pt; font-family: Arial Black; color: #FFFFFF">MC4J 1.2 beta 8</span> </td> --- 9,13 ---- <tr> <td width="100%"> ! <span style="font-size: 24pt; font-family: Arial Black; color: #FFFFFF">MC4J 1.2 beta 9</span> </td> *************** *** 24,34 **** <h2>New features</h2> <ul> ! <li>WebSphere 5 support fixed</li> ! <li>WebSphere 6 support added</li> ! <li>WebLogic 9 support added</li> ! <li>JSR-77 support updates and bug fixes</li> ! <li>Better query nodes (Still not persistent)</li> ! <li>Sun Java App server support added</li> ! <li>Upgraded to NB Platform 4.0 Final</li> </ul> </td> --- 24,29 ---- <h2>New features</h2> <ul> ! <li>WebLogic 8, 7 and 6 support fixed</li> ! <li>WebSphere Studio test environment support fixed</li> </ul> </td> Index: mc4j-mf-layer.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/mc4j-mf-layer.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mc4j-mf-layer.xml 13 Oct 2004 05:05:33 -0000 1.4 --- mc4j-mf-layer.xml 12 Apr 2006 19:13:55 -0000 1.5 *************** *** 4,8 **** --- 4,10 ---- <folder name="Menu"> + <!-- <file name="File_hidden"/> + --> <file name="BuildProject_hidden"/> <file name="Edit_hidden"/> *************** *** 10,14 **** - <folder name="Management"> <file name="org-mc4j-console-CreateConnectionAction.instance"> --- 12,15 ---- *************** *** 44,52 **** <file name="properties.wsmode" url="Windows2/Modes/properties.wsmode"/> <folder name="properties"> ! <file name="properties.wstcref" url="Windows2/Modes/properties/properties.wstcref" /> </folder> ! <file name="editor.wsmode" url="Windows2/Modes/editor.wsmode" /> <folder name="editor"> <file name="welcomepanel.wstcref" url="Windows2/Modes/editor/welcomepanel.wstcref"/> --- 45,53 ---- <file name="properties.wsmode" url="Windows2/Modes/properties.wsmode"/> <folder name="properties"> ! <file name="properties.wstcref" url="Windows2/Modes/properties/properties.wstcref"/> </folder> ! <file name="editor.wsmode" url="Windows2/Modes/editor.wsmode"/> <folder name="editor"> <file name="welcomepanel.wstcref" url="Windows2/Modes/editor/welcomepanel.wstcref"/> *************** *** 69,73 **** <folder name="Toolbars"> ! <!-- Specifying the file Standard.xml in this place in your layer will override the default toolbar configuration. --- 70,74 ---- <folder name="Toolbars"> ! <!-- Specifying the file Standard.xml in this place in your layer will override the default toolbar configuration. *************** *** 98,102 **** </file> ! <!-- <file name="org-mc4j-console-mejb-view-ShowMEJBViewAction.instance"> <attr name="name" stringvalue="org-mc4j-console-mejb-view-MEJBView"/> --- 99,103 ---- </file> ! <!-- <file name="org-mc4j-console-mejb-view-ShowMEJBViewAction.instance"> <attr name="name" stringvalue="org-mc4j-console-mejb-view-MEJBView"/> *************** *** 115,117 **** --- 116,125 ---- </folder> <!-- Toolbars --> + + <folder name="Shortcuts"> + <file name="D-W.instance"> + <attr name="instanceClass" + stringvalue="org.netbeans.core.actions.SystemExit"/> + </file> + </folder> </filesystem> |
