JBoss Tools SVN: r39070 - in trunk/documentation/whatsnew/seam/images: 3.3.0.Beta1 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-02-23 14:39:08 -0500 (Thu, 23 Feb 2012)
New Revision: 39070
Added:
trunk/documentation/whatsnew/seam/images/3.3.0.Beta1/
trunk/documentation/whatsnew/seam/images/3.3.0.Beta1/seam23.png
Log:
https://issues.jboss.org/browse/JBIDE-11022 Seam Component N&N
Added: trunk/documentation/whatsnew/seam/images/3.3.0.Beta1/seam23.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/seam/images/3.3.0.Beta1/seam23.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
12 years, 4 months
JBoss Tools SVN: r39069 - trunk/documentation/whatsnew/seam.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-02-23 14:38:54 -0500 (Thu, 23 Feb 2012)
New Revision: 39069
Added:
trunk/documentation/whatsnew/seam/seam-news-3.3.0.Beta1.html
Log:
https://issues.jboss.org/browse/JBIDE-11022 Seam Component N&N
Added: trunk/documentation/whatsnew/seam/seam-news-3.3.0.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/seam/seam-news-3.3.0.Beta1.html (rev 0)
+++ trunk/documentation/whatsnew/seam/seam-news-3.3.0.Beta1.html 2012-02-23 19:38:54 UTC (rev 39069)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css" />
+<title>Seam tools 3.3.0.Beta1 What's New</title>
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-17645367-5']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+</script></head>
+<body>
+<h1>Seam tools 3.3.0.Beta1 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a
+ href="../forge/forge-news-3.3.0.Beta1.html">Forge Tools ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>Seam 2.3</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
+ <p>JBoss Tools now support Seam 2.3. It includes Seam wizards, Seam project facet, runtime detection, maven integration, components.xml file editor and all the other features which are available for Seam 1 - 2.2.</p>
+ <img src="images/3.3.0.Beta1/seam23.png"/>
+ <p><small><a href="https://jira.jboss.org/browse/JBIDE-10665">Related Jira</a></small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
\ No newline at end of file
Property changes on: trunk/documentation/whatsnew/seam/seam-news-3.3.0.Beta1.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 4 months
JBoss Tools SVN: r39068 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-02-23 13:12:52 -0500 (Thu, 23 Feb 2012)
New Revision: 39068
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ProjectReadyWizard.java
Log:
JBIDE-11038 Sometimes Show Quick Fix dialog is blocked
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ProjectReadyWizard.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ProjectReadyWizard.java 2012-02-23 16:55:28 UTC (rev 39067)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ProjectReadyWizard.java 2012-02-23 18:12:52 UTC (rev 39068)
@@ -14,6 +14,7 @@
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.internal.ide.IDEInternalWorkbenchImages;
import org.jboss.tools.project.examples.Messages;
import org.jboss.tools.project.examples.ProjectExamplesActivator;
@@ -61,8 +62,15 @@
}
boolean showQuickFix = readyPage.getShowQuickFix().isEnabled() && readyPage.getShowQuickFix().getSelection();
if (showQuickFix) {
- Dialog dialog = new MarkerDialog(getShell(), projectExamples);
- dialog.open();
+ Display.getCurrent().asyncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ Dialog dialog = new MarkerDialog(getShell(), projectExamples);
+ dialog.open();
+ }
+ });
+
}
return true;
}
12 years, 4 months
JBoss Tools SVN: r39067 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-02-23 11:55:28 -0500 (Thu, 23 Feb 2012)
New Revision: 39067
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
Log:
Fix archetypes priority
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3.... 2012-02-23 15:13:36 UTC (rev 39066)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3.... 2012-02-23 16:55:28 UTC (rev 39067)
@@ -1,10 +1,15 @@
<projects>
-
- <project>
+ <!-----------------------------------------------------------------------------
+ Beware : the project name MUST NOT be changed. It's referenced in JBoss Central
+ ------------------------------------------------------------------------------->
+
+ <!-- Java EE Web Project -->
+ <project>
<category>JBoss Maven Archetypes</category>
<name>jboss-javaee6-webapp</name>
<included-projects>jboss-javaee6-webapp</included-projects>
<shortDescription>Java EE Web Project</shortDescription>
+ <priority>1</priority>
<description>
This is your project! It's a sample, deployable Maven 3 project to help you get your foot in the door developing with Java EE 6 on JBoss AS 7.
This project is setup to allow you to create a compliant Java EE 6 application using JSF 2.0, CDI 1.0, EJB 3.1, JPA 2.0 and Bean Validation 1.0.
@@ -57,12 +62,13 @@
<tags>wizard</tags>
<icon path="icons/newwebprj_wiz.gif" />
</project>
- <!-- Temporary EE6 project - replace with Pete's new archetype when it's ready -->
+ <!-- Java EE Project -->
<project>
<category>JBoss Maven Archetypes</category>
<name>multi-javaee6-archetype</name>
<included-projects>multi-javaee6-archetype</included-projects>
<shortDescription>Java EE Project</shortDescription>
+ <priority>2</priority>
<description>An archetype that generates a starter Java EE 6 webapp project for JBoss AS 7 / EAP 6. The project is an EAR, with an EJB-JAR and WAR</description>
<size>13806</size>
<url/>
@@ -109,12 +115,13 @@
<tags>wizard</tags>
<icon path="icons/ear-wiz-icon.gif" />
</project>
- <!-- Temporary POH5 project - replace with Pete's new archetype when it's ready -->
- <project>
+ <!-- HTML5 project -->
+ <project>
<category>JBoss Maven Archetypes</category>
<name>jboss-javaee6-poh5-archetype</name>
<included-projects>jboss-javaee6-poh5</included-projects>
<shortDescription>HTML5 Project</shortDescription>
+ <priority>3/priority>
<description>An archetype that generates a Java EE 6 HTML5 Mobile Webapp project for JBoss AS 7 / EAP 6</description>
<size>165567</size>
<url/>
@@ -167,6 +174,7 @@
<name>richfaces-archetype-simpleapp</name>
<included-projects>richfaces-archetype-simpleapp</included-projects>
<shortDescription>RichFaces Project</shortDescription>
+ <priority>4</priority>
<description>An archetype that generates a simple Richfaces application</description>
<size>165567</size>
<url/>
@@ -225,6 +233,7 @@
<name>spring-mvc-webapp</name>
<included-projects>spring-mvc-webapp</included-projects>
<shortDescription>Spring MVC Project</shortDescription>
+ <priority>5</priority>
<description>An archetype that generates a starter Spring MVC application with Java EE persistence settings (server bootstrapped JPA, JTA transaction management) for JBoss AS7 / EAP 6</description>
<size>165567</size>
<url/>
@@ -268,11 +277,12 @@
<tags>wizard</tags>
<icon path="icons/spring_wiz.gif" />
</project>
-
+ <!-- GWT/Errai Project -->
<project>
<category>JBoss Maven Archetypes</category>
<name>gwt-webapp</name>
<included-projects>gwt-webapp</included-projects>
+ <priority>6</priority>
<shortDescription>GWT Web Project</shortDescription>
<description>An archetype that generates a starter GWT application</description>
<size>165567</size>
12 years, 4 months
JBoss Tools SVN: r39066 - branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-23 10:13:36 -0500 (Thu, 23 Feb 2012)
New Revision: 39066
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java
Log:
JBIDE-10994 - to branch beta1
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-02-23 14:54:13 UTC (rev 39065)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-02-23 15:13:36 UTC (rev 39066)
@@ -11,6 +11,7 @@
package org.jboss.tools.openshift.express.internal.ui.viewer;
import java.util.ArrayList;
+import java.util.HashMap;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -55,12 +56,14 @@
// Keep track of what's loading and what's finished
private ArrayList<IUser> loadedUsers = new ArrayList<IUser>();
private ArrayList<IUser> loadingUsers = new ArrayList<IUser>();
+ private HashMap<IUser, OpenShiftException> errors = new HashMap<IUser, OpenShiftException>();
@Override
public Object[] getElements(final Object parentElement) {
// A refresh on the whole model... clear our cache
loadedUsers.clear();
loadingUsers.clear();
+ errors.clear();
if (parentElement instanceof IWorkspaceRoot) {
return UserModel.getDefault().getUsers();
}
@@ -82,22 +85,35 @@
// return a stub object that says loading...
return new Object[] { new LoadingStub() };
}
+ OpenShiftException ose = errors.get((IUser)parentElement);
+ if( ose != null ) {
+ return new Object[]{ose};
+ }
}
- return getChildrenFor(parentElement, false);
+ return getChildrenForElement_LogException(parentElement, false);
}
// Force the children to load completely
private void getChildrenFor(Object[] parentElements) {
for (int i = 0; i < parentElements.length; i++) {
- getChildrenFor(parentElements[i], true);
+ getChildrenForElement_LogException(parentElements[i], true);
}
}
// Get the children without the protection of a "loading..." situation
- private Object[] getChildrenFor(Object parentElement, boolean recurse) {
+ private Object[] getChildrenForElement_LogException(Object parentElement, boolean recurse) {
+ try {
+ return getChildrenForElement(parentElement, recurse);
+ } catch (OpenShiftException e) {
+ Logger.error("Unable to retrieve OpenShift Express information", e);
+ }
+ return new Object[0];
+ }
+
+ private Object[] getChildrenForElement(Object parentElement, boolean recurse) throws OpenShiftException {
// .... the actual work is done here...
Object[] children = new Object[0];
- try {
+// try {
if (parentElement instanceof OpenShiftExpressConsoleContentCategory) {
IUser user = ((OpenShiftExpressConsoleContentCategory) parentElement).getUser();
children = new Object[] { user };
@@ -115,9 +131,9 @@
if (recurse) {
getChildrenFor(children);
}
- } catch (OpenShiftException e) {
- Logger.error("Unable to retrieve OpenShift Express information", e);
- }
+// } catch (OpenShiftException e) {
+// Logger.error("Unable to retrieve OpenShift Express information", e);
+// }
return children;
}
@@ -130,10 +146,14 @@
monitor.worked(1);
// Get the actual children, with the delay
loadingUsers.add(user);
- getChildrenFor(user, true);
+ try {
+ getChildrenForElement(user, true);
+ } catch(OpenShiftException e) {
+ errors.put(user, e);
+ }
loadedUsers.add(user);
loadingUsers.remove(user);
- refreshViewerObject(user);
+ refreshViewerObject(user);
monitor.done();
return Status.OK_STATUS;
}
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java 2012-02-23 14:54:13 UTC (rev 39065)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java 2012-02-23 15:13:36 UTC (rev 39066)
@@ -8,19 +8,22 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer;
+package org.jboss.tools.openshift.express.internal.ui.viewer;
import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.StyledString;
import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.viewer.OpenShiftExpressConsoleContentProvider.LoadingStub;
import com.openshift.express.client.IApplication;
import com.openshift.express.client.IEmbeddableCartridge;
import com.openshift.express.client.IUser;
+import com.openshift.express.client.OpenShiftException;
/**
* @author Xavier Coulon
@@ -65,7 +68,9 @@
if (element instanceof LoadingStub) {
return OpenShiftUIActivator.getDefault().createImage("systemprocess.gif");
}
-
+ if (element instanceof OpenShiftException ) {
+ return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
+ }
return null;
}
@@ -104,6 +109,9 @@
if (element instanceof LoadingStub) {
return new StyledString("Loading...");
}
+ if (element instanceof OpenShiftException ) {
+ return new StyledString( ((OpenShiftException)element).getMessage());
+ }
return null;
}
12 years, 4 months
JBoss Tools SVN: r39065 - trunk/documentation/whatsnew/ws.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-02-23 09:54:13 -0500 (Thu, 23 Feb 2012)
New Revision: 39065
Modified:
trunk/documentation/whatsnew/ws/ws-news-1.2.2.Beta1.html
Log:
Adding JAXRS Tooling news - fixed jira link
Modified: trunk/documentation/whatsnew/ws/ws-news-1.2.2.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/ws/ws-news-1.2.2.Beta1.html 2012-02-23 14:45:13 UTC (rev 39064)
+++ trunk/documentation/whatsnew/ws/ws-news-1.2.2.Beta1.html 2012-02-23 14:54:13 UTC (rev 39065)
@@ -62,7 +62,7 @@
</pre>
<p>As defined in the JAX-RS 1.1 specification, the web.xml approach takes precedence over the annotation-based configuration.</p>
<img src="./images/JAXRS-ApplicationPath.png"/>
- <p><small><a href="https://jira.jboss.org/browse/JBIDE-10609">Related Jira</a></small></p>
+ <p><small><a href="https://issues.jboss.org/browse/JBIDE-10287">Related Jira</a></small></p>
</td>
</tr>
</tr>
12 years, 4 months
JBoss Tools SVN: r39064 - branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-23 09:45:13 -0500 (Thu, 23 Feb 2012)
New Revision: 39064
Modified:
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java
Log:
JBIDE-10932 to beta1
Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java 2012-02-23 14:43:55 UTC (rev 39063)
+++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java 2012-02-23 14:45:13 UTC (rev 39064)
@@ -16,6 +16,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
+import java.util.List;
import javax.management.InstanceNotFoundException;
import javax.management.MBeanServerConnection;
@@ -134,16 +135,36 @@
server.removeServerListener(listener);
}
+ private IModule findRootModule(IServer server, IModule module) {
+ IModule[] rootMods = null;
+ try {
+ rootMods = server.getRootModules(module, new NullProgressMonitor());
+ } catch( CoreException ce ) {
+ return module; // No need to log this
+ }
+ if( rootMods == null || rootMods.length == 0 )
+ return module;
+ List<IModule> serverHas = Arrays.asList(server.getModules());
+ for( int i = 0; i < rootMods.length; i++ ) {
+ if( serverHas.contains(rootMods[i]))
+ // Grab the first parent module that's already on the server
+ return rootMods[i];
+ }
+ return module;
+ }
+
//TODO: the waiting/timeout logic in here should be done for waitJMX too.
//TODO: should return true for succss or false if timeout so upper layer can report it.
- protected void waitJBoss7(final IServer server, final IModule module) {
+ protected void waitJBoss7(final IServer server, final IModule module2) {
+ IModule rootModule = findRootModule(server, module2);
try {
JBoss7Server jbossServer = ServerConverter.checkedGetJBossServer(server, JBoss7Server.class);
IJBoss7ManagerService service = JBoss7ManagerUtil.getService(server);
- IPath deployPath = PublishUtil.getDeployPath(new IModule[]{module}, jbossServer);
+ IPath deployPath = PublishUtil.getDeployPath(new IModule[]{rootModule}, jbossServer);
long time = new Date().getTime();
long endTime = time + getMaxDelay();
boolean waitedOnce = false;
+
while (new Date().getTime() < endTime) { // no need to keep doing this if timed out or server stopping/stopped but not sure how to avoid race condition.
AS7ManagementDetails details = new AS7ManagementDetails(server);
boolean done = false;
@@ -157,7 +178,9 @@
}
try {
if(!waitedOnce) {
- JBossServerUIPlugin.log(new Status(IStatus.INFO, JBossServerUIPlugin.PLUGIN_ID, "Module " + module.getName() + " on " + server.getName() + " not ready to be shown in web browser. Waiting...", null));
+ JBossServerUIPlugin.log(new Status(
+ IStatus.INFO, JBossServerUIPlugin.PLUGIN_ID,
+ "Module " + rootModule.getName() + " on " + server.getName() + " not ready to be shown in web browser. Waiting...", null));
}
waitedOnce = true;
Thread.sleep(2000);
@@ -169,7 +192,7 @@
IStatus.WARNING,
JBossServerCorePlugin.PLUGIN_ID,
NLS.bind(
- "Error occurred while waiting for " + module.getName() + " to start on " + server.getName(),
+ "Error occurred while waiting for " + rootModule.getName() + " to start on " + server.getName(),
server.getName()), e);
JBossServerUIPlugin.log(s.getMessage(), e);
}
12 years, 4 months
JBoss Tools SVN: r39063 - in trunk/documentation/whatsnew/ws: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-02-23 09:43:55 -0500 (Thu, 23 Feb 2012)
New Revision: 39063
Added:
trunk/documentation/whatsnew/ws/images/JAXRS-ApplicationPath.png
Modified:
trunk/documentation/whatsnew/ws/ws-news-1.2.2.Beta1.html
Log:
Adding JAXRS Tooling news
Added: trunk/documentation/whatsnew/ws/images/JAXRS-ApplicationPath.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/ws/images/JAXRS-ApplicationPath.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/documentation/whatsnew/ws/ws-news-1.2.2.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/ws/ws-news-1.2.2.Beta1.html 2012-02-23 14:33:02 UTC (rev 39062)
+++ trunk/documentation/whatsnew/ws/ws-news-1.2.2.Beta1.html 2012-02-23 14:43:55 UTC (rev 39063)
@@ -30,6 +30,52 @@
<tr>
<td colspan="2">
<hr/>
+ <h3>JAX-RS Tooling</h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+
+ <td valign="top" align="right"><a name="itemname1" id="itemname1"></a><b>Support for @ApplicationPath and web.xml overwrite</b></td>
+ <td valign="top">
+ <p>Support for javax.ws.rs.core.Application subclass annotated with @ApplicationPath is now available, along with support for standard JEE6 overwrite in the web app deployment descriptor. The JAX-RS Tooling will include the @ApplicationPath annotation value in your endpoints' URI Path Template if you provide a JAX-RS Application class as below:
+ <pre>
+ @ApplicationPath("/mypath")
+ public class MyApplication extends Application {
+ ...
+ }
+ </pre></p>
+ <p>Or if you define the application's root path for the JAX-RS endpoint in the web application's web.xml in the one of the following manners:</p>
+ <pre>
+ <servlet-mapping>
+ <servlet-name>com.acme.MyApplication</servlet-name>
+ <url-pattern>/hello/*</url-pattern>
+ </servlet-mapping>
+ </pre>
+ <p>or</p>
+ <pre>
+ <servlet-mapping>
+ <servlet-name>javax.ws.rs.core.Application</servlet-name>
+ <url-pattern>/hello/*</url-pattern>
+ </servlet-mapping>
+ </pre>
+ <p>As defined in the JAX-RS 1.1 specification, the web.xml approach takes precedence over the annotation-based configuration.</p>
+ <img src="./images/JAXRS-ApplicationPath.png"/>
+ <p><small><a href="https://jira.jboss.org/browse/JBIDE-10609">Related Jira</a></small></p>
+ </td>
+ </tr>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
<h3>Web Service Tester</h3>
<hr/>
</td>
@@ -37,8 +83,7 @@
<tr>
- <td valign="top" align="right"><a name="itemname1"
- id="itemname1"></a><b>Better Tooling Integration - JAX-RS</b></td>
+ <td valign="top" align="right"><a name="itemname2" id="itemname2"></a><b>Better Tooling Integration - JAX-RS</b></td>
<td valign="top">
<p>We recently had an opportunity to add some better shortcuts to get to the Web Service Tester from common access points in the UI.</p>
@@ -70,8 +115,7 @@
</tr>
<tr>
- <td valign="top" align="right"><a name="itemname2"
- id="itemname2"></a><b>Partial WSDL file integration</b></td>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Partial WSDL file integration</b></td>
<td valign="top">
<p>In addition, you can now right-click on a WSDL and select Web Services -> Test in JBoss Web Service Tester. This action does two things:</p>
<ol><li>If the Web Service Tester isn't open, it will open the view in the current perspective.</li>
@@ -91,8 +135,7 @@
</tr>
<tr>
- <td valign="top" align="right"><a name="itemname3"
- id="itemname3"></a><b>Better Test History Tracking</b></td>
+ <td valign="top" align="right"><a name="itemname4" id="itemname4"></a><b>Better Test History Tracking</b></td>
<td valign="top">
<p>Whereas before we would only remember the URLs for the services tested in the current session, we now remember much more for each successful test:</p>
<ul><li>The Method (JAX-WS or JAX-RS method name)</li>
12 years, 4 months
JBoss Tools SVN: r39062 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-23 09:33:02 -0500 (Thu, 23 Feb 2012)
New Revision: 39062
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java
Log:
JBIDE-10932 to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java 2012-02-23 14:14:33 UTC (rev 39061)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java 2012-02-23 14:33:02 UTC (rev 39062)
@@ -16,6 +16,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
+import java.util.List;
import javax.management.InstanceNotFoundException;
import javax.management.MBeanServerConnection;
@@ -134,16 +135,36 @@
server.removeServerListener(listener);
}
+ private IModule findRootModule(IServer server, IModule module) {
+ IModule[] rootMods = null;
+ try {
+ rootMods = server.getRootModules(module, new NullProgressMonitor());
+ } catch( CoreException ce ) {
+ return module; // No need to log this
+ }
+ if( rootMods == null || rootMods.length == 0 )
+ return module;
+ List<IModule> serverHas = Arrays.asList(server.getModules());
+ for( int i = 0; i < rootMods.length; i++ ) {
+ if( serverHas.contains(rootMods[i]))
+ // Grab the first parent module that's already on the server
+ return rootMods[i];
+ }
+ return module;
+ }
+
//TODO: the waiting/timeout logic in here should be done for waitJMX too.
//TODO: should return true for succss or false if timeout so upper layer can report it.
- protected void waitJBoss7(final IServer server, final IModule module) {
+ protected void waitJBoss7(final IServer server, final IModule module2) {
+ IModule rootModule = findRootModule(server, module2);
try {
JBoss7Server jbossServer = ServerConverter.checkedGetJBossServer(server, JBoss7Server.class);
IJBoss7ManagerService service = JBoss7ManagerUtil.getService(server);
- IPath deployPath = PublishUtil.getDeployPath(new IModule[]{module}, jbossServer);
+ IPath deployPath = PublishUtil.getDeployPath(new IModule[]{rootModule}, jbossServer);
long time = new Date().getTime();
long endTime = time + getMaxDelay();
boolean waitedOnce = false;
+
while (new Date().getTime() < endTime) { // no need to keep doing this if timed out or server stopping/stopped but not sure how to avoid race condition.
AS7ManagementDetails details = new AS7ManagementDetails(server);
boolean done = false;
@@ -157,7 +178,9 @@
}
try {
if(!waitedOnce) {
- JBossServerUIPlugin.log(new Status(IStatus.INFO, JBossServerUIPlugin.PLUGIN_ID, "Module " + module.getName() + " on " + server.getName() + " not ready to be shown in web browser. Waiting...", null));
+ JBossServerUIPlugin.log(new Status(
+ IStatus.INFO, JBossServerUIPlugin.PLUGIN_ID,
+ "Module " + rootModule.getName() + " on " + server.getName() + " not ready to be shown in web browser. Waiting...", null));
}
waitedOnce = true;
Thread.sleep(2000);
@@ -169,7 +192,7 @@
IStatus.WARNING,
JBossServerCorePlugin.PLUGIN_ID,
NLS.bind(
- "Error occurred while waiting for " + module.getName() + " to start on " + server.getName(),
+ "Error occurred while waiting for " + rootModule.getName() + " to start on " + server.getName(),
server.getName()), e);
JBossServerUIPlugin.log(s.getMessage(), e);
}
12 years, 4 months
JBoss Tools SVN: r39061 - branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-02-23 09:14:33 -0500 (Thu, 23 Feb 2012)
New Revision: 39061
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.1.1-SNAPSHOT.jar
Log:
[JBIDE-10966] updated to latest client library
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.1.1-SNAPSHOT.jar
===================================================================
(Binary files differ)
12 years, 4 months