You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
|
Apr
(544) |
May
(1715) |
Jun
(1059) |
Jul
(886) |
Aug
(1214) |
Sep
(1375) |
Oct
(1664) |
Nov
(1153) |
Dec
(1084) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(1630) |
Feb
(1634) |
Mar
(1979) |
Apr
(1119) |
May
(1850) |
Jun
(1231) |
Jul
(1168) |
Aug
(1840) |
Sep
(1038) |
Oct
(1127) |
Nov
(1458) |
Dec
(854) |
2004 |
Jan
(1145) |
Feb
(1064) |
Mar
(2242) |
Apr
(1728) |
May
(1346) |
Jun
(1280) |
Jul
(1681) |
Aug
(2388) |
Sep
(2233) |
Oct
(3246) |
Nov
(3248) |
Dec
(1775) |
2005 |
Jan
(3407) |
Feb
(3049) |
Mar
(2402) |
Apr
(3687) |
May
(3289) |
Jun
(5731) |
Jul
(3905) |
Aug
(5843) |
Sep
(5149) |
Oct
(6866) |
Nov
(4051) |
Dec
(4646) |
2006 |
Jan
(7356) |
Feb
(4713) |
Mar
(9447) |
Apr
(6553) |
May
(6206) |
Jun
(4301) |
Jul
(1160) |
Aug
(23) |
Sep
(11) |
Oct
(19) |
Nov
(26) |
Dec
(15) |
2007 |
Jan
(28) |
Feb
(24) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Heiko W. R. <hw...@pi...> - 2006-07-10 16:04:46
|
User: pilhuhn Date: 06/07/10 12:04:43 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Add JoeSNMP to test classpath. Revision Changes Path No revision No revision 1.406.2.209 +2 -1 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.208 retrieving revision 1.406.2.209 diff -u -b -r1.406.2.208 -r1.406.2.209 --- build.xml 27 Jun 2006 10:52:06 -0000 1.406.2.208 +++ build.xml 10 Jul 2006 16:04:43 -0000 1.406.2.209 @@ -12,7 +12,7 @@ <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.208 2006/06/27 10:52:06 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.406.2.209 2006/07/10 16:04:43 pilhuhn Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -107,6 +107,7 @@ <path refid="jboss/jbossretro.rt.classpath"/> <path refid="jboss/backport.concurrent.classpath"/> <path refid="jgroups.jgroups.classpath"/> + <path refid="joesnmp.joesnmp.classpath"/> <path refid="junit.junit.classpath"/> <path refid="junitejb.junitejb.classpath"/> <path refid="juddi.juddi.classpath"/> |
From: Clebert S. <csu...@jb...> - 2006-07-10 16:03:38
|
User: csuconic Date: 06/07/10 12:03:35 Added: tests/org/jboss/serial/regression/jbser83 RegressionTestCase.java TestReadResolveNull.java TestReferences.java Log: JBSER-83 - fix Revision Changes Path 1.1 date: 2006/07/10 16:03:35; author: csuconic; state: Exp;jboss-serialization/tests/org/jboss/serial/regression/jbser83/RegressionTestCase.java Index: RegressionTestCase.java =================================================================== package org.jboss.serial.regression.jbser83; import java.io.*; import org.jboss.serial.io.JBossObjectInputStream; import org.jboss.serial.io.JBossObjectOutputStream; import junit.framework.TestCase; public class RegressionTestCase extends TestCase { public void testJava() throws Exception { ByteArrayOutputStream byteOut = new ByteArrayOutputStream(); ObjectOutputStream objOut = new ObjectOutputStream(byteOut); TestReadResolveNull objNull = TestReadResolveNull.createTestInstance(); objOut.writeObject(objNull); objOut.close(); ObjectInputStream input = new ObjectInputStream(new ByteArrayInputStream(byteOut.toByteArray())); Object obj = input.readObject(); System.out.println("obj=" + obj); } public void testJavaOnClassReferences() throws Exception { ByteArrayOutputStream byteOut = new ByteArrayOutputStream(); ObjectOutputStream objOut = new ObjectOutputStream(byteOut); TestReferences obj1 = new TestReferences(); objOut.writeObject(obj1); objOut.close(); ObjectInputStream input = new ObjectInputStream(new ByteArrayInputStream(byteOut.toByteArray())); Object obj2 = input.readObject(); System.out.println("obj2=" + obj2); } public void testJBoss() throws Exception { ByteArrayOutputStream byteOut = new ByteArrayOutputStream(); JBossObjectOutputStream objOut = new JBossObjectOutputStream(byteOut); TestReadResolveNull objNull = TestReadResolveNull.createTestInstance(); objOut.writeObject(objNull); objOut.close(); ObjectInputStream input = new JBossObjectInputStream(new ByteArrayInputStream(byteOut.toByteArray())); Object obj = input.readObject(); System.out.println("obj=" + obj); } public void testJBossOnClassReferences() throws Exception { ByteArrayOutputStream byteOut = new ByteArrayOutputStream(); ObjectOutputStream objOut = new JBossObjectOutputStream(byteOut); TestReferences obj1 = new TestReferences(); objOut.writeObject(obj1); objOut.close(); ObjectInputStream input = new JBossObjectInputStream(new ByteArrayInputStream(byteOut.toByteArray())); Object obj2 = input.readObject(); System.out.println("obj2=" + obj2); } } 1.1 date: 2006/07/10 16:03:35; author: csuconic; state: Exp;jboss-serialization/tests/org/jboss/serial/regression/jbser83/TestReadResolveNull.java Index: TestReadResolveNull.java =================================================================== /* * JBoss, Home of Professional Open Source * Copyright 2005, JBoss Inc., and individual contributors as indicated * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.serial.regression.jbser83; import java.io.Serializable; /** * $Id: TestReadResolveNull.java,v 1.1 2006/07/10 16:03:35 csuconic Exp $ * * @author <a href="mailto:cle...@jb...">Clebert Suconic</a> */ public class TestReadResolveNull implements Serializable { public Object readResolve() { return null; } public static TestReadResolveNull createTestInstance() { return new TestReadResolveNull(); } } 1.1 date: 2006/07/10 16:03:35; author: csuconic; state: Exp;jboss-serialization/tests/org/jboss/serial/regression/jbser83/TestReferences.java Index: TestReferences.java =================================================================== package org.jboss.serial.regression.jbser83; import java.io.Serializable; public class TestReferences implements Serializable { public Class clazz2; public TestReferences() { clazz2=TestReadResolveNull.class; } } |
From: Clebert S. <csu...@jb...> - 2006-07-10 16:03:38
|
User: csuconic Date: 06/07/10 12:03:35 Modified: src/org/jboss/serial/objectmetamodel ObjectDescriptorFactory.java Log: JBSER-83 - fix Revision Changes Path 1.31 +27 -23 jboss-serialization/src/org/jboss/serial/objectmetamodel/ObjectDescriptorFactory.java (In the diff below, changes in quantity of whitespace are not shown.) Index: ObjectDescriptorFactory.java =================================================================== RCS file: /cvsroot/jboss/jboss-serialization/src/org/jboss/serial/objectmetamodel/ObjectDescriptorFactory.java,v retrieving revision 1.30 retrieving revision 1.31 diff -u -b -r1.30 -r1.31 --- ObjectDescriptorFactory.java 3 May 2006 17:00:16 -0000 1.30 +++ ObjectDescriptorFactory.java 10 Jul 2006 16:03:35 -0000 1.31 @@ -40,6 +40,7 @@ import org.jboss.serial.finalcontainers.ShortContainer; import org.jboss.serial.objectmetamodel.ObjectsCache.JBossSeralizationInputInterface; import org.jboss.serial.objectmetamodel.ObjectsCache.JBossSeralizationOutputInterface; +import org.jboss.serial.persister.ClassReferencePersister; import org.jboss.serial.persister.PersistResolver; import org.jboss.serial.persister.Persister; import org.jboss.serial.util.ClassMetaConsts; @@ -410,6 +411,8 @@ Object value = persister.readData(cache.getLoader(), streamingClass, metaData, reference, cache, cache.getInput(), cache.getSubstitution()); + if (!(persister instanceof ClassReferencePersister)) //JBSER-83 + { if (cache.getSubstitution()!=null) { value = cache.getSubstitution().replaceObject(value); @@ -435,6 +438,7 @@ { throw new SerializationException(e); } + } return value; } |
From: Clebert S. <csu...@jb...> - 2006-07-10 16:03:35
|
User: csuconic Date: 06/07/10 12:03:33 Log: Directory /cvsroot/jboss/jboss-serialization/tests/org/jboss/serial/regression/jbser83 added to the repository |
From: Robert S. <ra...@gm...> - 2006-07-10 16:01:32
|
User: rawb Date: 06/07/10 12:01:20 Modified: as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views JBossServerTableViewer.java Log: Commented out incomplete feature. Revision Changes Path 1.8 +3 -3 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/JBossServerTableViewer.java (In the diff below, changes in quantity of whitespace are not shown.) Index: JBossServerTableViewer.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/JBossServerTableViewer.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- JBossServerTableViewer.java 10 Jul 2006 15:56:12 -0000 1.7 +++ JBossServerTableViewer.java 10 Jul 2006 16:01:20 -0000 1.8 @@ -137,9 +137,9 @@ // Show a wizard - ServerCloneWizard wizard = new ServerCloneWizard(server); - WizardDialog dlg = new WizardDialog(Display.getDefault().getActiveShell(), wizard); - dlg.open(); + //ServerCloneWizard wizard = new ServerCloneWizard(server); + //WizardDialog dlg = new WizardDialog(Display.getDefault().getActiveShell(), wizard); + //dlg.open(); |
From: Robert S. <ra...@gm...> - 2006-07-10 15:59:07
|
User: rawb Date: 06/07/10 11:58:59 Modified: as/plugins/org.jboss.ide.eclipse.as.core plugin.xml Log: Revision Changes Path 1.8 +21 -10 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: plugin.xml =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- plugin.xml 24 Jun 2006 01:20:53 -0000 1.7 +++ plugin.xml 10 Jul 2006 15:58:59 -0000 1.8 @@ -23,8 +23,8 @@ runtime="true" runtimeTypeId="org.jboss.ide.eclipse.as.runtime.32" startBeforePublish="false" - startTimeout="120000" - stopTimeout="120000" + startTimeout="450000" + stopTimeout="450000" supportsRemoteHosts="true"/> <serverType @@ -40,8 +40,8 @@ runtime="true" runtimeTypeId="org.jboss.ide.eclipse.as.runtime.40" startBeforePublish="false" - startTimeout="120000" - stopTimeout="120000" + startTimeout="450000" + stopTimeout="450000" supportsRemoteHosts="false"/> </extension> @@ -105,6 +105,9 @@ <moduleType types="jst.ear" versions="1.2, 1.3, 1.4"/> + <moduleType + types="jboss.archive" + versions="1.0"/> </runtimeType> </extension> <extension @@ -131,6 +134,8 @@ </extension> <extension point="org.eclipse.wst.server.core.moduleFactories"> + + <!-- <moduleFactory class="org.jboss.ide.eclipse.as.core.module.factory.AopModuleFactory" id="org.jboss.ide.eclipse.as.core.factory.aopFactory" @@ -151,6 +156,13 @@ id="org.jboss.ide.eclipse.as.core.factory.earFactory" order="2" projects="false"/> + + --> + <moduleFactory + class="org.jboss.ide.eclipse.as.core.module.factory.ArchiveModuleFactory" + id="org.jboss.ide.eclipse.as.core.ArchiveDeployer" + order="2" + projects="false"/> </extension> <extension point="org.eclipse.wst.server.core.moduleTypes"> @@ -177,25 +189,24 @@ point="org.eclipse.wst.server.core.clients"> <client class="org.jboss.ide.eclipse.as.core.client.DoNothingClient" - description="Perform no verification at all. " + description="No action is taken." id="org.jboss.ide.eclipse.as.core.client.DoNothingClient" - launchable="org.jboss.ide.eclipse.as.core.launch.client.NullLaunchable" name="Take No Action" priority="20"/> <client class="org.jboss.ide.eclipse.as.core.client.VerifyPublishClient" description="Verify that your archive was successfully deployed to, and loaded by, the server." id="org.jboss.ide.eclipse.as.core.verifyClient" - launchable="org.jboss.ide.eclipse.as.core.launch.IJBossDeploymentVerifier" - name="Deploy and Verify" + name="Verify Publish" priority="20"/> </extension> <extension point="org.jboss.ide.eclipse.as.core.jbossModuleFactory"> - <factory id="org.jboss.ide.eclipse.as.core.factory.aopFactory"/> +<!-- <factory id="org.jboss.ide.eclipse.as.core.factory.aopFactory"/> <factory id="org.jboss.ide.eclipse.as.core.factory.ejbFactory"/> <factory id="org.jboss.ide.eclipse.as.core.factory.warFactory"/> - <factory id="org.jboss.ide.eclipse.as.core.factory.earFactory"/> + <factory id="org.jboss.ide.eclipse.as.core.factory.earFactory"/> --> + <factory id="org.jboss.ide.eclipse.as.core.ArchiveDeployer"/> </extension> </plugin> |
From: Robert S. <ra...@gm...> - 2006-07-10 15:59:01
|
User: rawb Date: 06/07/10 11:59:00 Modified: as/plugins/org.jboss.ide.eclipse.as.ui plugin.xml Log: Revision Changes Path 1.7 +4 -0 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: plugin.xml =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- plugin.xml 27 Jun 2006 21:34:36 -0000 1.6 +++ plugin.xml 10 Jul 2006 15:59:00 -0000 1.7 @@ -58,6 +58,10 @@ <extension point="org.eclipse.wst.server.ui.serverImages"> <image + icon="icons/J2EEModule16.gif" + id="org.jboss.ide.eclipse.as.ui.archiveImage" + typeIds="jboss.archive"/> + <image icon="icons/AppClientModule16.gif" id="org.jboss.ide.eclipse.as.ui.earImage" typeIds="jboss.ear"/> |
From: Robert S. <ra...@gm...> - 2006-07-10 15:56:15
|
User: rawb Date: 06/07/10 11:56:12 Modified: as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views JBossServerTableViewer.java Log: Uses attribute helper now. Revision Changes Path 1.7 +103 -24 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/JBossServerTableViewer.java (In the diff below, changes in quantity of whitespace are not shown.) Index: JBossServerTableViewer.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/JBossServerTableViewer.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- JBossServerTableViewer.java 27 Jun 2006 21:34:36 -0000 1.6 +++ JBossServerTableViewer.java 10 Jul 2006 15:56:12 -0000 1.7 @@ -25,6 +25,8 @@ import java.util.ArrayList; import java.util.Properties; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.viewers.ISelection; @@ -33,6 +35,7 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; @@ -44,10 +47,17 @@ import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.part.PageBook; import org.eclipse.ui.views.properties.IPropertySheetPage; +import org.eclipse.wst.server.core.IRuntime; +import org.eclipse.wst.server.core.IRuntimeType; +import org.eclipse.wst.server.core.IRuntimeWorkingCopy; import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.IServerType; +import org.eclipse.wst.server.core.IServerWorkingCopy; +import org.eclipse.wst.server.core.internal.ServerType; import org.eclipse.wst.server.ui.ServerUICore; import org.jboss.ide.eclipse.as.core.JBossServerCore; import org.jboss.ide.eclipse.as.core.server.JBossServer; +import org.jboss.ide.eclipse.as.core.server.runtime.JBossServerRuntime; import org.jboss.ide.eclipse.as.core.util.ASDebug; import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; @@ -57,18 +67,18 @@ import org.jboss.ide.eclipse.as.ui.viewproviders.PropertySheetFactory; import org.jboss.ide.eclipse.as.ui.viewproviders.PropertySheetFactory.ISimplePropertiesHolder; import org.jboss.ide.eclipse.as.ui.viewproviders.PropertySheetFactory.SimplePropertiesPropertySheetPage; +import org.jboss.ide.eclipse.as.ui.wizards.ServerCloneWizard; public class JBossServerTableViewer extends TreeViewer { protected TableViewerPropertySheet propertySheet; - protected Action disableCategoryAction, refreshViewerAction, twiddleAction; + protected Action disableCategoryAction, refreshViewerAction, twiddleAction, cloneServerAction; public JBossServerTableViewer(Tree tree) { super(tree); setContentProvider(new ContentProviderDelegator()); setLabelProvider(new LabelProviderDelegator()); - //topLevelPropertiesPage = PropertySheetFactory.createSimplePropertiesSheet(new TopLevelProperties()); propertySheet = new TableViewerPropertySheet(); createActions(); } @@ -116,6 +126,70 @@ }; twiddleAction.setText("Twiddle Server"); twiddleAction.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.TWIDDLE_IMAGE)); + + + cloneServerAction = new Action() { + public void run() { + Object selected = getSelectedElement(); + if( selected != null && selected instanceof JBossServer ) { + JBossServer server = (JBossServer)selected; + + + + // Show a wizard + ServerCloneWizard wizard = new ServerCloneWizard(server); + WizardDialog dlg = new WizardDialog(Display.getDefault().getActiveShell(), wizard); + dlg.open(); + + + + // clone the directories + + // clone the wst server + //wstServerClone(server, newName); + } + } + + public void directoriesClone() { + + } + + public void wstServerClone(JBossServer server, String newName) { + + IServerType serverType = server.getServer().getServerType(); + IRuntimeType runtimeType = server.getServer().getRuntime().getRuntimeType(); + JBossServerRuntime oldJBRuntime = (JBossServerRuntime)server.getServer().getRuntime().loadAdapter(JBossServerRuntime.class, null); + try { + IServerWorkingCopy newServerWC = serverType.createServer(null, null, null, null); + IRuntimeWorkingCopy newRuntimeWC = runtimeType.createRuntime("", null); + IRuntime runtime = newRuntimeWC.save(true, null); + JBossServerRuntime newJBRuntime = (JBossServerRuntime)newRuntimeWC.loadAdapter(JBossServerRuntime.class, null); + newJBRuntime.setVMInstall(oldJBRuntime.getVM()); + + + newServerWC.setRuntime(runtime); + + IFolder configFolder = ServerType.getServerProject().getFolder(newName); + if( !configFolder.exists() ) { + configFolder.create(true, true, null); + } + + newServerWC.setServerConfiguration(configFolder); + newServerWC.setName(newName); + + JBossServer newServer = (JBossServer)newServerWC.loadAdapter(JBossServer.class, null); + + +// newServer.getAttributeHelper().setServerHome(server.getAttributeHelper().getServerHome()); +// // then set the new config +// newServer.getAttributeHelper().setJbossConfiguration("default"); + + newServerWC.save(true, null); + } catch( CoreException ce) {} + } + }; + cloneServerAction.setText("Clone Server"); + } public static class ContentWrapper { @@ -199,6 +273,10 @@ } public Object[] getChildren(Object parentElement) { + try { + if( parentElement == null ) return new Object[0]; + + if( parentElement instanceof JBossServer) { return JBossServerUIPlugin.getDefault().getEnabledViewProviders(); } @@ -218,7 +296,7 @@ return new Object[0]; return wrap(o, parentWrapper.getProvider()); } - + } catch( Exception e ) { e.printStackTrace(); } return new Object[0]; } @@ -282,6 +360,7 @@ Object selected = getSelectedElement(); if( selected instanceof JBossServer) { menu.add(twiddleAction); + //menu.add(cloneServerAction); } @@ -378,13 +457,13 @@ if( selected instanceof JBossServer) { JBossServer server = (JBossServer)selected; - String home = server.getRuntimeConfiguration().getServerHome(); + String home = server.getAttributeHelper().getServerHome(); ret.setProperty(Messages.ServerRuntimeVersion, server.getJBossRuntime().getVersionDelegate().getId()); ret.setProperty(Messages.ServerHome, home); - ret.setProperty(Messages.ServerConfigurationName, server.getRuntimeConfiguration().getJbossConfiguration()); + ret.setProperty(Messages.ServerConfigurationName, server.getAttributeHelper().getJbossConfiguration()); ret.setProperty(Messages.ServerDeployDir, - server.getRuntimeConfiguration().getDeployDirectory().replace(home, "(home)")); + server.getAttributeHelper().getDeployDirectory().replace(home, "(home)")); } return ret; } |
From: Robert S. <ra...@gm...> - 2006-07-10 15:53:51
|
User: rawb Date: 06/07/10 11:53:50 Modified: as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards AbstractJBossWizardFragment.java Log: Uses attribute helper now Revision Changes Path 1.4 +7 -15 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/AbstractJBossWizardFragment.java (In the diff below, changes in quantity of whitespace are not shown.) Index: AbstractJBossWizardFragment.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/AbstractJBossWizardFragment.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- AbstractJBossWizardFragment.java 22 Jun 2006 20:54:10 -0000 1.3 +++ AbstractJBossWizardFragment.java 10 Jul 2006 15:53:50 -0000 1.4 @@ -63,9 +63,8 @@ import org.eclipse.wst.server.ui.wizard.IWizardHandle; import org.eclipse.wst.server.ui.wizard.WizardFragment; import org.jboss.ide.eclipse.as.core.server.JBossServer; -import org.jboss.ide.eclipse.as.core.server.runtime.JBossRuntimeConfiguration; +import org.jboss.ide.eclipse.as.core.server.ServerAttributeHelper; import org.jboss.ide.eclipse.as.core.server.runtime.JBossServerRuntime; -import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; import org.jboss.ide.eclipse.as.ui.Messages; import org.jboss.ide.eclipse.as.ui.util.JBossConfigurationTableViewer; @@ -509,7 +508,7 @@ folder.create(true,true, new NullProgressMonitor()); } serverWC.setServerConfiguration(folder); - serverWC.setName("JbossServer " + name); + serverWC.setName(name); server = (JBossServer) serverWC.getAdapter(JBossServer.class); @@ -517,18 +516,13 @@ server = (JBossServer) serverWC.loadAdapter(JBossServer.class, new NullProgressMonitor()); } + ServerAttributeHelper helper = new ServerAttributeHelper(server, serverWC); + helper.setServerHome(homeDir); + helper.setJbossConfiguration(config); - - /* TODO: FIX */ - JBossRuntimeConfiguration rtConfig = server.getRuntimeConfiguration(); try { - rtConfig.setHost(serverWC.getHost()); - rtConfig.setServerHome(homeDir); - rtConfig.setJbossConfiguration(config); serverWC.save(false, new NullProgressMonitor()); server.setRuntime(runtime); - - runtime.setVMInstall(selectedVM); } catch( Exception e ) { System.out.println("DYING HERE"); @@ -547,13 +541,11 @@ return true; } - private String getResourceString(String key) { - return JBossServerUIPlugin.getResourceString(key); - } + private IFolder getJbossServerFolder(String serverName) { try { - return ServerType.getServerProject().getFolder("JbossServer " + serverName); + return ServerType.getServerProject().getFolder(serverName); } catch( CoreException e) { return null; } |
From: Robert S. <ra...@gm...> - 2006-07-10 15:53:24
|
User: rawb Date: 06/07/10 11:53:23 Modified: as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views JBossServerView.java Log: Added a null check Revision Changes Path 1.6 +8 -4 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/JBossServerView.java (In the diff below, changes in quantity of whitespace are not shown.) Index: JBossServerView.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/JBossServerView.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- JBossServerView.java 27 Jun 2006 07:07:30 -0000 1.5 +++ JBossServerView.java 10 Jul 2006 15:53:23 -0000 1.6 @@ -50,7 +50,6 @@ import org.eclipse.wst.server.ui.internal.view.servers.ServersView; import org.jboss.ide.eclipse.as.core.JBossServerCore; import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin.ServerViewProvider; -import org.jboss.ide.eclipse.as.ui.viewproviders.PropertySheetFactory.JBossServersViewPropertySheetPage; public class JBossServerView extends ServersView { @@ -65,8 +64,6 @@ protected Tree jbTreeTable; - protected JBossServersViewPropertySheetPage propertyPage; - public static JBossServerView instance; public static JBossServerView getDefault() { @@ -152,6 +149,9 @@ Display.getDefault().asyncExec(new Runnable() { public void run() { try { + // If it's null, refresh the whole thing + if( provider2 == null ) { JBossServerView.this.jbViewer.refresh(); return; } + Object[] selected = JBossServerView.this.jbViewer.getExpandedElements(); JBossServerView.this.jbViewer.refresh(provider2); JBossServerView.this.jbViewer.setExpandedElements(selected); @@ -160,7 +160,6 @@ } } }); - } public void addListeners() { @@ -244,4 +243,9 @@ } + public JBossServerTableViewer getJbViewer() { + return jbViewer; + } + + } \ No newline at end of file |
From: Robert S. <ra...@gm...> - 2006-07-10 15:52:26
|
User: rawb Date: 06/07/10 11:52:23 Modified: as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders InactiveExtensionViewProvider.java PropertySheetFactory.java EventLogViewProvider.java ModuleViewProvider.java Log: Various changes to extensions. Added property sheets for several. Revision Changes Path 1.2 +27 -2 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/InactiveExtensionViewProvider.java (In the diff below, changes in quantity of whitespace are not shown.) Index: InactiveExtensionViewProvider.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/InactiveExtensionViewProvider.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- InactiveExtensionViewProvider.java 27 Jun 2006 21:34:36 -0000 1.1 +++ InactiveExtensionViewProvider.java 10 Jul 2006 15:52:23 -0000 1.2 @@ -23,15 +23,19 @@ import java.util.ArrayList; +import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.views.properties.IPropertySheetPage; +import org.jboss.ide.eclipse.as.core.util.ASDebug; import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin.ServerViewProvider; +import org.jboss.ide.eclipse.as.ui.views.JBossServerView; public class InactiveExtensionViewProvider extends JBossServerViewExtension { @@ -102,8 +106,29 @@ } public void fillContextMenu(Shell shell, IMenuManager menu, Object selection) { - // TODO Auto-generated method stub - + final Object selected = selection; + if( selection instanceof ServerViewProvider && selection != this.provider) { + Action act = new Action() { + public void run() { + Display.getDefault().asyncExec(new Runnable() { + public void run() { + if( selected instanceof ServerViewProvider) { + ((ServerViewProvider)selected).setEnabled(true); + ((ServerViewProvider)selected).getDelegate().getContentProvider(). + inputChanged(JBossServerView.getDefault().getJbViewer(), null, JBossServerView.getDefault().getSelectedServer()); + + try { + JBossServerView.getDefault().refreshJBTree(null); + } catch(Exception e) { + } + } + } + } ); + } + }; + act.setText("Re-Enable Category"); + menu.add(act); + } } public ITreeContentProvider getContentProvider() { 1.3 +45 -15 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/PropertySheetFactory.java (In the diff below, changes in quantity of whitespace are not shown.) Index: PropertySheetFactory.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/PropertySheetFactory.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- PropertySheetFactory.java 27 Jun 2006 21:34:36 -0000 1.2 +++ PropertySheetFactory.java 10 Jul 2006 15:52:23 -0000 1.3 @@ -58,15 +58,11 @@ * It has a tree-table and a text box and the two can be moved around. * @return */ - public static JBossServersViewPropertySheetPage createJBossServersPropertySheetPage() { - return new JBossServersViewPropertySheetPage(); + public static PropertiesTextSashPropertiesPage createPropertiesTextSashPropertiesPage() { + return new PropertiesTextSashPropertiesPage(); } - public static class JBossServersViewPropertySheetPage implements IPropertySheetPage { - private static final String TAG_SASHFORM_PROPERTIES = "sashformProperties"; - private static final String PROPERTIES_COLUMNS = "propertiesColumns"; - - + public static class PropertiesTextSashPropertiesPage implements IPropertySheetPage { protected TreeViewer propertiesViewer; protected SashForm propertiesForm; @@ -114,7 +110,7 @@ Composite c2 = new Composite(propertiesForm, SWT.NONE); c2.setLayout(new FillLayout()); - propertiesText = new Text(c2, SWT.BORDER); + propertiesText = new Text(c2, SWT.BORDER | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.WRAP); propertiesForm.setWeights(sashCols); } @@ -131,24 +127,58 @@ } public void setActionBars(IActionBars actionBars) { - // TODO Auto-generated method stub - } public void setFocus() { - // TODO Auto-generated method stub - } public void selectionChanged(IWorkbenchPart part, ISelection selection) { try { - ASDebug.p("Selection changed: " + selection, this); - ASDebug.p(" - first element: " + ((IStructuredSelection)selection).getFirstElement(), this); + propertiesViewer.setInput(((IStructuredSelection)selection).getFirstElement()); } catch( Exception e ) { - ASDebug.p("Exception e: " + e.getMessage(), this); } } + + public void showTextOnly() { + sashCols[0] = 0; + sashCols[1] = 100; + propertiesForm.setWeights(sashCols); + } + + public void showPropertiesOnly() { + sashCols[0] = 100; + sashCols[1] = 0; + propertiesForm.setWeights(sashCols); + } + + public void setSashWeights(int properties, int text) { + sashCols[0] = properties; + sashCols[1] = text; + propertiesForm.setWeights(sashCols); + } + + public void setSashWeights(int[] weights) { + sashCols = weights; + propertiesForm.setWeights(weights); + } + + public void setContentProvider(ITreeContentProvider provider) { + propertiesViewer.setContentProvider(provider); + } + + public void setLabelProvider(ITableLabelProvider provider) { + propertiesViewer.setLabelProvider(provider); + } + + + public Text getText() { + return propertiesText; + } + + public TreeViewer getViewer() { + return propertiesViewer; + } } 1.4 +263 -14 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/EventLogViewProvider.java (In the diff below, changes in quantity of whitespace are not shown.) Index: EventLogViewProvider.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/EventLogViewProvider.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- EventLogViewProvider.java 27 Jun 2006 21:34:36 -0000 1.3 +++ EventLogViewProvider.java 10 Jul 2006 15:52:23 -0000 1.4 @@ -24,33 +24,49 @@ import java.text.SimpleDateFormat; import java.util.Date; +import java.util.Set; import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.ISharedImages; +import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.views.properties.IPropertySheetPage; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerType; import org.eclipse.wst.server.ui.internal.provisional.UIDecoratorManager; import org.jboss.ide.eclipse.as.core.JBossServerCore; +import org.jboss.ide.eclipse.as.core.client.TwiddleLauncher.TwiddleLogEvent; import org.jboss.ide.eclipse.as.core.model.ServerProcessModel; +import org.jboss.ide.eclipse.as.core.model.ServerProcessLog.ExceptionLogEvent; import org.jboss.ide.eclipse.as.core.model.ServerProcessLog.ProcessLogEvent; import org.jboss.ide.eclipse.as.core.model.ServerProcessLog.ProcessLogEventRoot; +import org.jboss.ide.eclipse.as.core.model.ServerProcessModel.ConsoleLogEvent; import org.jboss.ide.eclipse.as.core.server.IServerLogListener; import org.jboss.ide.eclipse.as.core.server.JBossServer; +import org.jboss.ide.eclipse.as.core.server.JBossServerBehavior.PublishLogEvent; +import org.jboss.ide.eclipse.as.core.server.ServerStateChecker.StateCheckerLogEvent; +import org.jboss.ide.eclipse.as.core.util.ASDebug; import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin.ServerViewProvider; +import org.jboss.ide.eclipse.as.ui.viewproviders.PropertySheetFactory.PropertiesTextSashPropertiesPage; import org.jboss.ide.eclipse.as.ui.views.JBossServerView; +import org.jboss.ide.eclipse.as.ui.views.JBossServerTableViewer.ContentWrapper; public class EventLogViewProvider extends JBossServerViewExtension implements IServerLogListener { protected EventLogLabelProvider categoryLabelProvider; protected EventLogContentProvider categoryContentProvider; + protected PropertiesTextSashPropertiesPage propertiesSheet; public EventLogViewProvider() { categoryLabelProvider = new EventLogLabelProvider(); @@ -67,6 +83,7 @@ } public void fillContextMenu(Shell shell, IMenuManager menu, Object selection) { + ASDebug.p("Inside fill context menu, selection is " + selection, this); } public ITreeContentProvider getContentProvider() { @@ -79,10 +96,55 @@ protected class EventLogLabelProvider extends LabelProvider { public String getText(Object obj) { + + if( obj instanceof StateCheckerLogEvent) { + StateCheckerLogEvent event = (StateCheckerLogEvent)obj; + + if( event.getEventType() == StateCheckerLogEvent.BEFORE) { + boolean expected = event.getExpectedState(); + return (expected == true ? "Starting Server" : "Stopping Server"); + } + + if( event.getEventType() == StateCheckerLogEvent.AFTER ) { + boolean current = (event.getCurrentState() == StateCheckerLogEvent.SERVER_UP); + return current ? "Server is up." : "Server is down."; + } + + if( event.getEventType() == StateCheckerLogEvent.DURING) { + String ret = "Twiddle Launch: Server is "; + if( event.getCurrentState() == StateCheckerLogEvent.SERVER_STARTING ) ret += "still starting"; + if( event.getCurrentState() == StateCheckerLogEvent.SERVER_STOPPING ) ret += "still stopping"; + if( event.getCurrentState() == StateCheckerLogEvent.SERVER_UP ) ret += "up"; + if( event.getCurrentState() == StateCheckerLogEvent.SERVER_DOWN ) ret += "down"; + return ret; + } + } + + if( obj instanceof ConsoleLogEvent) { + return "Console Output"; + } + + if( obj instanceof PublishLogEvent ) { + PublishLogEvent publishEvent = ((PublishLogEvent)obj); + if( publishEvent.getEventType() == PublishLogEvent.ROOT) { + return "Publish Event"; + } + if( publishEvent.getEventType() == PublishLogEvent.PUBLISH) { + return "Publishing module to server: " + publishEvent.getModuleName(); + } + if( publishEvent.getEventType() == PublishLogEvent.UNPUBLISH) { + return "Removing module from server: " + publishEvent.getModuleName(); + } + return "Unknown Publish Event"; + } + if( obj instanceof ExceptionLogEvent ) { + ExceptionLogEvent event = ((ExceptionLogEvent)obj); + return event.getException().getLocalizedMessage(); + } if( obj instanceof ProcessLogEvent ) { ProcessLogEvent event = ((ProcessLogEvent)obj); SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd hh:mm:ss.S"); - return event.getText() + " " + format.format(new Date(event.getDate())); + return event.toString() + " " + format.format(new Date(event.getDate())); } return obj.toString(); } @@ -91,32 +153,51 @@ IServer server = event.getRoot().getServer(); IServerType serverType = server.getServerType(); - if( obj instanceof ProcessLogEvent ) { - if( event.getEventType() == ProcessLogEvent.SERVER_STARTING) { + if( obj instanceof StateCheckerLogEvent ) { + StateCheckerLogEvent scle = (StateCheckerLogEvent)obj; + if( scle.getEventType() == StateCheckerLogEvent.BEFORE) { + boolean expected = scle.getExpectedState(); + if( expected ) return getStateImage(serverType, IServer.STATE_STARTED, server.getMode()); + return getStateImage(serverType, IServer.STATE_STOPPED, server.getMode()); + } + + if( scle.getCurrentState() == StateCheckerLogEvent.SERVER_STARTING) { return getStateImage(serverType, IServer.STATE_STARTING, server.getMode()); } - if( event.getEventType() == ProcessLogEvent.SERVER_STOPPING) { + if( scle.getCurrentState() == StateCheckerLogEvent.SERVER_STOPPING) { return getStateImage(serverType, IServer.STATE_STOPPING, server.getMode()); } - if( event.getEventType() == ProcessLogEvent.SERVER_UP) { + if( scle.getCurrentState() == StateCheckerLogEvent.SERVER_UP) { return getStateImage(serverType, IServer.STATE_STARTED, server.getMode()); } - if( event.getEventType() == ProcessLogEvent.SERVER_DOWN) { + if( scle.getCurrentState() == StateCheckerLogEvent.SERVER_DOWN) { return getStateImage(serverType, IServer.STATE_STOPPED, server.getMode()); } - if( event.getEventType() == ProcessLogEvent.SERVER_CONSOLE) { + } + if( obj instanceof ConsoleLogEvent ) { return JBossServerUISharedImages.getImage(JBossServerUISharedImages.CONSOLE_IMAGE); } - if( event.getEventType() == ProcessLogEvent.TWIDDLE) { - return JBossServerUISharedImages.getImage(JBossServerUISharedImages.TWIDDLE_IMAGE); + if( obj instanceof PublishLogEvent) { + if( event.getEventType() == PublishLogEvent.ROOT) { + return JBossServerUISharedImages.getImage(JBossServerUISharedImages.PUBLISH_IMAGE); } - if( event.getEventType() == ProcessLogEvent.SERVER_PUBLISH) { + if( event.getEventType() == PublishLogEvent.PUBLISH) { return JBossServerUISharedImages.getImage(JBossServerUISharedImages.PUBLISH_IMAGE); } - if( event.getEventType() == ProcessLogEvent.SERVER_UNPUBLISH) { + if( event.getEventType() == PublishLogEvent.UNPUBLISH) { return JBossServerUISharedImages.getImage(JBossServerUISharedImages.UNPUBLISH_IMAGE); } } + if( obj instanceof ExceptionLogEvent ) { + return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK); + } + if( obj instanceof TwiddleLogEvent ) { + return JBossServerUISharedImages.getImage(JBossServerUISharedImages.TWIDDLE_IMAGE); + } + + + + return null; } @@ -176,7 +257,175 @@ public IPropertySheetPage getPropertySheetPage() { + if( propertiesSheet == null ) { + createPropertiesSheet(); + } + return propertiesSheet; + } + + protected void createPropertiesSheet() { + try { + propertiesSheet = new EventLogPropertiesSheetPage(); + } catch( Exception e ) { + e.printStackTrace(); + } + } + + protected class EventLogPropertiesProvider extends LabelProvider + implements ITableLabelProvider, ITreeContentProvider { + + public static final int SHOW_TEXT = 1; + public static final int SHOW_TREE = 2; + + public final static String STATECHECKER_PROPERTIES = "_STATECHECKER_PROPERTIES_"; + + + protected Object newInput; + + public int getContentType(Object selected) { + if( selected instanceof ConsoleLogEvent ) return SHOW_TEXT; + if( selected instanceof TwiddleLogEvent ) return SHOW_TREE; + if( selected instanceof StateCheckerLogEvent ) return SHOW_TREE; + return SHOW_TREE ; + } + + public String getTextContent(Object selected) { + if( selected instanceof ConsoleLogEvent ) return ((ConsoleLogEvent)selected).toString(); + if( selected instanceof StateCheckerLogEvent) return ((StateCheckerLogEvent)selected).getTwiddleLogEvent().getOut(); + return ""; + } + + public Object[] getChildren(Object parentElement) { + // top level elements for the input + if( newInput instanceof StateCheckerLogEvent ) + return getChildren_((StateCheckerLogEvent)newInput, parentElement); + + if( newInput instanceof PublishLogEvent ) { + if( newInput == parentElement ) { + Set s = ((PublishLogEvent)parentElement).getProperties().keySet(); + return (Object[]) s.toArray(new Object[s.size()]); + } + + + PublishLogEvent pubEvent = (PublishLogEvent)newInput; + } + + return new Object[0]; + } + + protected Object[] getChildren_(StateCheckerLogEvent input, Object parent) { + if( input == parent ) return input.getAvailableProperties(); + + return new Object[] { }; + } + + protected String getColumnText_(StateCheckerLogEvent input, Object element, int columnIndex) { + try { + if( columnIndex == 0 ) return element.toString(); + if( columnIndex == 1 ) return input.getProperty(element).toString(); + } catch( Exception e) {} + return ""; + } + + + public String getColumnText(Object element, int columnIndex) { + if( newInput instanceof StateCheckerLogEvent) return getColumnText_((StateCheckerLogEvent)newInput, element, columnIndex); + + if( newInput instanceof PublishLogEvent ) { + + try { + if( columnIndex == 0 ) return element.toString(); + if( columnIndex == 1 ) return ((ProcessLogEvent)newInput).getProperty(element).toString(); + } catch( Exception e) {} + return ""; + } + + return element.toString(); + } + + + + public Object getParent(Object element) { + return null; + } + + public boolean hasChildren(Object element) { + return getChildren(element).length > 0 ? true : false; + } + + public Object[] getElements(Object inputElement) { + return getChildren(inputElement); + } + + public void dispose() { + // TODO Auto-generated method stub + + } + + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + this.newInput = newInput; + } + + + public Image getColumnImage(Object element, int columnIndex) { return null; } + + + } + + public class Pair { + public Object fFirst = null; + public Object fSecond = null; + public Pair(Object first, Object second) { + fFirst = first; + fSecond = second; + } + } + + protected class EventLogPropertiesSheetPage extends PropertiesTextSashPropertiesPage { + + + public void createControl(Composite parent) { + super.createControl(parent); + EventLogPropertiesProvider p = new EventLogPropertiesProvider(); + setContentProvider(p); + setLabelProvider(p); + } + + public void selectionChanged(IWorkbenchPart part, ISelection selection) { + if( selection instanceof IStructuredSelection ) { + Object selectedElement = ((IStructuredSelection)selection).getFirstElement(); + if( selectedElement instanceof ContentWrapper) { + selectedElement = ((ContentWrapper)selectedElement).getElement(); + } + + int type = getContentProvider().getContentType(selectedElement); + + // weight + if( type == (EventLogPropertiesProvider.SHOW_TEXT | + EventLogPropertiesProvider.SHOW_TREE )) { + + setSashWeights(new int[] {50, 50}); + getText().setText(getContentProvider().getTextContent(selectedElement)); + this.propertiesViewer.setInput(selectedElement); + + } else if( type == EventLogPropertiesProvider.SHOW_TEXT) { + showTextOnly(); + getText().setText(getContentProvider().getTextContent(selectedElement)); + + } else if( type == EventLogPropertiesProvider.SHOW_TREE ) { + showPropertiesOnly(); + this.propertiesViewer.setInput(selectedElement); + } + + } + } + + public EventLogPropertiesProvider getContentProvider() { + return ((EventLogPropertiesProvider)propertiesViewer.getContentProvider()); + } + } + } 1.5 +2 -2 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/ModuleViewProvider.java (In the diff below, changes in quantity of whitespace are not shown.) Index: ModuleViewProvider.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/ModuleViewProvider.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- ModuleViewProvider.java 27 Jun 2006 21:34:36 -0000 1.4 +++ ModuleViewProvider.java 10 Jul 2006 15:52:23 -0000 1.5 @@ -196,9 +196,9 @@ JBossServer server = (JBossServer)obj; String ret = server.getServer().getName(); ret += " ("; - String home = server.getRuntimeConfiguration().getServerHome(); + String home = server.getAttributeHelper().getServerHome(); ret += (home.length() > 30 ? home.substring(0,30) + "..." : home); - ret += ", " + server.getRuntimeConfiguration().getJbossConfiguration() + ")"; + ret += ", " + server.getAttributeHelper().getJbossConfiguration() + ")"; return ret; } return null; |
From: Robert S. <ra...@gm...> - 2006-07-10 15:51:57
|
User: rawb Date: 06/07/10 11:51:55 Modified: as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/config JBossLaunchConfigurationTabGroup.java Log: Uses attribute helper now Revision Changes Path 1.4 +11 -5 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/config/JBossLaunchConfigurationTabGroup.java (In the diff below, changes in quantity of whitespace are not shown.) Index: JBossLaunchConfigurationTabGroup.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/config/JBossLaunchConfigurationTabGroup.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- JBossLaunchConfigurationTabGroup.java 2 Jun 2006 16:52:31 -0000 1.3 +++ JBossLaunchConfigurationTabGroup.java 10 Jul 2006 15:51:55 -0000 1.4 @@ -35,7 +35,7 @@ import org.eclipse.wst.server.core.ServerUtil; import org.jboss.ide.eclipse.as.core.server.JBossServer; import org.jboss.ide.eclipse.as.core.server.JBossServerBehavior; -import org.jboss.ide.eclipse.as.core.server.runtime.JBossRuntimeConfiguration; +import org.jboss.ide.eclipse.as.core.server.ServerAttributeHelper; import org.jboss.ide.eclipse.as.core.server.runtime.JBossServerRuntime; import org.jboss.ide.eclipse.as.core.util.RuntimeConfigUtil; @@ -47,7 +47,6 @@ private JBossServer jbServer; private JBossServerBehavior jbServerBehavior; private JBossServerRuntime jbRuntime; - private JBossRuntimeConfiguration jbRtConfig; private ILaunchConfiguration launchConfiguration; private ILaunchConfigurationWorkingCopy launchWC; @@ -147,9 +146,16 @@ } jbServerBehavior = (JBossServerBehavior) server.getAdapter(JBossServerBehavior.class); jbRuntime = jbServer.getJBossRuntime(); - jbRtConfig = jbServer.getRuntimeConfiguration(); - jbRtConfig.updateConfiguration(configuration); + + String progArgs = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, ""); + String vmArgs = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, ""); + + ServerAttributeHelper helper = jbServer.getAttributeHelper(); + helper.setProgramArgs(progArgs); + helper.setVMArgs(vmArgs); + helper.save(); + } catch( CoreException ce ) { } |
From: Robert S. <ra...@gm...> - 2006-07-10 15:51:27
|
User: rawb Date: 06/07/10 11:51:25 Modified: as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui JBossServerUIPlugin.java Log: Preferences added to enable / disable categoriess Revision Changes Path 1.10 +10 -4 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java (In the diff below, changes in quantity of whitespace are not shown.) Index: JBossServerUIPlugin.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- JBossServerUIPlugin.java 27 Jun 2006 21:34:36 -0000 1.9 +++ JBossServerUIPlugin.java 10 Jul 2006 15:51:25 -0000 1.10 @@ -35,6 +35,7 @@ import org.eclipse.ui.IStartup; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.jboss.ide.eclipse.as.core.JBossServerCore; +import org.jboss.ide.eclipse.as.core.util.ASDebug; import org.jboss.ide.eclipse.as.ui.viewproviders.JBossServerViewExtension; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -139,6 +140,7 @@ Preferences prefs = JBossServerUIPlugin.getDefault().getPluginPreferences(); String key = EXTENSION_ENABLED + getId(); enabled = prefs.contains(key) ? prefs.getBoolean(key) : false; + ASDebug.p("id " + key + " is " + prefs.getBoolean(key), this); Bundle pluginBundle = JBossServerUIPlugin.getDefault().getBundle(); try { @@ -206,9 +208,13 @@ if( icon != null ) icon.dispose(); -// Preferences prefs = JBossServerUIPlugin.getDefault().getPluginPreferences(); -// String key = EXTENSION_ENABLED + getId(); -// prefs.setValue(key, enabled); + Preferences prefs = JBossServerUIPlugin.getDefault().getPluginPreferences(); + String key = EXTENSION_ENABLED + getId(); + prefs.setValue(key, enabled); + + enabled = prefs.contains(key) ? prefs.getBoolean(key) : false; + ASDebug.p("id " + key + " is " + prefs.getBoolean(key), this); + } } @@ -241,7 +247,7 @@ serverViewExtensions = new ServerViewProvider[elements.length]; for( int i = 0; i < elements.length; i++ ) { serverViewExtensions[i] = new ServerViewProvider(elements[i]); - serverViewExtensions[i].setEnabled(true); + //serverViewExtensions[i].setEnabled(true); } } |
From: Robert S. <ra...@gm...> - 2006-07-10 15:50:50
|
User: rawb Date: 06/07/10 11:50:49 Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/runtime AbstractServerRuntimeDelegate.java Log: Uses attribute helper now Revision Changes Path 1.3 +11 -11 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/runtime/AbstractServerRuntimeDelegate.java (In the diff below, changes in quantity of whitespace are not shown.) Index: AbstractServerRuntimeDelegate.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/runtime/AbstractServerRuntimeDelegate.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- AbstractServerRuntimeDelegate.java 2 Jun 2006 16:47:56 -0000 1.2 +++ AbstractServerRuntimeDelegate.java 10 Jul 2006 15:50:49 -0000 1.3 @@ -73,8 +73,8 @@ public abstract String getId(); public String getStartArgs(JBossServer server) { - return "--configuration=" + server.getRuntimeConfiguration().getJbossConfiguration() + - " --host=" + server.getRuntimeConfiguration().getHost(); + return "--configuration=" + server.getAttributeHelper().getJbossConfiguration() + + " --host=" + server.getServer().getHost(); } public String getStopArgs(JBossServer server) { return defaultShutdownArgs; @@ -87,25 +87,25 @@ - public String getStartMainType(JBossServer server) { + public String getStartMainType() { return startMainType; } - public String getStopMainType(JBossServer server) { + public String getStopMainType() { return stopMainType; } - public String getTwiddleMainType(JBossServer server) { + public String getTwiddleMainType() { return twiddleMainType; } public String getStartJar(JBossServer server) { - return server.getRuntimeConfiguration().getServerHome() + File.separator + runJar; + return server.getAttributeHelper().getServerHome() + File.separator + runJar; } public String getShutdownJar(JBossServer server) { - return server.getRuntimeConfiguration().getServerHome() + File.separator + shutdownJar; + return server.getAttributeHelper().getServerHome() + File.separator + shutdownJar; } public String getTwiddleJar(JBossServer server) { - return server.getRuntimeConfiguration().getServerHome() + File.separator + twiddleJar; + return server.getAttributeHelper().getServerHome() + File.separator + twiddleJar; } public List getRuntimeClasspath(JBossServer server) { @@ -127,7 +127,7 @@ */ public List getRuntimeClasspath(JBossServer server, int action) { - String serverHome = server.getRuntimeConfiguration().getServerHome(); + String serverHome = server.getAttributeHelper().getServerHome(); ArrayList classpath = new ArrayList(); if( action == IJBossServerRuntimeDelegate.ACTION_START) { @@ -136,12 +136,12 @@ classpath.add(JavaRuntime.newArchiveRuntimeClasspathEntry(new Path(getShutdownJar(server)))); } else if( action == IJBossServerRuntimeDelegate.ACTION_TWIDDLE ) { - // Twiddle requires more classes and I'm too lazy to actually figure out which ones it needs. + // Twiddle requires more classes and I'm too lazy to actually figure OUT which ones it needs. classpath.add(JavaRuntime.newArchiveRuntimeClasspathEntry(new Path(getTwiddleJar(server)))); addDirectory (serverHome, classpath, "lib"); addDirectory (serverHome, classpath, "lib" + File.separator + "endorsed"); addDirectory (serverHome, classpath, "client"); - addDirectory (server.getRuntimeConfiguration().getConfigurationPath(), classpath, "lib"); + addDirectory (server.getAttributeHelper().getConfigurationPath(), classpath, "lib"); } ArrayList runtimeClassPaths = convertClasspath(classpath, runtime.getVM()); |
From: Robert S. <ra...@gm...> - 2006-07-10 15:49:53
|
User: rawb Date: 06/07/10 11:49:49 Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/publishers PackagedPublisher.java JstPublisher.java Log: Better logging to the publishers Revision Changes Path 1.3 +32 -17 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/publishers/PackagedPublisher.java (In the diff below, changes in quantity of whitespace are not shown.) Index: PackagedPublisher.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/publishers/PackagedPublisher.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- PackagedPublisher.java 9 Jun 2006 20:02:00 -0000 1.2 +++ PackagedPublisher.java 10 Jul 2006 15:49:49 -0000 1.3 @@ -25,6 +25,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.jst.server.tomcat.core.internal.FileUtil; import org.eclipse.wst.server.core.IModule; @@ -33,10 +34,12 @@ import org.eclipse.wst.server.core.model.ServerBehaviourDelegate; import org.jboss.ide.eclipse.as.core.model.ModuleModel; import org.jboss.ide.eclipse.as.core.model.ServerProcessLog; +import org.jboss.ide.eclipse.as.core.model.ServerProcessLog.ExceptionLogEvent; import org.jboss.ide.eclipse.as.core.model.ServerProcessLog.ProcessLogEvent; import org.jboss.ide.eclipse.as.core.module.factory.JBossModuleDelegate; import org.jboss.ide.eclipse.as.core.server.JBossServer; import org.jboss.ide.eclipse.as.core.server.JBossServerBehavior; +import org.jboss.ide.eclipse.as.core.server.JBossServerBehavior.PublishLogEvent; import org.jboss.ide.eclipse.as.core.util.ASDebug; public class PackagedPublisher implements IJbossServerPublisher { @@ -46,10 +49,15 @@ private JBossServerBehavior behavior; private int publishState; + public static final String TARGET_FILENAME = "_TARGET_FILENAME_"; + public static final String SOURCE_FILENAME = "_SOURCE_FILENAME_"; + public static final String DEST_FILENAME = "_DEST_FILENAME_"; + + public PackagedPublisher(JBossServer server, JBossServerBehavior behavior) { this.server = server; this.behavior = behavior; - this.log = new ServerProcessLog.ProcessLogEvent("Parent", ProcessLogEvent.UNKNOWN); + this.log = new ServerProcessLog.ProcessLogEvent(ProcessLogEvent.UNKNOWN); publishState = IServer.PUBLISH_STATE_UNKNOWN; } @@ -121,9 +129,13 @@ Object o; JBossModuleDelegate delegate; + PublishLogEvent event = new PublishLogEvent(PublishLogEvent.UNPUBLISH); + log.addChild(event); + + for( int i = 0; i < module.length; i++ ) { // delete this module - String deployDirectory = server.getRuntimeConfiguration().getDeployDirectory(); + String deployDirectory = server.getAttributeHelper().getDeployDirectory(); o = module[i].getAdapter(JBossModuleDelegate.class); if( o == null ) { o = module[i].loadAdapter(JBossModuleDelegate.class, null); @@ -136,20 +148,19 @@ ASDebug.p("Deleting fine from server: " + dest, this); try { Path destName = new Path(dest); - String config = server.getRuntimeConfiguration().getJbossConfiguration(); + String config = server.getAttributeHelper().getJbossConfiguration(); - log.addChild("Removing " + destName.lastSegment() + " from the " + - config + "/deploy directory", ProcessLogEvent.SERVER_UNPUBLISH ); + File destFile = new File(dest); + event.setProperty(PublishLogEvent.MODULE_NAME, destName.lastSegment()); + event.setProperty(TARGET_FILENAME, destFile.getAbsolutePath()); - File destFile = new File(dest); destFile.delete(); // tell the model you're aware of the change - ModuleModel.getDefault().getDeltaModel().setDeltaSeen(module[i], server.getServer().getId()); + //ModuleModel.getDefault().getDeltaModel().setDeltaSeen(module[i], server.getServer().getId()); } catch( Exception e ) { - ASDebug.p("ERROR in unpublish", this); - e.printStackTrace(); + event.addChild(new ExceptionLogEvent(e)); } } publishState = IServer.PUBLISH_STATE_NONE; @@ -160,7 +171,10 @@ JBossModuleDelegate delegate = null; Object o = null; - String deployDirectory = server.getRuntimeConfiguration().getDeployDirectory(); + String deployDirectory = server.getAttributeHelper().getDeployDirectory(); + + PublishLogEvent event = new PublishLogEvent(PublishLogEvent.PUBLISH); + log.addChild(event); // Ignore anything that's not a jbossmodule for( int i = 0; i < module.length; i++ ) { @@ -176,18 +190,19 @@ String dest = new Path(deployDirectory).append(delegate.getResourceName()).toOSString(); Path srcName = new Path(src); - String config = server.getRuntimeConfiguration().getJbossConfiguration(); + String config = server.getAttributeHelper().getJbossConfiguration(); - log.addChild("Copying " + srcName.lastSegment() + " to the " + - config + "/deploy directory", ProcessLogEvent.SERVER_PUBLISH ); + event.setProperty(PublishLogEvent.MODULE_NAME, srcName.lastSegment()); + event.setProperty(SOURCE_FILENAME, srcName); + event.setProperty(DEST_FILENAME, dest); - FileUtil.copyFile(src, dest); + IStatus status = FileUtil.copyFile(src, dest); + if( status.getSeverity() == IStatus.ERROR ) + event.addChild(new ExceptionLogEvent(status.getException())); // tell everyone we need no more changes right now ModuleModel.getDefault().getDeltaModel().setDeltaSeen(module[i], server.getServer().getId()); - - ASDebug.p("publishing module: " + module[i].getId(), this); } publishState = IServer.PUBLISH_STATE_NONE; } 1.4 +28 -11 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/publishers/JstPublisher.java (In the diff below, changes in quantity of whitespace are not shown.) Index: JstPublisher.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/publishers/JstPublisher.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- JstPublisher.java 12 Jun 2006 01:15:59 -0000 1.3 +++ JstPublisher.java 10 Jul 2006 15:49:49 -0000 1.4 @@ -43,7 +43,6 @@ import org.eclipse.jst.server.core.IEnterpriseApplication; import org.eclipse.jst.server.core.IWebModule; import org.eclipse.jst.server.core.PublishUtil; -import org.eclipse.jst.server.core.internal.JavaServerPlugin; import org.eclipse.jst.server.generic.core.internal.publishers.AbstractModuleAssembler; import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants; import org.eclipse.wst.server.core.IModule; @@ -54,9 +53,11 @@ import org.eclipse.wst.server.core.model.ServerBehaviourDelegate; import org.eclipse.wst.server.core.util.ProjectModule; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.model.ModuleModel; import org.jboss.ide.eclipse.as.core.model.ServerProcessLog; import org.jboss.ide.eclipse.as.core.model.ServerProcessLog.ProcessLogEvent; import org.jboss.ide.eclipse.as.core.server.JBossServer; +import org.jboss.ide.eclipse.as.core.server.JBossServerBehavior.PublishLogEvent; import org.jboss.ide.eclipse.as.core.util.ASDebug; import org.osgi.framework.Bundle; @@ -67,17 +68,26 @@ public static final int BUILD_AND_PUBLISH = 3; public static final int UNDEPLOY = 4; + public static final String BUILD_PROPERTIES = "_BUILD_PROPERTIES_"; + public static final String BUILD_FILE = "_BUILD_FILE_"; + public static final String ANT_TARGETS = "_ANT_TARGETS_"; + public static final String MODULE_TYPE = "_MODULE_TYPE_"; + private int state; private JBossServer server; private ProcessLogEvent log; + private PublishLogEvent event; + public JstPublisher(JBossServer server) { this.server = server; state = IServer.PUBLISH_STATE_UNKNOWN; - this.log = new ServerProcessLog.ProcessLogEvent("Parent", ProcessLogEvent.UNKNOWN); + this.log = new ServerProcessLog.ProcessLogEvent(ProcessLogEvent.UNKNOWN); } public void publishModule(int kind, int deltaKind, IModule[] module, IProgressMonitor monitor) throws CoreException { + // delta = [no_change, added, changed, removed] = [0,1,2,3] + // kind = [incremental, full, auto, clean] = [1,2,3,4] ASDebug.p("Publishing with kind,deltakind = " + kind + "," + deltaKind, this); checkClosed(module); if(ServerBehaviourDelegate.REMOVED == deltaKind){ @@ -89,6 +99,7 @@ JBossAntPublisher publisher = new JBossAntPublisher(); publisher.initialize(module,server); publisher.publish(monitor); + ModuleModel.getDefault().getDeltaModel().setDeltaSeen(module[0], server.getServer().getId()); } } @@ -134,6 +145,10 @@ assembleType = OTHER; } + event = new PublishLogEvent(PublishLogEvent.PUBLISH); + event.setProperty(PublishLogEvent.MODULE_NAME, module[0].getName()); + log.addChild(event); + event.setProperty(MODULE_TYPE, module[0].getModuleType().getId()); } } @@ -145,16 +160,19 @@ public IStatus[] publish(IProgressMonitor monitor) throws CoreException { - log.addChild("Build and Publish JST module: " + module[0].getName(), ProcessLogEvent.SERVER_PUBLISH); assemble(monitor); String file = computeBuildFile(); runAnt(file, BUILD_AND_PUBLISH, monitor); state = IServer.PUBLISH_STATE_NONE; + + return null; } public IStatus[] unpublish(IProgressMonitor monitor) throws CoreException { - log.addChild("Undeploy JST module: " + module[0].getName(), ProcessLogEvent.SERVER_UNPUBLISH); + event = new PublishLogEvent(PublishLogEvent.UNPUBLISH); + event.setProperty(PublishLogEvent.MODULE_NAME, module[0].getName()); + log.addChild(event); String file = computeBuildFile(); runAnt(file, UNDEPLOY, monitor); return null; @@ -169,14 +187,12 @@ props.put("project.working.dir", getProjectWorkingLocation().toString()); props.put("module.name", module[0].getName()); props.put("module.dir", getModuleWorkingDir().toString()); - props.put("server.publish.dir", jbServer.getRuntimeConfiguration().getDeployDirectory()); + props.put("server.publish.dir", jbServer.getAttributeHelper().getDeployDirectory()); + -// String args = getArguments(module[0]); -// AntRunner runner = new AntRunner(); -// runner.setBuildFileLocation(file); -// runner.setExecutionTargets(targets); -// runner.setArguments(args); -// runner.run(); + // Log + event.setProperty(ANT_TARGETS, targets); + event.setProperty(BUILD_PROPERTIES, props); ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); @@ -243,6 +259,7 @@ Bundle pluginBundle = JBossServerCorePlugin.getDefault().getBundle(); try { URL url = FileLocator.resolve(pluginBundle.getEntry("/META-INF/jboss.publish.xml")); + event.setProperty(BUILD_FILE, url.toString()); return url.getFile(); } catch( Exception e ) { } |
From: Robert S. <ra...@gm...> - 2006-07-10 15:46:27
|
User: rawb Date: 06/07/10 11:46:18 Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server JBossServerBehavior.java JBossServer.java ServerStateChecker.java Added: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server ServerAttributeHelper.java Log: Changed logging in the state checker. Added an attribute helper for the server and now use their properties instead of saving to a file. Some changes to publishing and ensuring any exceptions are kept in the log. Revision Changes Path 1.5 +52 -22 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerBehavior.java (In the diff below, changes in quantity of whitespace are not shown.) Index: JBossServerBehavior.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerBehavior.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- JBossServerBehavior.java 19 Jun 2006 14:16:50 -0000 1.4 +++ JBossServerBehavior.java 10 Jul 2006 15:46:18 -0000 1.5 @@ -40,6 +40,7 @@ import org.eclipse.wst.server.core.internal.ServerPlugin; import org.eclipse.wst.server.core.model.IModuleResourceDelta; import org.eclipse.wst.server.core.model.ServerBehaviourDelegate; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.model.ModuleModel; import org.jboss.ide.eclipse.as.core.model.ServerProcessModel; import org.jboss.ide.eclipse.as.core.model.ServerProcessLog.ProcessLogEvent; @@ -50,7 +51,6 @@ import org.jboss.ide.eclipse.as.core.server.publishers.PackagedPublisher; import org.jboss.ide.eclipse.as.core.server.runtime.AbstractServerRuntimeDelegate; import org.jboss.ide.eclipse.as.core.server.runtime.IJBossServerRuntimeDelegate; -import org.jboss.ide.eclipse.as.core.server.runtime.JBossRuntimeConfiguration; import org.jboss.ide.eclipse.as.core.server.runtime.JBossServerRuntime; import org.jboss.ide.eclipse.as.core.util.ASDebug; @@ -62,6 +62,7 @@ private JBossServer jbServer = null; private ProcessLogEvent log = null; + private ServerStateChecker checker = null; @@ -136,18 +137,21 @@ String args = runtimeDelegate.getStopArgs(jbServer); wc.setAttribute(ATTR_ACTION, ACTION_STOPPING); + ServerAttributeHelper helper = getJBossServer().getAttributeHelper(); + + // Set our attributes from our runtime configuration wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, cp); wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, - getJBossServer().getRuntimeConfiguration().getServerHome()); + helper.getServerHome()); wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, args); wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, - getJBossServer().getRuntimeConfiguration().getVMArgs()); - wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, runtimeDelegate.getStopMainType(jbServer)); + helper.getVMArgs()); + wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, runtimeDelegate.getStopMainType()); wc.launch(ILaunchManager.RUN_MODE, new NullProgressMonitor()); - int maxWait = 30000; + int maxWait = JBossServerCorePlugin.getDefault().getPreferenceHelper().getStopTimeout(jbServer); int soFar = 0; // waiting for our stop process to be created @@ -175,7 +179,7 @@ if( soFar >= maxWait ) { - // we timed out... even our stop thread didn't finish yet + // we timed OUT... even our stop thread didn't finish yet // time to manually terminate EVERYTHING forceStop(); return; @@ -236,22 +240,23 @@ public void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy workingCopy, IProgressMonitor monitor) throws CoreException { JBossServerRuntime runtime = getJBossServer().getJBossRuntime(); AbstractServerRuntimeDelegate runtimeDelegate = runtime.getVersionDelegate(); - JBossRuntimeConfiguration configuration = getJBossServer().getRuntimeConfiguration(); + + ServerAttributeHelper helper = getJBossServer().getAttributeHelper(); String action = workingCopy.getAttribute(ATTR_ACTION, ACTION_STARTING); if( action.equals(ACTION_STARTING)) { try { List classpath = runtimeDelegate.getRuntimeClasspath(getJBossServer(), IJBossServerRuntimeDelegate.ACTION_START); workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, - getJBossServer().getRuntimeConfiguration().getServerHome()); - workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, configuration.getStartArgs()); - workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, configuration.getVMArgs()); - workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, configuration.getStartMainType()); + helper.getServerHome()); + workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, helper.getStartArgs()); + workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, helper.getVMArgs()); + workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, helper.getStartMainType()); workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false); workingCopy.setAttribute( IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, - configuration.getServerHome() + Path.SEPARATOR + "bin"); + helper.getServerHome() + Path.SEPARATOR + "bin"); @@ -271,9 +276,11 @@ */ public void serverStarting() { setServerStarting(); - - ServerStateChecker t = new ServerStateChecker(this, ServerStateChecker.UP); - t.start(); + if( checker != null ) { + checker.cancel(); + } + checker = new ServerStateChecker(this, ServerStateChecker.UP); + checker.start(); } /** @@ -283,9 +290,12 @@ */ public void serverStopping() { setServerStopping(); + if( checker != null ) { + checker.cancel(); + } - ServerStateChecker t = new ServerStateChecker(this, ServerStateChecker.DOWN); - t.start(); + checker = new ServerStateChecker(this, ServerStateChecker.DOWN); + checker.start(); } @@ -314,11 +324,11 @@ */ public void setServerState(boolean waitingFor, boolean serverUp) { if( !serverUp ) { - /* Fail safe... if the server times out but it IS starting + /* Fail safe... if the server times OUT but it IS starting * but not quick enough, clear / destroy all generated processes. * * Otherwise, there are start processes but the gui has 'stop' greyed - * out and unavailable for selection. + * OUT and unavailable for selection. * * Included inside if statement so it doesn't prematurely * shut down the server while it's in the process of shutting down. @@ -348,6 +358,7 @@ */ public IModuleResourceDelta[] getPublishedResourceDelta(IModule[] module) { // if my model has any reference to them, use that. + ASDebug.p("Test", this); ModuleModel model = ModuleModel.getDefault(); IModuleResourceDelta[] deltas = model.getDeltaModel().getRecentDeltas(module, getServer()); if( deltas.length != 0 ) @@ -361,7 +372,7 @@ if( module.length == 0 ) return; IJbossServerPublisher publisher; - + ASDebug.p("Module type is " + module[0].getModuleType().getId(), this); /** * If our modules are already packaged as ejb jars, wars, aop files, * then go ahead and publish @@ -379,7 +390,25 @@ } + public static class PublishLogEvent extends ProcessLogEvent { + public static final int ROOT = 0; + public static final int PUBLISH = 1; + public static final int UNPUBLISH = 2; + public static final String MODULE_NAME = "_MODULE_NAME_"; + + public PublishLogEvent(int type) { + super(type); + } + + public String getModuleName() { + try { + return (String)getProperty(MODULE_NAME); + } catch( Exception e ) {} + return null; + } + + } /** @@ -387,7 +416,8 @@ */ protected void publishStart(IProgressMonitor monitor) throws CoreException { ServerProcessModelEntity e = ServerProcessModel.getDefault().getModel(getServer().getId()); - log = e.getEventLog().newMajorEvent("Publish Event", ProcessLogEvent.SERVER_PUBLISH); + log = new PublishLogEvent(PublishLogEvent.ROOT); + e.getEventLog().newMajorEvent(log); } /** 1.7 +10 -15 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServer.java (In the diff below, changes in quantity of whitespace are not shown.) Index: JBossServer.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServer.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- JBossServer.java 24 Jun 2006 01:20:52 -0000 1.6 +++ JBossServer.java 10 Jul 2006 15:46:18 -0000 1.7 @@ -27,16 +27,14 @@ import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.IServerWorkingCopy; import org.eclipse.wst.server.core.ServerPort; import org.eclipse.wst.server.core.internal.PublishServerJob; -import org.eclipse.wst.server.core.internal.Server; -import org.eclipse.wst.server.core.model.ServerBehaviourDelegate; import org.eclipse.wst.server.core.model.ServerDelegate; import org.jboss.ide.eclipse.as.core.model.DescriptorModel; import org.jboss.ide.eclipse.as.core.model.ServerProcessModel; import org.jboss.ide.eclipse.as.core.model.DescriptorModel.ServerDescriptorModel; import org.jboss.ide.eclipse.as.core.model.ServerProcessModel.ServerProcessModelEntity; -import org.jboss.ide.eclipse.as.core.server.runtime.JBossRuntimeConfiguration; import org.jboss.ide.eclipse.as.core.server.runtime.JBossServerRuntime; import org.jboss.ide.eclipse.as.core.util.ASDebug; @@ -44,11 +42,9 @@ private JBossServerRuntime runtime; - private JBossRuntimeConfiguration rtConfig; public JBossServer() { - rtConfig = new JBossRuntimeConfiguration(this); } @@ -75,7 +71,7 @@ public void saveConfiguration(IProgressMonitor monitor) throws CoreException { debug("saveConfiguration"); - rtConfig.save(); + //rtConfig.save(); // Re-publish in case the configuration change has not been published yet. PublishServerJob publishJob = new PublishServerJob(getServer(), IServer.PUBLISH_INCREMENTAL, false); publishJob.schedule(); @@ -83,7 +79,7 @@ public void configurationChanged() { debug("configurationChanged"); - rtConfig.save(); + //rtConfig.save(); } @@ -103,14 +99,13 @@ } - public JBossRuntimeConfiguration getRuntimeConfiguration() { - return rtConfig; + public ServerAttributeHelper getAttributeHelper() { + IServerWorkingCopy copy = getServerWorkingCopy(); + if( copy == null ) { + copy = getServer().createWorkingCopy(); + } + return new ServerAttributeHelper(this, copy); } - - - - - /* 1.6 +130 -30 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerStateChecker.java (In the diff below, changes in quantity of whitespace are not shown.) Index: ServerStateChecker.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerStateChecker.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- ServerStateChecker.java 19 Jun 2006 14:16:50 -0000 1.5 +++ ServerStateChecker.java 10 Jul 2006 15:46:18 -0000 1.6 @@ -21,14 +21,16 @@ */ package org.jboss.ide.eclipse.as.core.server; +import org.eclipse.ant.internal.ui.preferences.AddPropertyDialog; import org.eclipse.debug.core.model.IProcess; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.client.TwiddleLauncher; import org.jboss.ide.eclipse.as.core.client.TwiddleLauncher.TwiddleLogEvent; import org.jboss.ide.eclipse.as.core.model.ServerProcessModel; -import org.jboss.ide.eclipse.as.core.model.ServerProcessLog.IProcessLogVisitor; import org.jboss.ide.eclipse.as.core.model.ServerProcessLog.ProcessLogEvent; import org.jboss.ide.eclipse.as.core.model.ServerProcessModel.ProcessData; import org.jboss.ide.eclipse.as.core.model.ServerProcessModel.ServerProcessModelEntity; +import org.jboss.ide.eclipse.as.core.util.ASDebug; public class ServerStateChecker extends Thread implements IServerProcessListener { @@ -42,7 +44,7 @@ - private static int max = 120000; + private static int max; private static int delay = 1000; private int current = 0; @@ -51,36 +53,45 @@ private ProcessData[] processDatas = new ProcessData[0]; private JBossServerBehavior behavior; + private JBossServer jbServer; private ProcessLogEvent eventLog; private ServerProcessModelEntity ent; + private boolean canceled = false; public ServerStateChecker(JBossServerBehavior behavior, boolean expectedState) { this.behavior = behavior; this.expectedState = expectedState; + jbServer = (JBossServer)behavior.getServer().loadAdapter(JBossServer.class, null); + + // load our timeouts + if( expectedState ) { + max = JBossServerCorePlugin.getDefault().getPreferenceHelper().getStartTimeout(jbServer); + } else { + max = JBossServerCorePlugin.getDefault().getPreferenceHelper().getStopTimeout(jbServer); + } + } + + public void cancel() { + canceled = true; } public void run() { - JBossServer jbServer = (JBossServer)behavior.getServer().loadAdapter(JBossServer.class, null); int jndiPort = jbServer.getDescriptorModel().getJNDIPort(); - String host = jbServer.getRuntimeConfiguration().getHost(); + String host = jbServer.getServer().getHost(); String args = "-s " + host + ":" + jndiPort + " -a jmx/rmi/RMIAdaptor " + "get \"jboss.system:type=Server\" Started"; ent = ServerProcessModel.getDefault().getModel(jbServer.getServer().getId()); - - - // To be sent to the log - int logEventType = expectedState ? ProcessLogEvent.SERVER_STARTING : ProcessLogEvent.SERVER_STOPPING; - String action = (expectedState ? "Starting Server" : "Stopping Server"); - - eventLog = ent.getEventLog().newMajorEvent(action, logEventType); + eventLog = new StateCheckerLogEvent(expectedState); + ent.getEventLog().newMajorEvent(eventLog); ent.addSPListener(this); boolean twiddleResults = !expectedState; - while( current < max && twiddleResults != expectedState ) { + while( current < max && twiddleResults != expectedState && !canceled) { + int res = getTwiddleResults(ent, jbServer, args); if( res == STATE_TRUE ) { twiddleResults = UP; @@ -94,13 +105,15 @@ //System.out.println("Results at time " + current + ": " + twiddleResults); } - int state = twiddleResults == UP ? ProcessLogEvent.SERVER_UP : ProcessLogEvent.SERVER_DOWN; - boolean success = (expectedState && twiddleResults == UP) || (!expectedState && twiddleResults == DOWN); - String text = "Server " + (success ? "is now " : "failed to ") - + (expectedState ? "started " : "shut down"); - eventLog.addChild(text, state, ProcessLogEvent.ADD_END); - + if( canceled ) { + dieCanceled(); + return; + } + boolean success = (expectedState && twiddleResults == UP) || (!expectedState && twiddleResults == DOWN); + StateCheckerLogEvent finalEvent = new StateCheckerLogEvent(twiddleResults, expectedState); + finalEvent.setTime(current); + eventLog.addChild(finalEvent, ProcessLogEvent.ADD_END); if( expectedState == DOWN && success ) { // wait until the processes are actually terminated too. while( !startProcessesTerminated && current < max ) { @@ -114,9 +127,95 @@ eventLog.setComplete(); ent.getEventLog().branchChanged(); - behavior.setServerState(expectedState, twiddleResults); + //behavior.setServerState(true, false); + ent.removeSPListener(this); + + } + + private void dieCanceled() { + eventLog.setComplete(); + ent.getEventLog().branchChanged(); ent.removeSPListener(this); + } + + public static class StateCheckerLogEvent extends ProcessLogEvent { + public static final String EXPECTED_STATE = "_EXPECTED_STATE_"; + public static final String CURRENT_STATE = "_CURRENT_STATE_"; + public static final String SUCCESS = "_SUCCESS_"; + public static final String TWIDDLE_DATA = "_TWIDDLE_DATA_"; + public static final String EVENT_TYPE = "_EVENT_TYPE_"; + public static final String TIME = "_TIME_"; + + public static final int SERVER_STARTING = 2; + public static final int SERVER_STOPPING = 3; + public static final int SERVER_UP = 4; + public static final int SERVER_DOWN = 5; + + public static final int BEFORE = 6; + public static final int DURING = 7; + public static final int AFTER = 8; + + public StateCheckerLogEvent(boolean currentState, boolean expectedState) { + super(AFTER); + setProperty(SUCCESS, new Boolean(currentState == expectedState)); + setProperty(EXPECTED_STATE, new Boolean(expectedState)); + if( currentState ) + setProperty(CURRENT_STATE, new Integer(SERVER_UP)); + else + setProperty(CURRENT_STATE, new Integer(SERVER_DOWN)); + } + + public StateCheckerLogEvent(boolean expectedState) { + super(BEFORE); + setProperty(EXPECTED_STATE, new Boolean(expectedState)); + } + + public StateCheckerLogEvent(TwiddleLogEvent e, int type) { + super(DURING); + //setProperty(TWIDDLE_DATA, e); + setProperty(TwiddleLogEvent.ARGS, e.getArgs()); + setProperty(TwiddleLogEvent.OUT, e.getOut()); + setProperty(CURRENT_STATE, new Integer(type)); + } + + public String[] getAvailableProperties() { + if( getEventType() == BEFORE ) return new String[] {EXPECTED_STATE}; + if( getEventType() == DURING ) return new String[] {CURRENT_STATE, TIME, TwiddleLogEvent.ARGS, TwiddleLogEvent.OUT}; + if( getEventType() == AFTER ) return new String[] {EXPECTED_STATE, CURRENT_STATE, SUCCESS, TIME}; + return new String[] {}; + } + + public int getCurrentState() { + try { + return ((Integer)getProperty(CURRENT_STATE)).intValue(); + } catch( Exception e ) {} + return -1; + } + + public boolean getExpectedState() { + try { + return ((Boolean)getProperty(EXPECTED_STATE)).booleanValue(); + } catch( Exception e ) {} + return false; + } + + public boolean isSuccess() { + if( getCurrentState() == SERVER_UP && getExpectedState()) return true; + if( getCurrentState() == SERVER_DOWN && !getExpectedState()) return true; + return false; + } + + public TwiddleLogEvent getTwiddleLogEvent() { + try { + return (TwiddleLogEvent)getProperty(TWIDDLE_DATA); + } catch( Exception e ) {} + return null; + } + + public void setTime(int time) { + setProperty(TIME, new Integer(time)); + } } @@ -128,35 +227,36 @@ * @return */ private int getTwiddleResults( ServerProcessModelEntity ent, JBossServer jbServer, String args ) { + + // Log stuff TwiddleLauncher launcher = new TwiddleLauncher(max-current, delay); TwiddleLogEvent launchEvent = launcher.getTwiddleResults(ent, jbServer, args); - current += launcher.getDuration(); + StateCheckerLogEvent newEvent; int retval; if( launchEvent.getOut().startsWith("Started=true")) { - launchEvent.setEventType(ProcessLogEvent.SERVER_UP); - launchEvent.setText("Twiddle Launch: Server is up."); + newEvent = new StateCheckerLogEvent(launchEvent, StateCheckerLogEvent.SERVER_UP); retval = STATE_TRUE; } else if(launchEvent.getOut().startsWith("Started=false")) { retval = STATE_FALSE; if( expectedState == true ) { - launchEvent.setEventType(ProcessLogEvent.SERVER_STARTING); - launchEvent.setText("Twiddle Launch: Server still starting."); + newEvent = new StateCheckerLogEvent(launchEvent, StateCheckerLogEvent.SERVER_STARTING); } else { - launchEvent.setEventType(ProcessLogEvent.SERVER_STOPPING); - launchEvent.setText("Twiddle Launch: Server still stopping."); + newEvent = new StateCheckerLogEvent(launchEvent, StateCheckerLogEvent.SERVER_STOPPING); } } else { - launchEvent.setEventType(ProcessLogEvent.SERVER_DOWN); + newEvent = new StateCheckerLogEvent(launchEvent, StateCheckerLogEvent.SERVER_DOWN); retval = STATE_EXCEPTION; - launchEvent.setText("Twiddle Launch: Server is down."); } - eventLog.addChild(launchEvent); + current += launcher.getDuration(); + + newEvent.setTime(current); + + eventLog.addChild(newEvent); if( eventLog.getRoot() != null ) eventLog.getRoot().branchChanged(); return retval; - } public void ServerProcessEventFired(ServerProcessEvent event) { 1.1 date: 2006/07/10 15:46:18; author: rawb; state: Exp;jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerAttributeHelper.java Index: ServerAttributeHelper.java =================================================================== package org.jboss.ide.eclipse.as.core.server; import java.io.File; import org.eclipse.wst.server.core.IServerWorkingCopy; import org.eclipse.wst.server.core.internal.ServerWorkingCopy; import org.jboss.ide.eclipse.as.core.server.runtime.AbstractServerRuntimeDelegate; public class ServerAttributeHelper { public static final String PROP_START_ARGS = "PROP_START_ARGS"; public static final String PROP_STOP_ARGS = "PROP_STOP_ARGS"; public static final String PROP_PROG_ARGS = "PROP_PROG_ARGS"; public static final String PROP_VM_ARGS = "PROP_VM_ARGS"; public static final String PROP_CONFIG_PATH = "PROP_START_ARGS"; public static final String PROP_CLASSPATH = "PROP_CLASSPATH"; public static final String JBOSS_SERVER_HOME = "JBOSS_SERVER_HOME"; public static final String JBOSS_CONFIG = "JBOSS_CONFIG"; public static final String JBOSS_CONFIG_DEFAULT = "default"; private ServerWorkingCopy server; private JBossServer jbServer; public ServerAttributeHelper(JBossServer jbServer, IServerWorkingCopy copy) { this.server = (ServerWorkingCopy)copy; this.jbServer = jbServer; } public String getServerHome() { return server.getAttribute(JBOSS_SERVER_HOME, (String)null); } public String getJbossConfiguration() { return server.getAttribute(JBOSS_CONFIG, JBOSS_CONFIG_DEFAULT); } public void setServerHome( String home ) { server.setAttribute(ServerAttributeHelper.JBOSS_SERVER_HOME, home); } public void setJbossConfiguration( String config ) { server.setAttribute(ServerAttributeHelper.JBOSS_CONFIG, config); } public void setProgramArgs(String args) { server.setAttribute(PROP_START_ARGS, args); } public void setVMArgs(String args) { server.setAttribute(PROP_VM_ARGS, args); } public void save() { try { server.save(true, null); } catch( Exception e) { } } /* * These methods go back to the version delegate for defaults if * they are not set as attributes here. */ public String getStartArgs() { return server.getAttribute(PROP_START_ARGS, getVersionDelegate().getStartArgs(jbServer)); } public String getStopArgs() { return server.getAttribute(PROP_STOP_ARGS, getVersionDelegate().getStopArgs(jbServer)); } public String getVMArgs() { return server.getAttribute(PROP_VM_ARGS, getVersionDelegate().getVMArgs(jbServer)); } public String getStartMainType() { return getVersionDelegate().getStartMainType(); } public String getConfigurationPath() { return getServerHome() + File.separator + "server" + File.separator + getJbossConfiguration(); } public String getDeployDirectory() { return getConfigurationPath() + File.separator + "deploy"; } public AbstractServerRuntimeDelegate getVersionDelegate() { return jbServer.getJBossRuntime().getVersionDelegate(); } } |
From: Robert S. <ra...@gm...> - 2006-07-10 15:45:11
|
User: rawb Date: 06/07/10 11:45:09 Added: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module/factory ArchiveModuleFactory.java Log: New only packaged factory. Revision Changes Path 1.1 date: 2006/07/10 15:45:09; author: rawb; state: Exp;jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module/factory/ArchiveModuleFactory.java Index: ArchiveModuleFactory.java =================================================================== package org.jboss.ide.eclipse.as.core.module.factory; import java.io.File; import java.io.IOException; import java.util.jar.JarFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.model.IModuleResource; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.client.verifiers.ArchiveVerifier; public class ArchiveModuleFactory extends JBossModuleFactory { private static String GENERIC_JAR = "jboss.archive"; private static String VERSION = "1.0"; public ArchiveModuleFactory() { } public void initialize() { } protected IModule acceptAddition(IResource resource) { if( !supports(resource)) return null; // otherwise create the module String path = getPath(resource); IModule module = createModule(path, resource.getName(), GENERIC_JAR, VERSION, resource.getProject()); ArchiveModuleDelegate delegate = new ArchiveModuleDelegate(); delegate.initialize(module); delegate.setResource(resource); delegate.setFactory(this); // and insert it pathToModule.put(path, module); moduleToDelegate.put(module, delegate); return module; } public Object getLaunchable(JBossModuleDelegate delegate) { return new ArchiveVerifier(delegate); } public boolean supports(IResource resource) { try { File f = resource.getLocation().toFile(); JarFile jf = new JarFile(f); return true; } catch( IOException e ) { } return false; } public class ArchiveModuleDelegate extends JBossModuleDelegate { public IModule[] getChildModules() { return null; } public void initialize() { } public IStatus validate() { return new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID, 0, "Deployment is valid", null); } public IModuleResource[] members() throws CoreException { return new IModuleResource[0]; } } } |
From: Robert S. <ra...@gm...> - 2006-07-10 15:44:43
|
User: rawb Date: 06/07/10 11:44:42 Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model ModuleModel.java DescriptorModel.java Log: Misc. changes. Revision Changes Path 1.4 +4 -1 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/ModuleModel.java (In the diff below, changes in quantity of whitespace are not shown.) Index: ModuleModel.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/ModuleModel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- ModuleModel.java 9 Jun 2006 20:17:04 -0000 1.3 +++ ModuleModel.java 10 Jul 2006 15:44:42 -0000 1.4 @@ -124,10 +124,13 @@ } public static boolean isPackagedModule(IModule module) { + if( "jboss.archive".equals(module.getModuleType().getId())) return true; + /* if( "jboss.web".equals(module.getModuleType().getId())) return true; if( "jboss.ear".equals(module.getModuleType().getId())) return true; if( "jboss.ejb".equals(module.getModuleType().getId())) return true; if( "jboss.aop".equals(module.getModuleType().getId())) return true; + */ return false; } @@ -449,7 +452,7 @@ /** * Date is the last time this module was changed. - * Servers can use this to figure out if it needs to be + * Servers can use this to figure OUT if it needs to be * published again or not. */ private long date; 1.3 +29 -3 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/DescriptorModel.java (In the diff below, changes in quantity of whitespace are not shown.) Index: DescriptorModel.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/DescriptorModel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- DescriptorModel.java 2 Jun 2006 16:47:56 -0000 1.2 +++ DescriptorModel.java 10 Jul 2006 15:44:42 -0000 1.3 @@ -23,6 +23,7 @@ import java.io.File; import java.net.URL; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -33,7 +34,8 @@ import org.eclipse.wst.server.core.ServerCore; import org.jboss.ide.eclipse.as.core.JBossServerCore; import org.jboss.ide.eclipse.as.core.server.JBossServer; -import org.jboss.ide.eclipse.as.core.server.runtime.JBossRuntimeConfiguration; +import org.jboss.ide.eclipse.as.core.server.ServerAttributeHelper; +import org.jboss.ide.eclipse.as.core.util.ASDebug; /** * This class is intended to represent the actual mbeans, @@ -91,15 +93,18 @@ */ public class ServerDescriptorModel { private String serverId; + private long lastChecked; + private String configPath; public ServerDescriptorModel(String id) { this.serverId = id; + ServerAttributeHelper helper = getJBossServer().getAttributeHelper(); + configPath = helper.getConfigurationPath(); + } public int getJNDIPort() { try { - JBossRuntimeConfiguration rc = getJBossServer().getRuntimeConfiguration(); - String configPath = rc.getConfigurationPath(); String jbossServicePath = configPath + File.separator + "conf" + File.separator + "jboss-service.xml"; URL jbossServiceURL = new File(jbossServicePath).toURL(); @@ -121,6 +126,27 @@ return JBossServerCore.getServer(ServerCore.findServer(serverId)); } + private File[] getAllDescriptors() { + ArrayList list = new ArrayList(); + File config = new File(configPath); + getAllDescriptorsRecurse(config, list); + File[] ret = new File[list.size()]; + list.toArray(ret); + return ret; + } + + private void getAllDescriptorsRecurse(File parent, ArrayList collector) { + if( parent.isDirectory() ) { + File[] children = parent.listFiles(); + for( int i = 0; i < children.length; i++ ) { + if( children[i].isDirectory()) { + getAllDescriptorsRecurse(children[i], collector); + } else if( children[i].getAbsolutePath().endsWith(".xml")) { + collector.add(children[i]); + } + } + } + } } |
From: Robert S. <ra...@gm...> - 2006-07-10 15:44:25
|
User: rawb Date: 06/07/10 11:44:23 Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model ServerProcessLog.java ServerProcessModel.java Log: Changed event logging structure. Revision Changes Path 1.6 +29 -42 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/ServerProcessLog.java (In the diff below, changes in quantity of whitespace are not shown.) Index: ServerProcessLog.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/ServerProcessLog.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- ServerProcessLog.java 27 Jun 2006 07:07:31 -0000 1.5 +++ ServerProcessLog.java 10 Jul 2006 15:44:23 -0000 1.6 @@ -34,28 +34,8 @@ public class ServerProcessLog { public static class ProcessLogEvent { - public static final int SERVER_ROOT = -1; - - public static final int SERVER_CONSOLE = 0; - - public static final int SERVER_STARTING = 1; - public static final int SERVER_STOPPING = 3; - public static final int SERVER_UP = 9; - public static final int SERVER_DOWN = 10; - - public static final int SERVER_PUBLISH = 2; - public static final int SERVER_UNPUBLISH = 14; - public static final int SERVER_VERIFY = 15; - - public static final int TWIDDLE = 4; - public static final int STDOUT = 5; - public static final int STDERR = 6; - public static final int PROCESS = 7; - public static final int ERROR = 8; - - public static final int WAR = 11; - public static final int EJB_JAR = 12; - public static final int EAR = 13; + public static final int SERVER_ROOT = 0; + public static final int SERVER_CONSOLE = 1; public static final int UNKNOWN = 16; @@ -64,19 +44,15 @@ public static final int ADD_END = 1; - - private HashMap properties = new HashMap(); private ArrayList children = new ArrayList(); private ProcessLogEvent parent; - private String text; private int eventType; private long date; private boolean complete = false; - public ProcessLogEvent(String text, int eventType) { - this.text = text; + public ProcessLogEvent(int eventType) { this.eventType = eventType; this.date = new Date().getTime(); } @@ -101,12 +77,12 @@ } - public ProcessLogEvent addChild(String text, int eventType) { - return addChild(text, eventType, ADD_END); + public ProcessLogEvent addChild(int eventType) { + return addChild(eventType, ADD_END); } - public ProcessLogEvent addChild(String text, int eventType, int location) { - ProcessLogEvent e = new ProcessLogEvent(text, eventType); + public ProcessLogEvent addChild(int eventType, int location) { + ProcessLogEvent e = new ProcessLogEvent(eventType); addChild(e, location); return e; } @@ -162,10 +138,6 @@ this.eventType = eventType; } - public String getText() { - return text; - } - public ProcessLogEvent getParent() { return parent; } @@ -194,8 +166,18 @@ this.complete = true; } - public void setText(String text) { - this.text = text; + } + + public static class ExceptionLogEvent extends ProcessLogEvent { + + private Throwable e; + public ExceptionLogEvent(Throwable e) { + super(-1); + this.e = e; + } + + public Throwable getException() { + return e; } } @@ -206,7 +188,7 @@ // private ProcessLogEvent consoleLog; public ProcessLogEventRoot(String serverID) { - super(serverID, SERVER_ROOT); + super(SERVER_ROOT); this.server = ServerCore.findServer(serverID); this.serverID = serverID; } @@ -226,12 +208,17 @@ return server; } - public ProcessLogEvent newMajorEvent(String text, int type) { - ProcessLogEvent newEvent = new ProcessLogEvent(text, type); + public ProcessLogEvent newMajorEvent(int type) { + ProcessLogEvent newEvent = new ProcessLogEvent(type); addChild(newEvent, ADD_BEGINNING); return newEvent; } + public void newMajorEvent(ProcessLogEvent event) { + addChild(event, ADD_BEGINNING); + } + + /** * Get the latest major event. * @param create Create a new event if the last is finished? @@ -242,7 +229,7 @@ if( !getChildren()[0].isComplete()) return getChildren()[0]; - return addChild("Unknown Event", ProcessLogEvent.UNKNOWN, ProcessLogEvent.ADD_BEGINNING); + return addChild(ProcessLogEvent.UNKNOWN, ProcessLogEvent.ADD_BEGINNING); } } 1.6 +29 -17 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/ServerProcessModel.java (In the diff below, changes in quantity of whitespace are not shown.) Index: ServerProcessModel.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/ServerProcessModel.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- ServerProcessModel.java 27 Jun 2006 07:07:31 -0000 1.5 +++ ServerProcessModel.java 10 Jul 2006 15:44:23 -0000 1.6 @@ -397,6 +397,14 @@ } + public static class ConsoleLogEvent extends ProcessLogEvent { + public ConsoleLogEvent() { + super(ProcessLogEvent.SERVER_CONSOLE); + } + public String toString() { + return getProperty(new Integer(ServerProcessLog.ProcessLogEvent.SERVER_CONSOLE)).toString(); + } + } private class ServerConsoleLogger implements IServerProcessListener, IStreamListener { private IStreamMonitor out, err; @@ -420,7 +428,6 @@ err = proxy.getErrorStreamMonitor(); out.addListener(this); err.addListener(this); - } } catch( Exception e ) { ASDebug.p("Error", this); @@ -432,11 +439,12 @@ ProcessLogEvent major = getEventLog().getLatestMajorEvent(true); ProcessLogEvent[] children = major.getChildren(); for( int i = 0; i < children.length; i++ ) { - if( children[i].getEventType() == ProcessLogEvent.SERVER_CONSOLE ) { + if( children[i] instanceof ConsoleLogEvent && + children[i].getEventType() == ProcessLogEvent.SERVER_CONSOLE ) { return children[i]; } } - ProcessLogEvent newConsole = new ProcessLogEvent("Console Output", ProcessLogEvent.SERVER_CONSOLE); + ProcessLogEvent newConsole = new ConsoleLogEvent(); major.addChild(newConsole, ProcessLogEvent.ADD_BEGINNING); return newConsole; } @@ -459,20 +467,24 @@ } protected void outAppended(String text, IStreamMonitor monitor) { - String[] textSplit = text.split("\r\n|\r|\n"); - for( int i = 0; i < textSplit.length; i++ ) - getLatestConsole().addChild(textSplit[i], ProcessLogEvent.STDOUT); + append(text); } protected void errAppended(String text, IStreamMonitor monitor) { - String[] textSplit = text.split("\r\n|\r|\n"); - for( int i = 0; i < textSplit.length; i++ ) - getLatestConsole().addChild(textSplit[i], ProcessLogEvent.STDERR); + append(text); + } + + protected void append(String text) { + Object o = getLatestConsole().getProperty(new Integer(ServerProcessLog.ProcessLogEvent.SERVER_CONSOLE)); + String x; + if( o == null ) x = ""; else x = (String)o; + x = x + text; + getLatestConsole().setProperty(new Integer(ServerProcessLog.ProcessLogEvent.SERVER_CONSOLE), x); } } /** - * A class that can monitor a process's standard out and + * A class that can monitor a process's standard OUT and * standard error, as well as keep track of the process's * arguments that it was launched with. * |
From: Robert S. <ra...@gm...> - 2006-07-10 15:42:59
|
User: rawb Date: 06/07/10 11:42:56 Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers EjbDeploymentVerifier.java AbstractDeploymentVerifier.java WarDeploymentVerifier.java EarDeploymentVerifier.java Added: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers ArchiveVerifier.java Log: These are deactivated mostly until next release. Revision Changes Path 1.4 +8 -4 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/EjbDeploymentVerifier.java (In the diff below, changes in quantity of whitespace are not shown.) Index: EjbDeploymentVerifier.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/EjbDeploymentVerifier.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- EjbDeploymentVerifier.java 9 Jun 2006 16:58:24 -0000 1.3 +++ EjbDeploymentVerifier.java 10 Jul 2006 15:42:56 -0000 1.4 @@ -24,10 +24,7 @@ import org.eclipse.debug.core.DebugEvent; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.JBossServerCore; -import org.jboss.ide.eclipse.as.core.client.TwiddleLauncher; -import org.jboss.ide.eclipse.as.core.model.ServerProcessLog.ProcessLogEvent; import org.jboss.ide.eclipse.as.core.module.factory.JBossModuleDelegate; -import org.jboss.ide.eclipse.as.core.module.factory.EjbModuleFactory.EjbModuleDelegate; import org.jboss.ide.eclipse.as.core.server.JBossServer; public class EjbDeploymentVerifier extends AbstractDeploymentVerifier { @@ -44,6 +41,7 @@ } public String[] createTwiddleArgs(JBossServer server, JBossModuleDelegate delegate1) { + /* if( !(delegate1 instanceof EjbModuleDelegate) ) { return new String[] { }; } @@ -51,7 +49,7 @@ EjbModuleDelegate delegate = (EjbModuleDelegate)delegate1; int jndiPort = server.getDescriptorModel().getJNDIPort(); - String host = server.getRuntimeConfiguration().getHost(); + String host = server.getServer().getHost(); String filename = delegate.getResourceName(); @@ -67,6 +65,8 @@ //String final2 = argsFront + service + " StateString Name"; return allArgs; + */ + return new String[0]; } private String createModuleArgs(String front, String filename) { @@ -74,6 +74,7 @@ "StateString Name"; } + /* private String[] createBeanArgs(String front, EjbModuleDelegate delegate) { String[] names = delegate.getBeanJNDINames(); String[] args = new String[names.length]; @@ -83,6 +84,7 @@ } return args; } + */ protected String formatConsoleOutput() { return ""; @@ -101,6 +103,7 @@ } protected void runVerifier() { + /* String[] twiddleArgs = createTwiddleArgs(jbServer, (EjbModuleDelegate)delegate); for( int i = 0; i < twiddleArgs.length; i++ ) { ProcessLogEvent event = @@ -108,6 +111,7 @@ logEvent.addChild(event); logEvent.getRoot().branchChanged(); } + */ } protected void threadTerminated(DebugEvent[] events) { 1.3 +7 -8 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/AbstractDeploymentVerifier.java (In the diff below, changes in quantity of whitespace are not shown.) Index: AbstractDeploymentVerifier.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/AbstractDeploymentVerifier.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- AbstractDeploymentVerifier.java 2 Jun 2006 16:47:56 -0000 1.2 +++ AbstractDeploymentVerifier.java 10 Jul 2006 15:42:56 -0000 1.3 @@ -96,7 +96,6 @@ - protected abstract void initialize(); protected abstract void cleanup(); @@ -106,12 +105,12 @@ model.addSPListener(this); DebugPlugin.getDefault().addDebugEventListener(this); - logEvent = new ProcessLogEvent("Verifying deployment of " - + delegate.getResourceName(), ProcessLogEvent.SERVER_VERIFY); - - String id = jbServer.getServer().getId(); - ServerProcessModelEntity ent = ServerProcessModel.getDefault().getModel(id); - ent.getEventLog().addChild(logEvent, ProcessLogEvent.ADD_BEGINNING); +// logEvent = new ProcessLogEvent("Verifying deployment of " +// + delegate.getResourceName(), ProcessLogEvent.SERVER_VERIFY); +// +// String id = jbServer.getServer().getId(); +// ServerProcessModelEntity ent = ServerProcessModel.getDefault().getModel(id); +// ent.getEventLog().addChild(logEvent, ProcessLogEvent.ADD_BEGINNING); } @@ -165,7 +164,7 @@ /** * Tell the server process model to start listening right away to - * these procecsses as they start. Their standard out and error + * these procecsses as they start. Their standard OUT and error * will then be available for us to analyze or document. */ public void ServerProcessEventFired(ServerProcessEvent event) { 1.5 +1 -1 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/WarDeploymentVerifier.java (In the diff below, changes in quantity of whitespace are not shown.) Index: WarDeploymentVerifier.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/WarDeploymentVerifier.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- WarDeploymentVerifier.java 19 Jun 2006 14:16:50 -0000 1.4 +++ WarDeploymentVerifier.java 10 Jul 2006 15:42:56 -0000 1.5 @@ -58,7 +58,7 @@ protected void initialize() { int jndiPort = jbServer.getDescriptorModel().getJNDIPort(); - String host = jbServer.getRuntimeConfiguration().getHost(); + String host = jbServer.getServer().getHost(); argsStart = "-s " + host + ":" + jndiPort + " -a jmx/rmi/RMIAdaptor "; } 1.5 +1 -1 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/EarDeploymentVerifier.java (In the diff below, changes in quantity of whitespace are not shown.) Index: EarDeploymentVerifier.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/EarDeploymentVerifier.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- EarDeploymentVerifier.java 19 Jun 2006 14:16:50 -0000 1.4 +++ EarDeploymentVerifier.java 10 Jul 2006 15:42:56 -0000 1.5 @@ -58,7 +58,7 @@ protected void initialize() { int jndiPort = jbServer.getDescriptorModel().getJNDIPort(); - String host = jbServer.getRuntimeConfiguration().getHost(); + String host = jbServer.getServer().getHost(); argsStart = "-s " + host + ":" + jndiPort + " -a jmx/rmi/RMIAdaptor "; } 1.1 date: 2006/07/10 15:42:56; author: rawb; state: Exp;jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/ArchiveVerifier.java Index: ArchiveVerifier.java =================================================================== package org.jboss.ide.eclipse.as.core.client.verifiers; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.ILaunch; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.module.factory.JBossModuleDelegate; import org.jboss.ide.eclipse.as.core.server.JBossServer; public class ArchiveVerifier implements IJbossDeploymentVerifier { public ArchiveVerifier(JBossModuleDelegate delegate) { } public boolean supportsVerify(IServer server, String launchMode) { return true; } public IStatus verifyDeployed(JBossServer server, String launchmode, ILaunch launch) { // Delegate to some other verifier. return new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID, 0, "Well Done", null); } } |
From: Clebert S. <csu...@jb...> - 2006-07-10 15:42:46
|
User: csuconic Date: 06/07/10 11:42:43 Added: tests/org/jboss/serial/regression/jbser80 RegressionTestCase.java Log: Rename testcase Revision Changes Path 1.1 date: 2006/07/10 15:42:43; author: csuconic; state: Exp;jboss-serialization/tests/org/jboss/serial/regression/jbser80/RegressionTestCase.java Index: RegressionTestCase.java =================================================================== /* * JBoss, Home of Professional Open Source * Copyright 2005, JBoss Inc., and individual contributors as indicated * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.serial.regression.jbser80; import java.util.ArrayList; import org.jboss.serial.benchmarks.SizeBenchmarkTestCase; import org.jboss.serial.classmetamodel.ClassMetaData; import org.jboss.serial.classmetamodel.ClassMetadataField; import org.jboss.serial.classmetamodel.ClassMetamodelFactory; import org.jboss.serial.data.TestPrivateExternalizable; import org.jboss.serial.references.PersistentReference; import junit.framework.TestCase; public class RegressionTestCase extends TestCase { public void testRegressionTest1() throws Exception { TestPrivateExternalizable test = TestPrivateExternalizable.createTestInstance(); SizeBenchmarkTestCase bench = new SizeBenchmarkTestCase(); bench.doTestJBossSerialization(test); // force reconstruction of SoftReferences ArrayList list = new ArrayList(); int i=0; try { while (true) { list.add("Big String Big String Big String Big String Big String Big String Big String Big String Big String " + i); } } catch (Throwable e) { } list.clear(); list = null; bench.doTestJBossSerialization(test); } } |
From: Clebert S. <csu...@jb...> - 2006-07-10 15:42:45
|
User: csuconic Date: 06/07/10 11:42:43 Removed: tests/org/jboss/serial/regressions/jbser88 RegressionTestCase.java Log: Rename testcase |
From: Clebert S. <csu...@jb...> - 2006-07-10 15:42:43
|
User: csuconic Date: 06/07/10 11:42:40 Log: Directory /cvsroot/jboss/jboss-serialization/tests/org/jboss/serial/regression/jbser80 added to the repository |
From: Robert S. <ra...@gm...> - 2006-07-10 15:42:35
|
User: rawb Date: 06/07/10 11:42:32 Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client NullLaunchable.java VerifyPublishClient.java DoNothingClient.java TwiddleLauncher.java Log: These are deactivated mostly until next release. Revision Changes Path 1.2 +3 -0 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/NullLaunchable.java (In the diff below, changes in quantity of whitespace are not shown.) Index: NullLaunchable.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/NullLaunchable.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- NullLaunchable.java 9 Jun 2006 16:58:24 -0000 1.1 +++ NullLaunchable.java 10 Jul 2006 15:42:32 -0000 1.2 @@ -1,5 +1,8 @@ package org.jboss.ide.eclipse.as.core.client; +/* + * Used for pre-packaged jst stuff. Just as a label + */ public class NullLaunchable { } 1.3 +15 -11 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/VerifyPublishClient.java (In the diff below, changes in quantity of whitespace are not shown.) Index: VerifyPublishClient.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/VerifyPublishClient.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- VerifyPublishClient.java 2 Jun 2006 16:47:55 -0000 1.2 +++ VerifyPublishClient.java 10 Jul 2006 15:42:32 -0000 1.3 @@ -28,7 +28,9 @@ import org.eclipse.wst.server.core.model.ClientDelegate; import org.jboss.ide.eclipse.as.core.JBossServerCore; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.JBossServerCorePreferences; import org.jboss.ide.eclipse.as.core.client.verifiers.IJbossDeploymentVerifier; +import org.jboss.ide.eclipse.as.core.server.JBossServer; import org.jboss.ide.eclipse.as.core.util.ASDebug; public class VerifyPublishClient extends ClientDelegate { @@ -38,23 +40,25 @@ } public boolean supports(IServer server, Object launchable, String launchMode) { - if( launchable instanceof IJbossDeploymentVerifier) { - return ((IJbossDeploymentVerifier)launchable).supportsVerify(server, launchMode); - } + if( JBossServerCore.getServer(server) == null ) return false; + if( JBossServerCorePreferences.getDefault(). + getModuleClientAction(null) != JBossServerCorePreferences.VERIFY_CLIENT_ACTION ) { return false; } + return true; + } + public IStatus launch(IServer server, Object launchable, String launchMode, ILaunch launch) { - if( launchable instanceof IJbossDeploymentVerifier) { - IJbossDeploymentVerifier verifier = ((IJbossDeploymentVerifier)launchable); - return verifier.verifyDeployed(JBossServerCore.getServer(server), launchMode, launch); + ASDebug.p("I'm supposed to verify now", this); + if( launchable instanceof IJbossDeploymentVerifier ) { + JBossServer jbServer = JBossServerCore.getServer(server); + if( jbServer != null ) + return ((IJbossDeploymentVerifier)launchable).verifyDeployed(jbServer, launchMode, launch); } - - return new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, 0, "Could not verify deployment", - new Exception("Could not verify deployment in " + getClass().getName())); + new Exception("Could not verify deployment")); } - } 1.2 +9 -5 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/DoNothingClient.java (In the diff below, changes in quantity of whitespace are not shown.) Index: DoNothingClient.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/DoNothingClient.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- DoNothingClient.java 9 Jun 2006 16:58:24 -0000 1.1 +++ DoNothingClient.java 10 Jul 2006 15:42:32 -0000 1.2 @@ -28,6 +28,7 @@ import org.eclipse.wst.server.core.internal.ServerPlugin; import org.eclipse.wst.server.core.model.ClientDelegate; import org.jboss.ide.eclipse.as.core.JBossServerCore; +import org.jboss.ide.eclipse.as.core.JBossServerCorePreferences; import org.jboss.ide.eclipse.as.core.util.ASDebug; /** @@ -49,17 +50,20 @@ } public boolean supports(IServer server, Object launchable, String launchMode) { - if( JBossServerCore.getServer(server) != null ) - return true; + if( JBossServerCore.getServer(server) == null ) return false; + if( JBossServerCorePreferences.getDefault(). + getModuleClientAction(null) != JBossServerCorePreferences.NO_CLIENT_ACTION ) { return false; } + return true; + } + public IStatus launch(IServer server, Object launchable, String launchMode, ILaunch launch) { // Do nothing - - ASDebug.p("Published content!", this); + ASDebug.p("Here, I do nothing", this); return new Status(IStatus.OK, ServerPlugin.PLUGIN_ID, 0, "A-OK", null); } 1.4 +48 -29 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/TwiddleLauncher.java (In the diff below, changes in quantity of whitespace are not shown.) Index: TwiddleLauncher.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/TwiddleLauncher.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- TwiddleLauncher.java 19 Jun 2006 14:16:50 -0000 1.3 +++ TwiddleLauncher.java 10 Jul 2006 15:42:32 -0000 1.4 @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Properties; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; @@ -78,7 +79,6 @@ ArrayList list = new ArrayList(); for( int i = 0; i < twiddleArgs.length; i++ ) { try { - System.out.println("[Twiddle Args] " + twiddleArgs[i]); wc = createTwiddleLaunch(jbServer, twiddleArgs[i], seed); ILaunch launch = wc.launch(ILaunchManager.RUN_MODE, new NullProgressMonitor(), false, false); list.addAll(Arrays.asList(launch.getProcesses())); @@ -123,7 +123,7 @@ workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, ""); workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, classpath); workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false); - workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, runtimeDelegate.getTwiddleMainType(jbServer)); + workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, runtimeDelegate.getTwiddleMainType()); workingCopy.setAttribute(Server.ATTR_SERVER_ID, jbServer.getServer().getId()); workingCopy.setAttribute(JBossServerBehavior.ATTR_ACTION, JBossServerBehavior.ACTION_TWIDDLE); @@ -132,7 +132,7 @@ workingCopy.setAttribute( IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, - jbServer.getRuntimeConfiguration().getServerHome() + Path.SEPARATOR + "bin"); + jbServer.getAttributeHelper().getServerHome() + Path.SEPARATOR + "bin"); @@ -204,26 +204,10 @@ private TwiddleLogEvent createTwiddleEvents(String args, boolean allTerminated) { // If there's only one process, we dont need to do all the rest if( processDatas.length == 1 ) { - TwiddleLogEvent e = new TwiddleLogEvent("Twiddle Launch: " + args, - ProcessLogEvent.TWIDDLE, processDatas[0]); -// ProcessLogEvent e = new ProcessLogEvent("Twiddle Launch: " + args, ProcessLogEvent.TWIDDLE); -// if( !processDatas[0].getOut().equals("")) { -// String out = processDatas[0].getOut(); -// String[] outArray = out.split("\r\n|\r|\n"); -// for( int i = 0; i < outArray.length; i++ ) { -// e.addChild(outArray[i], ProcessLogEvent.STDOUT); -// } -// } -// if( !processDatas[0].getErr().equals("")) { -// String err = processDatas[0].getErr(); -// String[] errArray = err.split("\r\n|\r|\n"); -// for( int i = 0; i < errArray.length; i++ ) { -// e.addChild(errArray[i], ProcessLogEvent.STDOUT); -// } -// } + TwiddleLogEvent e = new TwiddleLogEvent(args, processDatas[0], current); return e; } - return new TwiddleLogEvent("Error in TwiddleLauncher (unexpected response)", ProcessLogEvent.ERROR, null); + return new TwiddleLogEvent(TwiddleLogEvent.ERROR, args, null, current); } public int getDuration() { @@ -249,25 +233,60 @@ public static class TwiddleLogEvent extends ProcessLogEvent { - private String out; - private String err; + public static final String OUT = "_OUT_"; + public static final String ERR = "_ERR_"; + public static final String ARGS = "_ARGS_"; + public static final String TIME = "_TIME_"; - public TwiddleLogEvent(String text, int eventType, ProcessData data) { - super(text, eventType); + public static final int TWIDDLE = 0; + public static final int ERROR = 1; + + + + public TwiddleLogEvent(String args1, ProcessData data, int time) { + this(TWIDDLE, args1, data, time); + } + + public TwiddleLogEvent(int type, String args1, ProcessData data, int time) { + super(type); + setProperty(ARGS, args1); + setProperty(TIME, time); if( data != null ) { - this.out = data.getOut(); - this.err = data.getErr(); + setProperty(OUT, data.getOut()); + setProperty(ERR, data.getErr()); } } public String getOut() { - return out; + return (String)getProperty(OUT); } public String getErr() { - return err; + return (String)getProperty(ERR); + } + public String getArgs() { + return (String)getProperty(ARGS); + } + public int getTime() { + return ((Integer)getProperty(TIME)).intValue(); } public boolean isException() { return false; } + public Object[] getAvailableProperties() { + return new Object[] { ARGS, TIME}; + } + public Properties outputAsProperties() { + Properties p = new Properties(); + String[] perLine = getOut().split("\r\n|\r|\n"); + for( int i = 0; i < perLine.length; i++ ) { + if( perLine[i].contains("=")) { + try { + int index = perLine[i].indexOf("="); + p.put(perLine[i].substring(0, index), perLine[i].substring(index+1)); + } catch( Exception e ) {} + } + } + return p; + } } } |
From: Robert S. <ra...@gm...> - 2006-07-10 15:42:12
|
User: rawb Date: 06/07/10 11:42:03 Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core JBossServerCorePlugin.java Added: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core JBossServerCorePreferences.java Log: Added a preference helper class and reference to it in the core plugin. Revision Changes Path 1.3 +4 -0 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java (In the diff below, changes in quantity of whitespace are not shown.) Index: JBossServerCorePlugin.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- JBossServerCorePlugin.java 2 Jun 2006 16:47:57 -0000 1.2 +++ JBossServerCorePlugin.java 10 Jul 2006 15:42:03 -0000 1.3 @@ -107,4 +107,8 @@ public ResourceBundle getResourceBundle() { return resourceBundle; } + + public JBossServerCorePreferences getPreferenceHelper() { + return JBossServerCorePreferences.getDefault(); + } } 1.1 date: 2006/07/10 15:42:03; author: rawb; state: Exp;jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePreferences.java Index: JBossServerCorePreferences.java =================================================================== package org.jboss.ide.eclipse.as.core; import org.eclipse.core.runtime.Preferences; import org.eclipse.wst.server.core.IModule; import org.jboss.ide.eclipse.as.core.server.JBossServer; public class JBossServerCorePreferences { private static JBossServerCorePreferences prefs; public static JBossServerCorePreferences getDefault() { if( prefs == null ) { prefs = new JBossServerCorePreferences(); } return prefs; } public JBossServerCorePreferences() { } public static final int NO_CLIENT_ACTION = 0; public static final int VERIFY_CLIENT_ACTION = 1; public int getModuleClientAction(IModule module[]) { return NO_CLIENT_ACTION; } /** * Get the preferences for that plugin from preferneces. * If not set, use the max. */ public static final int MAX_TIMEOUT = 180000; public static final String START_TIMEOUT = "_START_TIMEOUT_"; public static final String STOP_TIMEOUT = "_STOP_TIMEOUT_"; public int getStartTimeout(JBossServer server) { if( getPreferences().getInt(server.getServer().getId() + START_TIMEOUT) != 0 ) { return getPreferences().getInt(server.getServer().getId() + START_TIMEOUT); } return MAX_TIMEOUT; } public int getStopTimeout(JBossServer server) { if( getPreferences().getInt(server.getServer().getId() + STOP_TIMEOUT) != 0 ) { return getPreferences().getInt(server.getServer().getId() + STOP_TIMEOUT); } return MAX_TIMEOUT; } public Preferences getPreferences() { return JBossServerCorePlugin.getDefault().getPluginPreferences(); } } |