JBoss Tools SVN: r2859 - tags.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-08-02 16:03:54 -0400 (Thu, 02 Aug 2007)
New Revision: 2859
Added:
tags/freemarker-1.0.0.beta3/
Log:
tag of freemarker for jboss tools beta3
Copied: tags/freemarker-1.0.0.beta3 (from rev 2858, trunk/freemarker)
18 years, 4 months
JBoss Tools SVN: r2858 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-08-02 16:01:45 -0400 (Thu, 02 Aug 2007)
New Revision: 2858
Removed:
trunk/freemarker-jbosstools-2.0.0.beta3/
Log:
wrong tag location
18 years, 4 months
JBoss Tools SVN: r2857 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-08-02 15:58:25 -0400 (Thu, 02 Aug 2007)
New Revision: 2857
Added:
trunk/freemarker-jbosstools-2.0.0.beta3/
Log:
tag of freemarker for jboss tools beta3
Copied: trunk/freemarker-jbosstools-2.0.0.beta3 (from rev 2856, trunk/freemarker)
18 years, 4 months
JBoss Tools SVN: r2856 - tags.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-08-02 15:55:56 -0400 (Thu, 02 Aug 2007)
New Revision: 2856
Added:
tags/hibernatetools-jbosstools-2.0.0.beta3/
Log:
tag of hibernatetools for jboss tools beta3
Copied: tags/hibernatetools-jbosstools-2.0.0.beta3 (from rev 2855, trunk/hibernatetools)
18 years, 4 months
JBoss Tools SVN: r2855 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-08-02 13:36:26 -0400 (Thu, 02 Aug 2007)
New Revision: 2855
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/PollThread.java
Log:
slight poller changes
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/PollThread.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/PollThread.java 2007-08-02 17:36:06 UTC (rev 2854)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/PollThread.java 2007-08-02 17:36:26 UTC (rev 2855)
@@ -31,6 +31,7 @@
import org.jboss.ide.eclipse.as.core.model.EventLogModel.EventLogRoot;
import org.jboss.ide.eclipse.as.core.model.EventLogModel.EventLogTreeItem;
import org.jboss.ide.eclipse.as.core.runtime.server.IServerStatePoller;
+import org.jboss.ide.eclipse.as.core.runtime.server.ServerStatePollerType;
import org.jboss.ide.eclipse.as.core.runtime.server.IServerStatePoller.PollingException;
import org.jboss.ide.eclipse.as.core.server.JBossServer;
import org.jboss.ide.eclipse.as.core.server.JBossServerBehavior;
@@ -51,6 +52,7 @@
public static final String SERVER_STOPPING = "org.jboss.ide.eclipse.as.core.runtime.server.PollThread.server.stopping";
public static final String FAILURE = "org.jboss.ide.eclipse.as.core.runtime.server.PollThread.failure";
public static final String SUCCESS = "org.jboss.ide.eclipse.as.core.runtime.server.PollThread.success";
+ public static final String POLLER_NOT_FOUND = "org.jboss.ide.eclipse.as.core.runtime.server.PollThread.pollerNotFound";
public static final String POLL_THREAD_ABORTED = "org.jboss.ide.eclipse.as.core.runtime.server.PollThread.aborted";
public static final String POLL_THREAD_TIMEOUT = "org.jboss.ide.eclipse.as.core.runtime.server.PollThread.timeout";
public static final String EXPECTED_STATE = "org.jboss.ide.eclipse.as.core.runtime.server.PollThreadEvent.expectedState";
@@ -81,7 +83,8 @@
ServerAttributeHelper helper = s.getAttributeHelper();
String key = expectedState == IServerStatePoller.SERVER_UP ? IServerPollingAttributes.STARTUP_POLLER_KEY : IServerPollingAttributes.SHUTDOWN_POLLER_KEY;
String pollerId = helper.getAttribute(key, IServerPollingAttributes.DEFAULT_POLLER);
- return ExtensionManager.getDefault().getPollerType(pollerId).createPoller();
+ ServerStatePollerType type = ExtensionManager.getDefault().getPollerType(pollerId);
+ return type == null ? null : type.createPoller();
}
public void cancel() {
@@ -106,12 +109,22 @@
public void run() {
+ // Poller not found
+ if( poller == null ) {
+ alertEventLogStarting();
+ alertPollerNotFound();
+ alertBehavior(getTimeoutBehavior(), false);
+ return;
+ }
+
int maxWait = getTimeout();
alertEventLogStarting();
long startTime = new Date().getTime();
boolean done = false;
poller.beginPolling(getServer(), expectedState, this);
+
+ // begin the loop; ask the poller every so often
while( !abort && !done && new Date().getTime() < startTime + maxWait ) {
try {
Thread.sleep(100);
@@ -129,7 +142,9 @@
return;
}
}
+
boolean currentState = !expectedState;
+ // we stopped. Did we abort?
if( abort ) {
poller.cancel(IServerStatePoller.CANCEL);
poller.cleanup();
@@ -159,22 +174,25 @@
fireTimeoutEvent();
finalAlert = false;
}
-
- if( currentState != expectedState ) {
- // it didnt work... cancel all processes! force stop
+ alertBehavior(currentState, finalAlert);
+ }
+ }
+
+ protected void alertBehavior(boolean currentState, boolean finalAlert) {
+ if( currentState != expectedState ) {
+ // it didnt work... cancel all processes! force stop
+ behavior.stop(true);
+ if( finalAlert ) alertEventLogFailure();
+ } else {
+ if( currentState == IServerStatePoller.SERVER_UP )
+ behavior.setServerStarted();
+ else {
behavior.stop(true);
- if( finalAlert ) alertEventLogFailure();
- } else {
- if( currentState == IServerStatePoller.SERVER_UP )
- behavior.setServerStarted();
- else {
- behavior.stop(true);
- }
- if( finalAlert ) alertEventLogSuccess(currentState);
}
+ if( finalAlert ) alertEventLogSuccess(currentState);
}
}
-
+
protected boolean getTimeoutBehavior() {
// timeout has been reached, so let the user's preferences override
JBossServer jbs = ((JBossServer)getServer().loadAdapter(JBossServer.class, null));
@@ -236,6 +254,10 @@
}
protected void alertEventLogSuccess(boolean currentState) {
PollThreadEvent event = new PollThreadEvent(activeEvent, SUCCESS, expectedState);
+ EventLogModel.markChanged(eventRoot);
+ }
+ protected void alertPollerNotFound() {
+ PollThreadEvent event = new PollThreadEvent(activeEvent, POLLER_NOT_FOUND, expectedState);
EventLogModel.markChanged(activeEvent);
}
18 years, 4 months
JBoss Tools SVN: r2854 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-08-02 13:36:06 -0400 (Thu, 02 Aug 2007)
New Revision: 2854
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerBehavior.java
Log:
swallow possible exception.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerBehavior.java 2007-08-02 17:34:51 UTC (rev 2853)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerBehavior.java 2007-08-02 17:36:06 UTC (rev 2854)
@@ -82,7 +82,9 @@
// just terminate the process.
try {
if( process != null )
- process.terminate();
+ try {
+ process.terminate();
+ } catch( Exception e ) {}
process = null;
setServerStopped();
if( addEvent ) {
18 years, 4 months
JBoss Tools SVN: r2853 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-08-02 13:34:51 -0400 (Thu, 02 Aug 2007)
New Revision: 2853
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PollingLabelProvider.java
Log:
slight poller changes
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PollingLabelProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PollingLabelProvider.java 2007-08-02 16:45:03 UTC (rev 2852)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PollingLabelProvider.java 2007-08-02 17:34:51 UTC (rev 2853)
@@ -58,6 +58,7 @@
supported.add(PollThread.POLL_THREAD_ABORTED);
supported.add(PollThread.POLL_THREAD_TIMEOUT);
supported.add(PollThread.POLL_THREAD_EXCEPTION);
+ supported.add(PollThread.POLLER_NOT_FOUND);
supported.add(JMXPoller.TYPE_TERMINATED);
supported.add(JMXPoller.TYPE_RESULT);
@@ -75,6 +76,7 @@
if( element.getSpecificType().equals(PollThread.POLL_THREAD_ABORTED)) return getErrorImage();
if( element.getSpecificType().equals(PollThread.POLL_THREAD_TIMEOUT)) return getErrorImage();
if( element.getSpecificType().equals(PollThread.POLL_THREAD_EXCEPTION)) return getErrorImage();
+ if( element.getSpecificType().equals(PollThread.POLLER_NOT_FOUND)) return getErrorImage();
if( element.getSpecificType().equals(PollThread.SUCCESS)) {
if( expected == IServerStatePoller.SERVER_UP)
return getStartedImage();
@@ -117,6 +119,7 @@
if( element.getSpecificType().equals(PollThread.POLL_THREAD_EXCEPTION)) return "Failure: " + element.getProperty(PollThread.POLL_THREAD_EXCEPTION_MESSAGE);
if( element.getSpecificType().equals(PollThread.SUCCESS)) return expectedString + " succeeded";
if( element.getSpecificType().equals(PollThread.FAILURE)) return expectedString + " failed";
+ if( element.getSpecificType().equals(PollThread.POLLER_NOT_FOUND)) return expectedString + " failed. Poller not found";
}
if( element.getSpecificType().equals(JMXPoller.TYPE_TERMINATED)) return "All processes have been terminated";
18 years, 4 months
JBoss Tools SVN: r2852 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/attributes.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-08-02 12:45:03 -0400 (Thu, 02 Aug 2007)
New Revision: 2852
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/attributes/IServerPollingAttributes.java
Log:
A constant needed to be changed. Poor little constant. They're not used to changing.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/attributes/IServerPollingAttributes.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/attributes/IServerPollingAttributes.java 2007-08-02 16:43:47 UTC (rev 2851)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/attributes/IServerPollingAttributes.java 2007-08-02 16:45:03 UTC (rev 2852)
@@ -28,7 +28,7 @@
public static final String TIMEOUT_BEHAVIOR = "org.jboss.ide.eclipse.as.core.server.attributes.timeoutBehavior";
public static final String STARTUP_POLLER_KEY = "org.jboss.ide.eclipse.as.core.server.attributes.startupPollerKey";
public static final String SHUTDOWN_POLLER_KEY = "org.jboss.ide.eclipse.as.core.server.attributes.shutdownPollerKey";
- public static final String DEFAULT_POLLER = "org.jboss.ide.eclipse.as.core.runtime.server.twiddlepoller";
+ public static final String DEFAULT_POLLER = "org.jboss.ide.eclipse.as.core.runtime.server.JMXPoller";
public static final boolean TIMEOUT_ABORT = true;
public static final boolean TIMEOUT_IGNORE = false;
18 years, 4 months
JBoss Tools SVN: r2851 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-08-02 12:43:47 -0400 (Thu, 02 Aug 2007)
New Revision: 2851
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ExtensionTableViewer.java
Log:
lazy loading of top level elements. (all have children. for now)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ExtensionTableViewer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ExtensionTableViewer.java 2007-08-02 15:31:21 UTC (rev 2850)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ExtensionTableViewer.java 2007-08-02 16:43:47 UTC (rev 2851)
@@ -223,6 +223,7 @@
}
public boolean hasChildren(Object element) {
+ if( element instanceof ServerViewProvider ) return true;
return getChildren(element).length > 0 ? true : false;
}
18 years, 4 months
JBoss Tools SVN: r2850 - in trunk/documentation/GettingStartedGuide/docs/userguide/en: modules and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: sabrashevich
Date: 2007-08-02 11:31:21 -0400 (Thu, 02 Aug 2007)
New Revision: 2850
Modified:
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/EclipseConProjectStructure.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamGenSetup.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/GetStartSeamGen.xml
Log:
http://jira.jboss.org/jira/browse/EXIN-353 added new screenshots, updated textual context
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/EclipseConProjectStructure.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamGenSetup.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/GetStartSeamGen.xml
===================================================================
--- trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/GetStartSeamGen.xml 2007-08-02 15:22:22 UTC (rev 2849)
+++ trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/GetStartSeamGen.xml 2007-08-02 15:31:21 UTC (rev 2850)
@@ -10,7 +10,7 @@
</keywordset>
</chapterinfo>
- <title>Ajax CRUD-application with Seam and Rich Faces</title>
+ <title>Getting Started with Seam Gen</title>
<para>In this chapter we will see how easy it is to build Seam applications and integrate
them with Ajax4jsf and Rich Faces. We will bootstrap the application using Seam Gen which is
a CRUD application generator. Seam Gen can be used from either the command line or via an
@@ -59,7 +59,7 @@
<note>
<title>Note:</title>
<para>If this is the first time you run
-Seam Gen a file dialog will be shown. In this you need to select <seam>/seam-gen/build.xml
+Seam Gen a file dialog will be shown. In this diallog you need to select <seam>/seam-gen/build.xml
so the plugin knows which seam-gen to use.</para>
</note>
<para></para>
@@ -85,7 +85,7 @@
<tbody>
<row>
<entry>Project</entry>
- <entry>EclipseCon</entry>
+ <entry>SeamSample</entry>
</row>
<row>
<entry>Seam project workspace</entry>
@@ -112,11 +112,11 @@
"Yes" to create a WTP Database connection that connects to the default HSQL DB
instance that we have set up. If you are using any other database then set up the
appropriate database settings in the Seam Gen setup window.</para>
- <para>At the end of this step you will see an Eclipse project called "EclipseCon"
+ <para>At the end of this step you will see an Eclipse project called "SeamSample"
as shown below. This project has all the necessary elements required to deploy
a Seam application.</para>
<figure>
-<title>EclipseCon Project Structure</title>
+<title>SeamSample Project Structure</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/EclipseConProjectStructure.png"/>
@@ -125,7 +125,7 @@
</figure>
<itemizedlist continuation="continues">
<listitem>Start the application server. Open your favorite browser and point to the
-following URL http://localhost:8080/EclipseCon. You should see the following page:</listitem>
+following URL http://localhost:8080/SeamSample. You should see the following page:</listitem>
</itemizedlist>
<figure>
<title>Created Project</title>
18 years, 4 months