JBoss Tools SVN: r44580 - trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-10-18 10:46:13 -0400 (Thu, 18 Oct 2012)
New Revision: 44580
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/CocoaUIEnhancer.java
Log:
https://issues.jboss.org/browse/JBIDE-12829 : BrowserSim disappearing (see video)
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/CocoaUIEnhancer.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/CocoaUIEnhancer.java 2012-10-18 12:15:55 UTC (rev 44579)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/CocoaUIEnhancer.java 2012-10-18 14:46:13 UTC (rev 44580)
@@ -89,8 +89,14 @@
// Connect the given IAction objects to the actionProce method.
//
Object target = new Object() {
- @SuppressWarnings( "unused" )
- int actionProc( int id, int sel, int arg0 ) {
+ /** 32-bit version of the callback*/
+ @SuppressWarnings( "unused" )
+ int actionProc(int id, int sel, int arg0) {
+ return (int) actionProc((long) id, (long) sel, (long) arg0);
+ }
+
+ /** 64-bit version of the callback*/
+ long actionProc(long id, long sel, long arg0) {
if ( sel == sel_aboutMenuItemSelected_ ) {
aboutAction.run();
} else if ( sel == sel_preferencesMenuItemSelected_ ) {
12 years, 2 months
- 1
- 0
JBoss Tools SVN: r44579 - branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-10-18 08:15:55 -0400 (Thu, 18 Oct 2012)
New Revision: 44579
Modified:
branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java
Log:
[JBIDE-12864] using connection-url instead of username when looking up connection
Modified: branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java 2012-10-18 12:05:28 UTC (rev 44578)
+++ branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java 2012-10-18 12:15:55 UTC (rev 44579)
@@ -10,6 +10,10 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.action;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.viewers.ITreeSelection;
import org.eclipse.swt.widgets.Display;
@@ -40,18 +44,29 @@
if (selection != null && selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof IApplication) {
try {
final IApplication application = (IApplication) treeSelection.getFirstElement();
- final Connection user = ConnectionsModel.getDefault().getConnectionByUrl(application.getDomain().getUser().getRhlogin());
- EmbedCartridgeWizard wizard = new EmbedCartridgeWizard(application, user);
+ final Connection connection = getConnection(application);
+ EmbedCartridgeWizard wizard = new EmbedCartridgeWizard(application, connection);
int result = WizardUtils.openWizardDialog(wizard, Display.getCurrent().getActiveShell());
if(result == Dialog.OK) {
RefreshViewerJob.refresh(viewer);
}
} catch (OpenShiftException e) {
Logger.error("Failed to edit cartridges", e);
+ } catch (URISyntaxException e) {
+ Logger.error("Failed to edit cartridges", e);
+ } catch (UnsupportedEncodingException e) {
+ Logger.error("Failed to edit cartridges", e);
}
-
}
}
-
+ private Connection getConnection(final IApplication application) throws UnsupportedEncodingException, OpenShiftException, URISyntaxException {
+ Connection tmpConnection = new Connection(new URI(application.getDomain().getUser().getRhlogin()), null);
+ final Connection existingConnection = ConnectionsModel.getDefault().getConnectionByUrl(tmpConnection.toURLString());
+ if (existingConnection == null) {
+ return tmpConnection;
+ } else {
+ return existingConnection;
+ }
+ }
}
12 years, 2 months
- 1
- 0
JBoss Tools SVN: r44578 - in branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal: core/connection and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-10-18 08:05:28 -0400 (Thu, 18 Oct 2012)
New Revision: 44578
Modified:
branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/Connection.java
branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionUtils.java
branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionsModel.java
branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/util/UrlUtils.java
branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java
Log:
[JBIDE-12855] fixed lookup, replaced URL by URI
Modified: branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-10-18 10:58:11 UTC (rev 44577)
+++ branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-10-18 12:05:28 UTC (rev 44578)
@@ -12,6 +12,7 @@
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
+import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -129,14 +130,14 @@
*/
public static IApplication getApplication(IServer server) {
final String appName = getExpressApplicationName(server);
- final String userName = getExpressUsername(server);
+ final String connectionUrl = getExpressConnectionUrl(server);
try {
- final Connection ud = ConnectionsModel.getDefault().getConnectionByUrl(userName);
+ final Connection ud = ConnectionsModel.getDefault().getConnectionByUrl(connectionUrl);
if (ud != null) {
return ud.getApplicationByName(appName); // May be long running
}
} catch (OpenShiftException e) {
- Logger.error(NLS.bind("Failed to retrieve application ''{0}'' from user ''{1}}'", appName, userName), e);
+ Logger.error(NLS.bind("Failed to retrieve application ''{0}'' at url ''{1}}'", appName, connectionUrl), e);
}
return null;
}
@@ -172,7 +173,7 @@
connectionValue = ConnectionUtils.getUrlForUsername(username);
} catch (UnsupportedEncodingException e) {
OpenShiftUIActivator.log(NLS.bind("Could not get connection url for user {0}", username), e);
- } catch (MalformedURLException e) {
+ } catch (URISyntaxException e) {
OpenShiftUIActivator.log(NLS.bind("Could not get connection url for user {0}", username), e);
}
}
@@ -449,8 +450,8 @@
public static IApplication findApplicationForServer(IServerAttributes server) {
try {
- String user = ExpressServerUtils.getExpressUsername(server);
- Connection connection = ConnectionsModel.getDefault().getConnectionByUrl(user);
+ String connectionUrl = ExpressServerUtils.getExpressConnectionUrl(server);
+ Connection connection = ConnectionsModel.getDefault().getConnectionByUrl(connectionUrl);
String appName = ExpressServerUtils.getExpressApplicationName(server);
IApplication app = connection == null ? null : connection.getApplicationByName(appName);
return app;
Modified: branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/Connection.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/Connection.java 2012-10-18 10:58:11 UTC (rev 44577)
+++ branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/Connection.java 2012-10-18 12:05:28 UTC (rev 44578)
@@ -15,6 +15,7 @@
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.SocketTimeoutException;
+import java.net.URI;
import java.net.URL;
import java.util.List;
@@ -72,7 +73,7 @@
this.prompter = prompter;
}
- public Connection(URL url, ICredentialsPrompter prompter) throws MalformedURLException, UnsupportedEncodingException {
+ public Connection(URI url, ICredentialsPrompter prompter) throws UnsupportedEncodingException {
UrlPortions portions = UrlUtils.toPortions(url);
this.username = portions.getUsername();
this.password = portions.getPassword();
Modified: branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionUtils.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionUtils.java 2012-10-18 10:58:11 UTC (rev 44577)
+++ branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionUtils.java 2012-10-18 12:05:28 UTC (rev 44578)
@@ -11,7 +11,7 @@
package org.jboss.tools.openshift.express.internal.core.connection;
import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
+import java.net.URISyntaxException;
import org.jboss.tools.openshift.express.internal.core.util.UrlUtils;
import org.jboss.tools.openshift.express.internal.core.util.UrlUtils.UrlPortions;
@@ -30,7 +30,7 @@
// inhibit instantiation
}
- public static String getUrlForUsername(String username) throws UnsupportedEncodingException, MalformedURLException {
+ public static String getUrlForUsername(String username) throws UnsupportedEncodingException, URISyntaxException {
UrlPortions portions = UrlUtils.toPortions(getDefaultHostUrl());
return UrlUtils.getUrlFor(username, portions.getHost(), portions.getProtocol());
}
Modified: branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionsModel.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionsModel.java 2012-10-18 10:58:11 UTC (rev 44577)
+++ branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionsModel.java 2012-10-18 12:05:28 UTC (rev 44578)
@@ -11,8 +11,8 @@
package org.jboss.tools.openshift.express.internal.core.connection;
import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -163,10 +163,10 @@
for (int i = 0; i < connections.length; i++) {
Connection connection = null;
try {
- URL connectionUrl = new URL(connections[i]);
+ URI connectionUrl = new URI(connections[i]);
connection = new Connection(connectionUrl, new CredentialsPrompter());
addConnection(connection);
- } catch (MalformedURLException e) {
+ } catch (URISyntaxException e) {
OpenShiftUIActivator.log(NLS.bind("Could not add connection for {0}.", connections[i]), e);
} catch (UnsupportedEncodingException e) {
OpenShiftUIActivator.log(NLS.bind("Could not add connection for {0}.", connections[i]), e);
Modified: branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/util/UrlUtils.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/util/UrlUtils.java 2012-10-18 10:58:11 UTC (rev 44577)
+++ branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/util/UrlUtils.java 2012-10-18 12:05:28 UTC (rev 44578)
@@ -11,8 +11,8 @@
package org.jboss.tools.openshift.express.internal.core.util;
import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URLDecoder;
import java.net.URLEncoder;
@@ -34,11 +34,11 @@
// inhibit instantiation
}
- public static UrlPortions toPortions(String url) throws UnsupportedEncodingException, MalformedURLException {
- return new UrlPortions(new URL(url));
+ public static UrlPortions toPortions(String url) throws UnsupportedEncodingException, URISyntaxException {
+ return new UrlPortions(new URI(url));
}
- public static UrlPortions toPortions(URL url) throws UnsupportedEncodingException {
+ public static UrlPortions toPortions(URI url) throws UnsupportedEncodingException {
return new UrlPortions(url);
}
@@ -49,7 +49,7 @@
private String password;
private String host;
- private UrlPortions(URL url) throws UnsupportedEncodingException {
+ private UrlPortions(URI url) throws UnsupportedEncodingException {
String userInfo = url.getUserInfo();
if (userInfo != null) {
String[] userInfos = url.getUserInfo().split(":");
@@ -61,7 +61,7 @@
}
}
this.host = url.getHost();
- this.protocol = url.getProtocol();
+ this.protocol = url.getScheme();
}
public String getUsername() {
Modified: branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java 2012-10-18 10:58:11 UTC (rev 44577)
+++ branches/jbosstools-4.0.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java 2012-10-18 12:05:28 UTC (rev 44578)
@@ -11,8 +11,8 @@
package org.jboss.tools.openshift.express.internal.ui.behaviour;
import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.Arrays;
import org.eclipse.core.resources.IFolder;
@@ -137,9 +137,9 @@
String connectionLabel = "";
if (!StringUtils.isEmpty(connectionUrl)) {
try {
- Connection connection = new Connection(new URL(connectionUrl), null);
+ Connection connection = new Connection(new URI(connectionUrl), null);
connectionLabel = connection.getUsername() + " - " + connection.getHost();
- } catch (MalformedURLException e) {
+ } catch (URISyntaxException e) {
OpenShiftUIActivator.log(NLS.bind("Could not get URL for connection {0}", connectionUrl), e);
} catch (UnsupportedEncodingException e) {
OpenShiftUIActivator.log(NLS.bind("Could not get URL for connection {0}", connectionUrl), e);
12 years, 2 months
- 1
- 0
JBoss Tools SVN: r44577 - in branches/jbosstools-4.0.0.Beta1/ws: plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-10-18 06:58:11 -0400 (Thu, 18 Oct 2012)
New Revision: 44577
Added:
branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/metamodel/
Modified:
branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/ResourceChangedBuildJob.java
branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsJavaElement.java
branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsMetamodel.java
branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsWebxmlApplication.java
branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/AbstractJaxrsElementValidatorDelegate.java
branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsJavaApplicationValidatorDelegate.java
branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java
branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/IJaxrsElement.java
branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilterTestCase.java
branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsApplicationValidatorTestCase.java
branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsHttpMethodValidatorTestCase.java
Log:
Fixed - JBIDE-12885
JAX-RS validator shouldn't care about binary classes
Modified: branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/ResourceChangedBuildJob.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/ResourceChangedBuildJob.java 2012-10-18 10:55:20 UTC (rev 44576)
+++ branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/ResourceChangedBuildJob.java 2012-10-18 10:58:11 UTC (rev 44577)
@@ -43,7 +43,7 @@
super("Incremental JAX-RS Metamodel build..."); //$NON-NLS-1$
this.event = event;
this.project = project;
- Logger.debug("Initiating an incremental JAX-RS Metamodel build after " + event); //$NON-NLS-1$
+ Logger.debug("Initiating a JAX-RS Metamodel build on project '" + project.getName() + "' after event " + event); //$NON-NLS-1$
}
@Override
Modified: branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsJavaElement.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsJavaElement.java 2012-10-18 10:55:20 UTC (rev 44576)
+++ branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsJavaElement.java 2012-10-18 10:58:11 UTC (rev 44577)
@@ -100,6 +100,14 @@
}
}
+ @Override
+ public boolean isBinary() {
+ if(this.javaElement == null) {
+ return true;
+ }
+ return this.javaElement.isBinary();
+ }
+
public Annotation getAnnotation(String className) {
return annotations.get(className);
}
Modified: branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsMetamodel.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsMetamodel.java 2012-10-18 10:55:20 UTC (rev 44576)
+++ branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsMetamodel.java 2012-10-18 10:58:11 UTC (rev 44577)
@@ -120,6 +120,12 @@
}
@Override
+ public boolean isBinary() {
+ // Metamodel is never binary
+ return false;
+ }
+
+ @Override
public EnumElementKind getElementKind() {
return EnumElementKind.METAMODEL;
}
Modified: branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsWebxmlApplication.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsWebxmlApplication.java 2012-10-18 10:55:20 UTC (rev 44576)
+++ branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsWebxmlApplication.java 2012-10-18 10:58:11 UTC (rev 44577)
@@ -3,6 +3,8 @@
import static org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.JaxrsElementDelta.F_APPLICATION_PATH_VALUE;
import org.eclipse.core.resources.IResource;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.jboss.tools.ws.jaxrs.core.jdt.EnumJaxrsClassname;
import org.jboss.tools.ws.jaxrs.core.metamodel.EnumElementCategory;
import org.jboss.tools.ws.jaxrs.core.metamodel.EnumElementKind;
@@ -28,6 +30,17 @@
this.javaClassName = applicationClassName;
}
+
+ @Override
+ public boolean isBinary() {
+ final IJavaProject javaProject = getMetamodel().getJavaProject();
+ IPackageFragmentRoot fragment = javaProject.getPackageFragmentRoot(webxmlResource);
+ if(fragment != null && fragment.exists() && fragment.isArchive()) {
+ return true;
+ }
+ return false;
+
+ }
/**
* @return true if the applicationClassName given in the constructor matches an existing Java Application in the
Modified: branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/AbstractJaxrsElementValidatorDelegate.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/AbstractJaxrsElementValidatorDelegate.java 2012-10-18 10:55:20 UTC (rev 44576)
+++ branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/AbstractJaxrsElementValidatorDelegate.java 2012-10-18 10:58:11 UTC (rev 44577)
@@ -15,6 +15,7 @@
import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.common.validation.TempMarkerManager;
import org.jboss.tools.ws.jaxrs.core.internal.utils.Logger;
+import org.jboss.tools.ws.jaxrs.core.metamodel.IJaxrsElement;
/**
* Abstract validator delegate with bits of generics for better readability in subclasses
@@ -22,7 +23,7 @@
* @author Xavier Coulon
*
*/
-public abstract class AbstractJaxrsElementValidatorDelegate<T extends Object> {
+public abstract class AbstractJaxrsElementValidatorDelegate<T extends IJaxrsElement> {
private final T element;
Modified: branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsJavaApplicationValidatorDelegate.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsJavaApplicationValidatorDelegate.java 2012-10-18 10:55:20 UTC (rev 44576)
+++ branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsJavaApplicationValidatorDelegate.java 2012-10-18 10:58:11 UTC (rev 44577)
@@ -43,7 +43,6 @@
final JaxrsJavaApplication application = getElement();
JaxrsMetamodelValidator.deleteJaxrsMarkers(application);
Logger.debug("Validating element {}", getElement());
-
final Annotation applicationPathAnnotation = application
.getAnnotation(EnumJaxrsClassname.APPLICATION_PATH.qualifiedName);
final IType appJavaElement = application.getJavaElement();
Modified: branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java 2012-10-18 10:55:20 UTC (rev 44576)
+++ branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java 2012-10-18 10:58:11 UTC (rev 44577)
@@ -113,15 +113,13 @@
Logger.debug("*** Validating project {} after files {} changed... ***", project.getName(),
changedFiles.toString());
final JaxrsMetamodel jaxrsMetamodel = JaxrsMetamodelLocator.get(project);
- final Set<IResource> allResources = completeValidationSet(jaxrsMetamodel, changedFiles.toArray(new IFile[changedFiles.size()]));
- for (IResource changedResource : allResources) {
- validate(reporter, changedResource, jaxrsMetamodel);
+ if(jaxrsMetamodel != null) { // prevent failure in case validation would be called at workbench startup, even before metamodel is built.
+ final Set<IResource> allResources = completeValidationSet(jaxrsMetamodel, changedFiles.toArray(new IFile[changedFiles.size()]));
+ for (IResource changedResource : allResources) {
+ validate(reporter, changedResource, jaxrsMetamodel);
+ }
}
}
- // trigger a full validation instead
- else {
- //validateAll(project, validationHelper, context, manager, reporter);
- }
} catch (CoreException e) {
Logger.error("Failed to validate changed files " + changedFiles + " in project " + project, e);
} finally {
@@ -235,6 +233,10 @@
*/
@SuppressWarnings("incomplete-switch")
private void validate(IJaxrsElement element) throws CoreException {
+ // skip validation on binary JAX-RS elements (if metamodel contains any)
+ if(element.isBinary()) {
+ return;
+ }
switch (element.getElementCategory()) {
case METAMODEL:
new JaxrsMetamodelValidatorDelegate(this, (JaxrsMetamodel)element).validate();
Modified: branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/IJaxrsElement.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/IJaxrsElement.java 2012-10-18 10:55:20 UTC (rev 44576)
+++ branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/IJaxrsElement.java 2012-10-18 10:58:11 UTC (rev 44577)
@@ -28,6 +28,8 @@
public abstract IResource getResource();
public abstract String getName();
+
+ public abstract boolean isBinary();
}
Modified: branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilterTestCase.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilterTestCase.java 2012-10-18 10:55:20 UTC (rev 44576)
+++ branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilterTestCase.java 2012-10-18 10:58:11 UTC (rev 44577)
@@ -125,6 +125,7 @@
when(element.getResource()).thenReturn(resource);
when(element.isArchive()).thenReturn(true);
when(resource.getType()).thenReturn(IResource.FILE);
+ when(resource.getName()).thenReturn("somearchive.jar");
assertFalse("Wrong result", filter.apply(createEvent(element, ADDED, POST_RECONCILE, NO_FLAG)));
assertFalse("Wrong result", filter.apply(createEvent(element, ADDED, POST_CHANGE, NO_FLAG)));
assertFalse("Wrong result", filter.apply(createEvent(element, CHANGED, POST_RECONCILE, NO_FLAG)));
Modified: branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsApplicationValidatorTestCase.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsApplicationValidatorTestCase.java 2012-10-18 10:55:20 UTC (rev 44576)
+++ branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsApplicationValidatorTestCase.java 2012-10-18 10:58:11 UTC (rev 44577)
@@ -12,6 +12,13 @@
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
+import static org.jboss.tools.ws.jaxrs.core.internal.metamodel.validation.MarkerUtils.deleteJaxrsMarkers;
+import static org.jboss.tools.ws.jaxrs.core.internal.metamodel.validation.MarkerUtils.findJaxrsMarkers;
+import static org.jboss.tools.ws.jaxrs.core.internal.metamodel.validation.MarkerUtils.hasPreferenceKey;
+import static org.jboss.tools.ws.jaxrs.core.preferences.JaxrsPreferences.APPLICATION_NO_OCCURRENCE_FOUND;
+import static org.jboss.tools.ws.jaxrs.core.preferences.JaxrsPreferences.APPLICATION_TOO_MANY_OCCURRENCES;
+import static org.jboss.tools.ws.jaxrs.core.preferences.JaxrsPreferences.JAVA_APPLICATION_INVALID_TYPE_HIERARCHY;
+import static org.jboss.tools.ws.jaxrs.core.preferences.JaxrsPreferences.JAVA_APPLICATION_MISSING_APPLICATION_PATH_ANNOTATION;
import static org.junit.Assert.assertThat;
import java.util.List;
@@ -40,11 +47,8 @@
import org.jboss.tools.ws.jaxrs.core.jdt.JdtUtils;
import org.jboss.tools.ws.jaxrs.core.metamodel.EnumElementKind;
import org.jboss.tools.ws.jaxrs.core.metamodel.IJaxrsApplication;
-import static org.jboss.tools.ws.jaxrs.core.preferences.JaxrsPreferences.*;
import org.junit.Test;
-import static org.jboss.tools.ws.jaxrs.core.internal.metamodel.validation.MarkerUtils.*;
-
/**
* @author Xi
*
@@ -88,7 +92,7 @@
final IMarker[] markers = findJaxrsMarkers(project);
assertThat(markers.length, equalTo(0));
}
-
+
@Test
public void shouldNotReportProblemIfOneWebxmlApplicationExists() throws CoreException, ValidationException {
// preconditions
Modified: branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsHttpMethodValidatorTestCase.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsHttpMethodValidatorTestCase.java 2012-10-18 10:55:20 UTC (rev 44576)
+++ branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsHttpMethodValidatorTestCase.java 2012-10-18 10:58:11 UTC (rev 44577)
@@ -42,8 +42,10 @@
import org.jboss.tools.ws.jaxrs.core.WorkbenchUtils;
import org.jboss.tools.ws.jaxrs.core.builder.AbstractMetamodelBuilderTestCase;
import org.jboss.tools.ws.jaxrs.core.internal.metamodel.domain.JaxrsBaseElement;
+import org.jboss.tools.ws.jaxrs.core.internal.metamodel.domain.JaxrsElementFactory;
import org.jboss.tools.ws.jaxrs.core.internal.metamodel.domain.JaxrsHttpMethod;
import org.jboss.tools.ws.jaxrs.core.jdt.Annotation;
+import org.jboss.tools.ws.jaxrs.core.jdt.JdtUtils;
import org.junit.Test;
/**
@@ -79,6 +81,21 @@
}
@Test
+ public void shouldSkipValidationOnBinaryHttpMethod() throws CoreException, ValidationException {
+ // preconditions: create an HttpMethod from the binary annotation, then try to validate
+ final IType getType = WorkbenchUtils.getType("javax.ws.rs.GET", javaProject);
+ final JaxrsHttpMethod httpMethod = new JaxrsElementFactory().createHttpMethod(getType, JdtUtils.parse(getType, null), metamodel);
+ metamodel.add(httpMethod);
+ assertThat(findJaxrsMarkers(httpMethod).length, equalTo(0));
+ deleteJaxrsMarkers(httpMethod);
+ // operation
+ new JaxrsMetamodelValidator().validate(toSet(httpMethod.getResource()), project, validationHelper, context,
+ validatorManager, reporter);
+ // validation
+ assertThat(findJaxrsMarkers(httpMethod).length, equalTo(0));
+ }
+
+ @Test
public void shouldReportProblemWhenHttpMethodVerbIsEmpty() throws CoreException, ValidationException {
// preconditions
final IType fooType = WorkbenchUtils.getType("org.jboss.tools.ws.jaxrs.sample.services.FOO", javaProject);
12 years, 2 months
- 1
- 0
JBoss Tools SVN: r44576 - in branches/jbosstools-4.0.0.Beta1/ws: tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-10-18 06:55:20 -0400 (Thu, 18 Oct 2012)
New Revision: 44576
Modified:
branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilter.java
branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilterTestCase.java
branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaScannerTestCase.java
Log:
Fixed - JBIDE-12887
JAX-RS should not analyse jars in the project's classpath
Modified: branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilter.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilter.java 2012-10-18 10:34:04 UTC (rev 44575)
+++ branches/jbosstools-4.0.0.Beta1/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilter.java 2012-10-18 10:55:20 UTC (rev 44576)
@@ -41,6 +41,7 @@
import org.eclipse.jdt.core.ElementChangedEvent;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaElementDelta;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.jboss.tools.ws.jaxrs.core.internal.utils.ConstantUtils;
import org.jboss.tools.ws.jaxrs.core.internal.utils.Logger;
import org.jboss.tools.ws.jaxrs.core.jdt.JdtUtils;
@@ -104,27 +105,23 @@
return new RuleBuilder();
}
+
/**
- * Attempts to retrieve the CompilationUnitContext value matching the given
- * parameters.
- *
- * @param elementKind
- * the kind of Java element that changed.
- * @param deltaKind
- * the kind of change.
- * @param workingCopy
- * @return the scope defined by the rules, or PRIMARY_COPY if nothing was
- * set.
- * @see IJavaElementDelta, IJavaElementKind
+ * Applies the configured rules to see if the given JavaElementDelta needs to be processed or should be ignored.
+ * @param event the Java Element Delta
+ * @return true if the event should be processed, false otherwise
*/
-
public boolean apply(JavaElementDelta event) {
+ if(event.getElement() == null) {
+ return false;
+ }
int elementKind = event.getElement().getElementType();
int deltaKind = event.getDeltaKind();
IJavaElement element = event.getElement();
// prevent processing java elements in a closed java project
// prevent processing of any file named 'package-info.java'
- if (isProjectClosed(element) || isPackageInfoFile(element)) {
+ // prevent processing of any jar file
+ if (isProjectClosed(element) || isPackageInfoFile(element) || isJarArchive(element)) {
return false;
}
int flags = event.getFlags();
@@ -142,6 +139,16 @@
}
/**
+ *
+ * @param element
+ * @return true if the given java element is a Jar archive.
+ */
+ private boolean isJarArchive(IJavaElement element) {
+ return (element.getElementType() == IJavaElement.PACKAGE_FRAGMENT_ROOT && ((IPackageFragmentRoot)element).isArchive());
+
+ }
+
+ /**
* Returns true if the element resource is a file named 'package-info.java' (whatever the containing folder)
* @param element
* @return
Modified: branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilterTestCase.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilterTestCase.java 2012-10-18 10:34:04 UTC (rev 44575)
+++ branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilterTestCase.java 2012-10-18 10:55:20 UTC (rev 44576)
@@ -13,7 +13,7 @@
import static org.eclipse.core.resources.IResourceDelta.REMOVED;
import static org.eclipse.jdt.core.ElementChangedEvent.POST_CHANGE;
import static org.eclipse.jdt.core.ElementChangedEvent.POST_RECONCILE;
-import static org.eclipse.jdt.core.IJavaElement.ANNOTATION;
+import static org.eclipse.jdt.core.IJavaElement.*;
import static org.eclipse.jdt.core.IJavaElement.COMPILATION_UNIT;
import static org.eclipse.jdt.core.IJavaElement.METHOD;
import static org.eclipse.jdt.core.IJavaElement.TYPE;
@@ -30,6 +30,7 @@
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.junit.Before;
@@ -117,4 +118,18 @@
assertFalse("Wrong result", filter.apply(createEvent(element, REMOVED, POST_CHANGE, NO_FLAG)));
}
+ @Test
+ public void shouldNotAcceptChangesInJarFile() {
+ IPackageFragmentRoot element = createMock(IPackageFragmentRoot.class, PACKAGE_FRAGMENT_ROOT);
+ IResource resource = mock(IResource.class);
+ when(element.getResource()).thenReturn(resource);
+ when(element.isArchive()).thenReturn(true);
+ when(resource.getType()).thenReturn(IResource.FILE);
+ assertFalse("Wrong result", filter.apply(createEvent(element, ADDED, POST_RECONCILE, NO_FLAG)));
+ assertFalse("Wrong result", filter.apply(createEvent(element, ADDED, POST_CHANGE, NO_FLAG)));
+ assertFalse("Wrong result", filter.apply(createEvent(element, CHANGED, POST_RECONCILE, NO_FLAG)));
+ assertFalse("Wrong result", filter.apply(createEvent(element, CHANGED, POST_CHANGE, NO_FLAG)));
+ assertFalse("Wrong result", filter.apply(createEvent(element, REMOVED, POST_RECONCILE, NO_FLAG)));
+ assertFalse("Wrong result", filter.apply(createEvent(element, REMOVED, POST_CHANGE, NO_FLAG)));
+ }
}
Modified: branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaScannerTestCase.java
===================================================================
--- branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaScannerTestCase.java 2012-10-18 10:34:04 UTC (rev 44575)
+++ branches/jbosstools-4.0.0.Beta1/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaScannerTestCase.java 2012-10-18 10:55:20 UTC (rev 44576)
@@ -549,12 +549,12 @@
}
@Test
- public void shouldNotifyWhenLibraryAddedInClasspath() throws CoreException, InterruptedException {
+ public void shouldNotNotifyWhenLibraryAddedInClasspath() throws CoreException, InterruptedException {
// operation
IPackageFragmentRoot addedEntry = WorkbenchTasks.addClasspathEntry(javaProject, "slf4j-api-1.5.2.jar",
new NullProgressMonitor());
// verifications
- verifyEventNotification(addedEntry, ADDED, POST_CHANGE, NO_FLAG, times(1));
+ verifyEventNotification(addedEntry, ADDED, POST_CHANGE, NO_FLAG, times(0));
}
@Test
@@ -567,13 +567,13 @@
}
@Test
- public void shouldNotifyWhenLibraryRemovedFromClasspath() throws CoreException, InterruptedException {
+ public void shouldNotNotifyWhenLibraryRemovedFromClasspath() throws CoreException, InterruptedException {
// operation
List<IPackageFragmentRoot> removedEntries = WorkbenchUtils.removeClasspathEntry(javaProject,
"jaxrs-api-2.0.1.GA.jar", null);
// verifications
for (IPackageFragmentRoot removedEntry : removedEntries) {
- verifyEventNotification(removedEntry, REMOVED, POST_CHANGE, F_REMOVED_FROM_CLASSPATH, times(1));
+ verifyEventNotification(removedEntry, REMOVED, POST_CHANGE, F_REMOVED_FROM_CLASSPATH, times(0));
}
}
12 years, 2 months
- 1
- 0
JBoss Tools SVN: r44575 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-10-18 06:34:04 -0400 (Thu, 18 Oct 2012)
New Revision: 44575
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageSelectionProvider.java
Log:
JBIDE-12783
Missing QuickFix context menu within Source pane of VPE for JSF project
Workaround is committed due to fix the Context Menu.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2012-10-18 10:13:48 UTC (rev 44574)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2012-10-18 10:34:04 UTC (rev 44575)
@@ -31,6 +31,8 @@
import org.eclipse.gef.ui.views.palette.PalettePage;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.viewers.IPostSelectionProvider;
@@ -42,6 +44,8 @@
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Item;
+import org.eclipse.swt.widgets.Menu;
import org.eclipse.ui.IEditorActionBarContributor;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
@@ -189,6 +193,8 @@
}
}
+
+
private void loadSelectedTab() {
String defaultVpeTab = JspEditorPlugin.getDefault()
.getPreferenceStore().getString(
@@ -496,22 +502,18 @@
case 0: {
// source/visual mode
setActivePage(selectedPageIndex);
-// pageChange(selectedPageIndex);
break;
} case 1: {
// source mode
setActivePage(selectedPageIndex);
-// pageChange(selectedPageIndex);
break;
} case 2: {
// preview mode
setActivePage(selectedPageIndex);
-// pageChange(selectedPageIndex);
break;
} default: {
// by default we sets source/visual mode
setActivePage(0);
-// pageChange(0);
break;
}
}
@@ -531,16 +533,44 @@
*/
vpeIsCreating = false;
}
-
}
+ /*
+ * This Context Menu Listener fixes the 'empty menu items' issue
+ * See JBIDE-12783.
+ */
+ private final class ZContextMenuListener implements IMenuListener
+ {
+ @Override
+ public void menuAboutToShow(IMenuManager manager) {
+ Item[] mi = getMenuItems(manager);
+ for (int i = 0; i < mi.length; i++) {
+ mi[i].dispose();
+ }
+ }
+
+ Item[] getMenuItems(IMenuManager manager) {
+ Menu menu = ((MenuManager)manager).getMenu();
+ return (menu == null) ? new Item[0] : menu.getItems();
+ }
+ }
+
private void createPagesForVPE() throws PartInitException {
/*
* Create Source Editor and BundleMap
*/
- sourceEditor = new JSPTextEditor(this);
+ sourceEditor = new JSPTextEditor(this) {
+ public void createPartControl(Composite parent) {
+ super.createPartControl(parent);
+ Menu m = sourceEditor.getTextViewer().getTextWidget().getMenu();
+ Object data = m.getData("org.eclipse.jface.action.MenuManager.managerKey");
+ if (data instanceof IMenuManager) {
+ (((IMenuManager)data)).addMenuListener(new ZContextMenuListener());
+ }
+ }
+ };
sourceEditor.setEditorPart(this);
-
+
/*
* Create Bundle Map here but Initialize it in the VpeController
* or here if there is only the source part.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageSelectionProvider.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageSelectionProvider.java 2012-10-18 10:13:48 UTC (rev 44574)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageSelectionProvider.java 2012-10-18 10:34:04 UTC (rev 44575)
@@ -1,23 +1,22 @@
/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2007-2012 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ * Red Hat, Inc. - initial API and implementation
******************************************************************************/
package org.jboss.tools.jst.jsp.jspeditor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.SafeRunner;
import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jface.viewers.*;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.ui.part.MultiPageSelectionProvider;
+import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
@@ -28,60 +27,18 @@
* @author eskimo(dgolovin(a)exadel.com)
*
*/
-public class JSPMultiPageSelectionProvider implements IPostSelectionProvider,
- ISelectionProvider {
-
- private ListenerList listeners = new ListenerList();
-
- private JSPMultiPageEditorPart multiPageEditor;
-
+public class JSPMultiPageSelectionProvider extends MultiPageSelectionProvider {
+ JSPMultiPageEditorPart multiPageEditor;
+
public JSPMultiPageSelectionProvider(JSPMultiPageEditorPart multiPageEditor) {
- Assert.isNotNull(multiPageEditor);
+ super(multiPageEditor);
this.multiPageEditor = multiPageEditor;
}
- Object last = null;
-
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- listeners.add(listener);
- last = listener;
- }
-
- public void fireSelectionChanged(final SelectionChangedEvent event) {
- Object[] listeners = this.listeners.getListeners();
- for (int i = 0; i < listeners.length; ++i) {
- final ISelectionChangedListener l = (ISelectionChangedListener) listeners[i];
- SafeRunner.run(new SafeRunnable() {
- public void run() {
- l.selectionChanged(event);
- }
- });
- }
- }
-
public JSPMultiPageEditorPart getMultiPageEditor() {
return multiPageEditor;
}
- public ISelection getSelection() {
- IEditorPart activeEditor = ((JSPMultiPageEditorPart) multiPageEditor).getActiveEditor();
- if (activeEditor != null) {
- ISelectionProvider selectionProvider = activeEditor.getSite()
- .getSelectionProvider();
- if (selectionProvider != null)
- return selectionProvider.getSelection();
- }
- return null;
- }
-
- /*
- * (non-JavaDoc) Method declaed on <code>ISelectionProvider</code>.
- */
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- listeners.remove(listener);
- }
-
public void setSelection(ISelection selection) {
selection = convertObjectSelection(selection);
if (!isAppropriateSelected(selection))
@@ -90,13 +47,7 @@
return;
isFiringSelection = true;
try {
- IEditorPart activeEditor = multiPageEditor.getActiveEditor();
- if (activeEditor != null) {
- ISelectionProvider selectionProvider = activeEditor.getSite()
- .getSelectionProvider();
- if (selectionProvider != null)
- selectionProvider.setSelection(selection);
- }
+ super.setSelection(selection);
} finally {
isFiringSelection = false;
}
@@ -131,47 +82,27 @@
return (o instanceof IndexedRegion);
}
- private ListenerList postListeners = new ListenerList();
-
- public void addPostSelectionChangedListener(
- ISelectionChangedListener listener) {
- postListeners.add(listener);
- if (last != null) {
- listeners.remove(last);
- last = null;
- }
- }
-
- public void removePostSelectionChangedListener(
- ISelectionChangedListener listener) {
- postListeners.remove(listener);
- }
-
boolean isFiringSelection = false;
public boolean isFiringSelection() {
return isFiringSelection;
}
- public void firePostSelectionChanged(final SelectionChangedEvent event) {
- fireSelectionChanged(event, postListeners);
- }
-
public void fireSelectionChanged(final SelectionChangedEvent event,
ListenerList listenerList) {
if (isFiringSelection)
return;
- Object[] listeners = listenerList.getListeners();
isFiringSelection = true;
- for (int i = 0; i < listeners.length; ++i) {
- final ISelectionChangedListener l = (ISelectionChangedListener) listeners[i];
- SafeRunner.run(new SafeRunnable() {
- public void run() {
- l.selectionChanged(event);
- }
- });
- }
+ super.fireSelectionChanged(event);
isFiringSelection = false;
}
+ public void firePostSelectionChanged(final SelectionChangedEvent event,
+ ListenerList listenerList) {
+ if (isFiringSelection)
+ return;
+ isFiringSelection = true;
+ super.firePostSelectionChanged(event);
+ isFiringSelection = false;
+ }
}
12 years, 2 months
- 1
- 0
JBoss Tools SVN: r44574 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-10-18 06:13:48 -0400 (Thu, 18 Oct 2012)
New Revision: 44574
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-jbds60.xml
trunk/download.jboss.org/jbosstools/examples/project-examples-maven-4.0.B...
Log:
JBIDE-12554 add missing JDF quickstarts, remove duplicates from JBoss Quickstarts
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-jbds60.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-jbds60.xml 2012-10-18 09:55:36 UTC (rev 44573)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-jbds60.xml 2012-10-18 10:13:48 UTC (rev 44574)
@@ -1,264 +1,593 @@
<projects>
<project>
- <category>JBoss Quickstarts</category>
+ <category>JBoss Developer Framework Quickstarts</category>
<name>helloworld</name>
<included-projects>jboss-as-helloworld</included-projects>
- <shortDescription>Helloworld</shortDescription>
+ <shortDescription>Hello World</shortDescription>
<description>
-This example demonstrates the use of CDI 1.0 and Servlet 3 in JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1.
-The example can be deployed using Maven from the command line or from Eclipse using JBoss Tools.
- </description>
- <size>8192</size>
- <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
+ This example demonstrates the use of CDI 1.0 and Servlet 3 in JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1.
+ The example can be deployed using Maven from the command line or from Eclipse using JBoss Tools.
+ </description>
+ <url>http://download.jboss.org/jbosstools/examples/4.0.0.Beta1/jboss-as-kitche...</url>
+ <size>108318</size>
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
<property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+
<property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
- </fix>
+ </fix>
<fix type="plugin">
<property name="id">org.eclipse.m2e.core</property>
<property name="versions">[1.0.0,2.0.0)</property>
<property name="description">This project example requires m2e >= 1.0.</property>
<property name="connectorIds">org.eclipse.m2e.feature</property>
- </fix>
+ </fix>
<fix type="plugin">
<property name="id">org.eclipse.m2e.wtp</property>
<property name="versions">[0.16,2.0)</property>
<property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
<property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
- </fix>
+ </fix>
<fix type="plugin">
<property name="id">org.jboss.tools.maven.core</property>
- <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="versions">[1.4.0,2.0.0)</property>
<property name="description">This project example requires JBoss Maven Tools.</property>
<property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
- </fix>
- </fixes>
+ </fix>
+ </fixes>
<importType>maven</importType>
<importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Project Examples feature.</importTypeDescription>
- <welcome type="cheatsheets" url="/jboss-as-helloworld/.cheatsheet.xml"/>
+ <!--welcome type="cheatsheets" url="/jboss-as-helloworld/.cheatsheet.xml"/-->
<tags>central</tags>
<icon path="icons/jboss.png" />
- </project>
-
- <project>
- <category>JBoss Quickstarts</category>
- <name>helloworld-osgi</name>
- <included-projects>jboss-as-helloworld-osgi</included-projects>
- <shortDescription>Helloworld OSGi Example</shortDescription>
- <description>
-This example demonstrates the use of OSGi in JBoss Application Server 7.1.
-The example can be deployed using Maven from the command line, by using the AS 7 web console or by dropping the OSGi bundle in the deployments folder.
-
-To deploy to JBoss Application Server 7.1 using JBoss Tools, start JBoss Application Server 7.1, right-click the project, select Run As>Maven build..., enter "package jboss-as:deploy" in the Goals field and click the Run button.
-This will build, deploy and start the OSGi bundle.
-You will see a Hello AS7 World!! message appear on the console when this is done.
- </description>
- <size>8192</size>
- <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
- <fixes>
- <fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
- <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
- <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
- </fix>
- <fix type="plugin">
- <property name="id">org.eclipse.m2e.core</property>
- <property name="versions">[1.0.0,2.0.0)</property>
- <property name="description">This project example requires m2e >= 1.0.</property>
- <property name="connectorIds">org.eclipse.m2e.feature</property>
- </fix>
- <fix type="plugin">
- <property name="id">org.eclipse.m2e.wtp</property>
- <property name="versions">[0.16,2.0)</property>
- <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
- <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
- </fix>
- <fix type="plugin">
- <property name="id">org.jboss.tools.maven.core</property>
- <property name="versions">[1.3.0,2.0.0)</property>
- <property name="description">This project example requires JBoss Maven Tools.</property>
- <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
- </fix>
- </fixes>
- <importType>maven</importType>
- <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Project Examples feature.</importTypeDescription>
- <icon path="icons/jboss.png" />
</project>
-
-
+ <project>
+ <id>jdf-jboss-as-helloworld-jsf</id>
+ <name>jboss-as-helloworld-jsf</name>
+ <category>JBoss Developer Framework Quickstarts</category>
+ <shortDescription>Hello World JSF</shortDescription>
+ <description>This example demonstrates the use of CDI 1.0 and JSF in JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1.
+ The example can be deployed using Maven from the command line or from Eclipse using JBoss Tools.</description>
+ <url>http://download.jboss.org/jbosstools/examples/4.0.0.Beta1/jboss-as-hellow...</url>
+ <size>9582</size>
+ <importType>maven</importType>
+ <icon path="icons/jboss.png"/>
+ <tags>central</tags>
+ <included-projects/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e &gt;= 1.1.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16.0,2.0.0)</property>
+ <property name="description">This project example requires m2e-wtp &gt;= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.4.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ </fixes>
+ </project>
+ <project>
+ <id>jdf-jboss-as-helloworld-jms</id>
+ <name>jboss-as-helloworld-jms</name>
+ <category>JBoss Developer Framework Quickstarts</category>
+ <shortDescription>Hello World JMS</shortDescription>
+ <description>This example demonstrates the use of CDI 1.0 and JMS external producer/consumer client in JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1.
+ The example can be deployed using Maven from the command line or from Eclipse using JBoss Tools.</description>
+ <url>http://download.jboss.org/jbosstools/examples/4.0.0.Beta1/jboss-as-hellow...</url>
+ <size>7913</size>
+ <importType>maven</importType>
+ <icon path="icons/jboss.png"/>
+ <tags>central</tags>
+ <included-projects/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e &gt;= 1.1.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16.0,2.0.0)</property>
+ <property name="description">This project example requires m2e-wtp &gt;= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.4.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <id>jdf-jboss-as-helloworld-errai</id>
+ <name>jboss-as-helloworld-errai</name>
+ <category>JBoss Developer Framework Quickstarts</category>
+ <shortDescription>Hello World Errai</shortDescription>
+ <description>This example demonstrates the use of CDI 1.0 and Errai in JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1.
+ The example can be deployed using Maven from the command line or from Eclipse using JBoss Tools.</description>
+ <url>http://download.jboss.org/jbosstools/examples/4.0.0.Beta1/jboss-as-hellow...</url>
+ <size>19354</size>
+ <importType>maven</importType>
+ <icon path="icons/jboss.png"/>
+ <tags>central</tags>
+ <included-projects/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e &gt;= 1.1.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16.0,2.0.0)</property>
+ <property name="description">This project example requires m2e-wtp &gt;= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.4.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.gwt.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">com.google.gwt.eclipse.core</property>
+ <property name="versions">[2.4,)</property>
+ <property name="description">This project example requires Google Plugin for Eclipse</property>
+ <property name="connectorIds">com.google.gwt.eclipse.sdkbundle.e37.feature,com.google.gdt.eclipse.suite.e37.feature</property>
+ </fix>
+ </fixes>
+ </project>
+ <project>
+ <id>jdf-jboss-as-helloworld-osgi</id>
+ <name>jboss-as-helloworld-osgi</name>
+ <category>JBoss Developer Framework Quickstarts</category>
+ <shortDescription>Hello World OSGi</shortDescription>
+ <description>This example demonstrates the use of OSGi in JBoss Application Server 7.1.
+ The example can be deployed using Maven from the command line, by using the AS 7 web console or by dropping the OSGi bundle in the deployments folder.
+
+ To deploy to JBoss Application Server 7.1 using JBoss Tools, start JBoss Application Server 7.1, right-click the project, select Run As>Maven build..., enter "package jboss-as:deploy" in the Goals field and click the Run button.
+ This will build, deploy and start the OSGi bundle.
+ You will see a Hello AS7 World!! message appear on the console when this is done.</description>
+ <url>http://download.jboss.org/jbosstools/examples/4.0.0.Beta1/jboss-as-hellow...</url>
+ <size>5096</size>
+ <importType>maven</importType>
+ <icon path="icons/jboss.png"/>
+ <tags>central</tags>
+ <included-projects/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e &gt;= 1.1.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16.0,2.0.0)</property>
+ <property name="description">This project example requires m2e-wtp &gt;= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.4.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ </fixes>
+ </project>
<project>
- <category>JBoss Quickstarts</category>
- <name>login</name>
- <included-projects>jboss-as-login</included-projects>
- <shortDescription>Login</shortDescription>
+ <category>JBoss Developer Framework Quickstarts </category>
+ <name>kitchensink</name>
+
+ <included-projects>jboss-as-kitchensink</included-projects>
+ <shortDescription>Kitchensink</shortDescription>
<description>
-This example demonstrates the use of CDI 1.0, JPA 2.0, JTA 1.1, EJB 3.1 and JSF 2.0 in JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1.
-The example can be deployed using Maven from the command line or from Eclipse using JBoss Tools.
- </description>
-<size>8192</size>
- <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
+ 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 Enterprise Application Platform 6 or JBoss Application Server 7.1.
+ 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.
+ It includes a persistence unit and some sample persistence and transaction code to help you get your feet wet with database access in enterprise Java.
+ </description>
+ <url>http://download.jboss.org/jbosstools/examples/4.0.0.Beta1/jboss-as-kitche...</url>
+ <size>108318</size>
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
<property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
<property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
- </fix>
+ </fix>
<fix type="plugin">
<property name="id">org.eclipse.m2e.core</property>
<property name="versions">[1.0.0,2.0.0)</property>
<property name="description">This project example requires m2e >= 1.0.</property>
<property name="connectorIds">org.eclipse.m2e.feature</property>
- </fix>
+ </fix>
<fix type="plugin">
<property name="id">org.eclipse.m2e.wtp</property>
<property name="versions">[0.16,2.0)</property>
<property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
<property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
- </fix>
+ </fix>
<fix type="plugin">
<property name="id">org.jboss.tools.maven.core</property>
<property name="versions">[1.3.0,2.0.0)</property>
<property name="description">This project example requires JBoss Maven Tools.</property>
<property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.jsf.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
- </fix>
- </fixes>
+ </fix>
+ </fixes>
<importType>maven</importType>
<importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Project Examples feature.</importTypeDescription>
- <welcome type="cheatsheets" url="/jboss-as-login/cheatsheets/login.xml"/>
- <tags>central</tags>
+ <welcome type="cheatsheets" url="/jboss-as-kitchensink/.cheatsheet.xml"/>
+ <tags>central</tags>
<icon path="icons/jboss.png" />
- </project>
-
+ </project>
<project>
- <category>JBoss Quickstarts</category>
+ <category>JBoss Developer Framework Quickstarts</category>
<name>numberguess</name>
<included-projects>jboss-as-numberguess</included-projects>
- <shortDescription>Numberguess</shortDescription>
+ <shortDescription>Number Guess</shortDescription>
<description>
-This example demonstrates the use of CDI 1.0 and JSF 2.0 in JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1.
-The example can be deployed using Maven from the command line or from Eclipse using JBoss Tools.
- </description>
-<size>8192</size>
- <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
+ This example demonstrates the use of CDI 1.0 and JSF 2.0 in JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1.
+ The example can be deployed using Maven from the command line or from Eclipse using JBoss Tools.
+ </description>
+ <url>http://download.jboss.org/jbosstools/examples/4.0.0.Beta1/jboss-as-tasks.zip</url>
+ <size>21669</size>
<fixes>
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
<property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
<property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
- </fix>
+ </fix>
<fix type="plugin">
<property name="id">org.eclipse.m2e.core</property>
<property name="versions">[1.0.0,2.0.0)</property>
<property name="description">This project example requires m2e >= 1.0.</property>
<property name="connectorIds">org.eclipse.m2e.feature</property>
- </fix>
+ </fix>
<fix type="plugin">
<property name="id">org.eclipse.m2e.wtp</property>
<property name="versions">[0.16,2.0)</property>
<property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
<property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
- </fix>
+ </fix>
<fix type="plugin">
<property name="id">org.jboss.tools.maven.core</property>
<property name="versions">[1.3.0,2.0.0)</property>
<property name="description">This project example requires JBoss Maven Tools.</property>
<property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.jsf.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
- </fix>
- </fixes>
+ </fix>
+ </fixes>
<importType>maven</importType>
<importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Project Examples feature.</importTypeDescription>
- <welcome type="cheatsheets" url="/jboss-as-numberguess/.cheatsheet.xml"/>
+ <!--welcome type="cheatsheets" url="/jboss-as-numberguess/.cheatsheet.xml"/-->
<tags>central</tags>
<icon path="icons/jboss.png" />
- </project>
-
+ </project>
+ <project>
+ <id>jdf-jboss-as-kitchensink-html5-mobile</id>
+ <name>jboss-as-kitchensink-html5-mobile</name>
+ <category>JBoss Developer Framework Quickstarts</category>
+ <shortDescription>AeroGear HTML5/Mobile</shortDescription>
+ <description>An AeroGear and Java EE 6 HTML5 mobile web application for use with JBoss.</description>
+ <url>http://download.jboss.org/jbosstools/examples/4.0.0.Beta1/jboss-as-kitche...</url>
+ <size>251016</size>
+ <importType>maven</importType>
+ <icon path="icons/jboss.png"/>
+ <tags>central</tags>
+ <included-projects/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.1.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16.0,2.0.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.4.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <!-- Examples from former *community*.xml descriptors-->
<project>
- <category>JBoss Quickstarts</category>
- <name>kitchensink</name>
- <included-projects>jboss-as-kitchensink</included-projects>
- <shortDescription>Kitchensink</shortDescription>
- <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 Enterprise Application Platform 6 or JBoss Application Server 7.1.
-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.
-It includes a persistence unit and some sample persistence and transaction code to help you get your feet wet with database access in enterprise Java.
- </description>
-<size>8192</size>
- <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
+ <category>Richfaces 4.0/JSF 2.0</category>
+ <name>richfaces-simpleapp</name>
+ <included-projects>richfaces-simpleapp</included-projects>
+ <shortDescription>RichFaces 4.0 Simple Application</shortDescription>
+ <description>This example creates a simple RichFaces 4.0 Application. It requires JBoss Application Server 6.0 and m2eclipse.
+ It includes the richfaces-simpleapp project.
+ </description>
+ <size>9046</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/richfaces-exam...
+ </url>
+ <importType>maven</importType>
+ <icon path="icons/jboss.png" />
<fixes>
<fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
- <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
- <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
- </fix>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.60</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.610</property>
+ <property name="description">This project example requires the JBoss Application Server 6.0</property>
+ </fix>
<fix type="plugin">
- <property name="id">org.eclipse.m2e.core</property>
- <property name="versions">[1.0.0,2.0.0)</property>
- <property name="description">This project example requires m2e >= 1.0.</property>
- <property name="connectorIds">org.eclipse.m2e.feature</property>
- </fix>
- <fix type="plugin">
<property name="id">org.eclipse.m2e.wtp</property>
<property name="versions">[0.16,2.0)</property>
<property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
<property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
- </fix>
+ </fix>
<fix type="plugin">
<property name="id">org.jboss.tools.maven.core</property>
- <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="versions">[1.4.0,2.0.0)</property>
<property name="description">This project example requires JBoss Maven Tools.</property>
- <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.jsf.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
- </fix>
+ <property name="connectorIds">org.jboss.tools.maven.feature</property>
+ </fix>
+ </fixes>
+ </project>
+ <!-- Too many errors, disabling
+ <project>
+ <category>Seam</category>
+ <name>photoalbum-mavenized</name>
+ <included-projects>
+ photoalbum-mavenized,photoalbum-mavenized-ear,photoalbum-mavenized-ejb,photoalbum-mavenized-parent
+ </included-projects>
+ <shortDescription>PhotoAlbum - EAR mavenized (RichFaces 3.3.1.GA, Seam 2.2.0.GA)</shortDescription>
+ <description>This example demonstrates the use of RichFaces components. It includes the photoalbum-mavenized,photoalbum-mavenized-ear,photoalbum-mavenized-ejb and photoalbum-mavenized-parent projects.
+ The example requires Seam 2.2,JBoss Enterprise Application Platform 4.3/5.0 or JBoss Application Server 4.2.x/5.x and m2eclipse.
+ </description>
+ <size>16441344</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
+ </url>
+ <importType>maven</importType>
+ <icon path="icons/jboss.png" />
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.51, org.jboss.ide.eclipse.as.runtime.50, org.jboss.ide.eclipse.as.runtime.42</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.510</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 4.3/5.0 or JBoss Application Server 4.2.x/5.x</property>
+ </fix>
+ <fix type="seam">
+ <property name="allowed-versions">2.2.0</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.seam.222</property>
+ <property name="description">This project example requires Seam 2.2</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.4.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.seam.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jpa.feature</property>
+ </fix>
+
</fixes>
- <importType>maven</importType>
- <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Project Examples feature.</importTypeDescription>
- <welcome type="cheatsheets" url="/jboss-as-kitchensink/.cheatsheet.xml"/>
- <tags>central</tags>
- <icon path="icons/jboss.png" />
- </project>
+ </project>
+
+ <project>
+ <category>Seam</category>
+ <name>booking2</name>
+ <included-projects>
+ booking,booking-ear,booking-ejb,booking-parent,booking-test
+ </included-projects>
+ <shortDescription>Seam Booking Example - EAR mavenized</shortDescription>
+ <description>This example demonstrates the use of Seam in a Java EE 5 environment.
+ Transaction and persistence context management is handled by the EJB container.
+ It includes the booking, booking-ear, booking-ejb,booking-test and booking-parent projects.
+ Requires JBoss Enterprise Application Platform 4.3/JBoss Application Server 4.2.x, Seam 2.0, m2eclipse and testng plugins.
+ </description>
+ <size>203639</size>
+ <importType>maven</importType>
+ <icon path="icons/jboss.png" />
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.423</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 4.3 or JBoss Application Server 4.2.x</property>
+ </fix>
+
+ <fix type="seam">
+ <property name="allowed-versions">2.0.0, 2.0.1, 2.0.2</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.seam.202</property>
+ <property name="description">This project example requires Seam 2.0</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.4.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.seam.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jpa.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.testng.eclipse</property>
+ <property name="versions">6.7.0</property>
+ <property name="connectorIds">org.testng.eclipse</property>
+ <property name="description">The TestNG plugin is required if you want to run Seam tests. You can install it using the following update site: http://beust.com/eclipse</property>
+ </fix>
+
+ </fixes>
+ </project>
+ <project>
+ <category>Seam</category>
+ <name>booking3-mavenized</name>
+ <included-projects>
+ booking,booking-ear,booking-ejb,booking-parent,booking-test
+ </included-projects>
+ <shortDescription>Seam Booking Example - EAR mavenized - Seam 2.1.1.GA</shortDescription>
+ <description>This example demonstrates the use of Seam in a Java EE 5 environment.
+ Transaction and persistence context management is handled by the EJB container.
+ It includes the booking, booking-ear, booking-ejb, booking-test and booking-parent projects.
+ Requires JBoss Enterprise Application Platform 4.3/JBoss Application Server 4.2.x, Seam 2.1, m2eclipse and testng plugins.
+ </description>
+ <size>196608</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
+ </url>
+ <importType>maven</importType>
+ <icon path="icons/jboss.png" />
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.423</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 4.3 or JBoss Application Server 4.2.x</property>
+ </fix>
+ <fix type="seam">
+ <property name="allowed-versions">2.1.0, 2.1.1, 2.1.2</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.seam.212</property>
+ <property name="description">This project example requires Seam 2.1</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.4.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.seam.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jpa.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.testng.eclipse</property>
+ <property name="versions">6.7.0</property>
+ <property name="connectorIds">org.testng.eclipse</property>
+ <property name="description">The TestNG plugin is required if you want to run Seam tests. You can install it using the following update site: http://beust.com/eclipse</property>
+ </fix>
+ </fixes>
+ </project>
+ -->
<project>
- <category>JBoss Quickstarts</category>
- <name>helloworld-html5</name>
- <included-projects>helloworld-html5</included-projects>
- <shortDescription>HTML5</shortDescription>
- <description>This example demonstrates the use of *CDI 1.0* and *JAX-RS* in *JBoss Application Server 7* using the Plain Old HTML5 (POH5) architecture.
-POH5 is basically a smart, HTML5+CSS3+JavaScript front-end using RESTful services on the backend.</description>
- <size>7266</size>
- <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
+ <category>RESTEasy</category>
+ <name>simple</name>
+ <included-projects>
+ simple
+ </included-projects>
+ <shortDescription>RESTEasy Simple Example</shortDescription>
+ <description>This project is a simple example showing usage of @Path, @GET, PUT, POST, and @PathParam. It uses pure streaming output and includes the 'simple' project.
+ Requires m2e-wtp and JBoss Enterprise Application Platform 4.3/5.0 or JBoss Application Server 4.2.x/5.x.
+ </description>
+ <size>16939</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/resteasy-examp...
+ </url>
+ <importType>maven</importType>
+ <icon path="icons/jboss.png" />
<fixes>
<fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
- <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
- <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
- </fix>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.51, org.jboss.ide.eclipse.as.runtime.50, org.jboss.ide.eclipse.as.runtime.42</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.510</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 4.3/5.0 or JBoss Application Server 4.2.x/5.x</property>
+ </fix>
<fix type="plugin">
- <property name="id">org.eclipse.m2e.core</property>
- <property name="versions">[1.0.0,2.0.0)</property>
- <property name="description">This project example requires m2e >= 1.0.</property>
- <property name="connectorIds">org.eclipse.m2e.feature</property>
- </fix>
- <fix type="plugin">
<property name="id">org.eclipse.m2e.wtp</property>
<property name="versions">[0.16,2.0)</property>
<property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
<property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
- </fix>
+ </fix>
<fix type="plugin">
<property name="id">org.jboss.tools.maven.core</property>
- <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="versions">[1.4.0,2.0.0)</property>
<property name="description">This project example requires JBoss Maven Tools.</property>
- <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.jsf.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
- </fix>
- </fixes>
- <importType>maven</importType>
- <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Project Examples feature.</importTypeDescription>
- <!-- no cheatsheet yet
- <welcome type="cheatsheets" url="/helloworld-html5/cheatsheets/helloworld-html5.xml"/>
- -->
- <welcome type="editor" url="/helloworld-html5/README.md"/>
+ <property name="connectorIds">org.jboss.tools.maven.feature</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <id>jdf-jboss-as-greeter</id>
+ <name>jboss-as-greeter</name>
+ <category>JBoss Developer Framework Quickstarts</category>
+ <shortDescription>Greeter</shortDescription>
+ <description>Greeter</description>
+ <url>http://download.jboss.org/jbosstools/examples/4.0.0.Beta1/jboss-as-greete...</url>
+ <size>19046</size>
+ <importType>maven</importType>
+ <icon path="icons/jboss.png"/>
<tags>central</tags>
- <icon path="icons/jboss.png" />
- </project>
+ <included-projects/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.1.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16.0,2.0.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.4.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ </fixes>
+ </project>
</projects>
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-maven-4.0.B...
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-maven-4.0.B... 2012-10-18 09:55:36 UTC (rev 44573)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-maven-4.0.B... 2012-10-18 10:13:48 UTC (rev 44574)
@@ -254,49 +254,6 @@
<icon path="icons/jboss.png" />
</project>
<project>
- <category>JBoss Quickstarts</category>
- <name>login</name>
- <included-projects>jboss-as-login</included-projects>
- <shortDescription>Login</shortDescription>
- <description>
- This example demonstrates the use of CDI 1.0, JPA 2.0, JTA 1.1, EJB 3.1 and JSF 2.0 in JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1.
- The example can be deployed using Maven from the command line or from Eclipse using JBoss Tools.
- </description>
- <size>8192</size>
- <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
- <fixes>
- <fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
- <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
- <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
- </fix>
- <fix type="plugin">
- <property name="id">org.eclipse.m2e.core</property>
- <property name="versions">[1.0.0,2.0.0)</property>
- <property name="description">This project example requires m2e >= 1.0.</property>
- <property name="connectorIds">org.eclipse.m2e.feature</property>
- </fix>
- <fix type="plugin">
- <property name="id">org.eclipse.m2e.wtp</property>
- <property name="versions">[0.16,2.0)</property>
- <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
- <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
- </fix>
- <fix type="plugin">
- <property name="id">org.jboss.tools.maven.core</property>
- <property name="versions">[1.4.0,2.0.0)</property>
- <property name="description">This project example requires JBoss Maven Tools.</property>
- <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.jsf.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
- </fix>
- </fixes>
- <importType>maven</importType>
- <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Project Examples feature.</importTypeDescription>
- <!--welcome type="cheatsheets" url="/jboss-as-login/cheatsheets/login.xml"/-->
- <tags>central</tags>
- <icon path="icons/jboss.png" />
- </project>
-
- <project>
<category>JBoss Developer Framework Quickstarts</category>
<name>numberguess</name>
<included-projects>jboss-as-numberguess</included-projects>
@@ -338,50 +295,44 @@
<tags>central</tags>
<icon path="icons/jboss.png" />
</project>
- <project>
- <category>JBoss Quickstarts</category>
- <name>helloworld-html5</name>
-
- <included-projects>helloworld-html5</included-projects>
- <shortDescription>HTML5</shortDescription>
- <description>This example demonstrates the use of *CDI 1.0* and *JAX-RS* in *JBoss Application Server 7* using the Plain Old HTML5 (POH5) architecture.
- POH5 is basically a smart, HTML5+CSS3+JavaScript front-end using RESTful services on the backend.</description>
- <size>7266</size>
- <url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
- <fixes>
- <fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
- <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
- <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
- </fix>
- <fix type="plugin">
- <property name="id">org.eclipse.m2e.core</property>
- <property name="versions">[1.0.0,2.0.0)</property>
- <property name="description">This project example requires m2e >= 1.0.</property>
- <property name="connectorIds">org.eclipse.m2e.feature</property>
- </fix>
- <fix type="plugin">
- <property name="id">org.eclipse.m2e.wtp</property>
- <property name="versions">[0.16,2.0)</property>
- <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
- <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
- </fix>
- <fix type="plugin">
- <property name="id">org.jboss.tools.maven.core</property>
- <property name="versions">[1.3.0,2.0.0)</property>
- <property name="description">This project example requires JBoss Maven Tools.</property>
- <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.jsf.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
- </fix>
- </fixes>
- <importType>maven</importType>
- <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Project Examples feature.</importTypeDescription>
- <!-- no cheatsheet yet
- <welcome type="cheatsheets" url="/helloworld-html5/cheatsheets/helloworld-html5.xml"/>
- -->
- <welcome type="editor" url="/helloworld-html5/README.md"/>
- <tags>central</tags>
- <icon path="icons/jboss.png" />
- </project>
+ <project>
+ <id>jdf-jboss-as-kitchensink-html5-mobile</id>
+ <name>jboss-as-kitchensink-html5-mobile</name>
+ <category>JBoss Developer Framework Quickstarts</category>
+ <shortDescription>AeroGear HTML5/Mobile</shortDescription>
+ <description>An AeroGear and Java EE 6 HTML5 mobile web application for use with JBoss.</description>
+ <url>http://download.jboss.org/jbosstools/examples/4.0.0.Beta1/jboss-as-kitche...</url>
+ <size>251016</size>
+ <importType>maven</importType>
+ <icon path="icons/jboss.png"/>
+ <tags>central</tags>
+ <included-projects/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.1.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16.0,2.0.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.4.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ </fixes>
+ </project>
<!-- Examples from former *community*.xml descriptors-->
<project>
12 years, 2 months
- 1
- 0
JBoss Tools SVN: r44573 - trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-10-18 05:55:36 -0400 (Thu, 18 Oct 2012)
New Revision: 44573
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilter.java
Log:
Fixed - JBIDE-12887
JAX-RS should not analyse jars in the project's classpath
Applied patch2 (prevent NPE and fix javadoc)
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilter.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilter.java 2012-10-18 09:33:48 UTC (rev 44572)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilter.java 2012-10-18 09:55:36 UTC (rev 44573)
@@ -105,21 +105,16 @@
return new RuleBuilder();
}
+
/**
- * Attempts to retrieve the CompilationUnitContext value matching the given
- * parameters.
- *
- * @param elementKind
- * the kind of Java element that changed.
- * @param deltaKind
- * the kind of change.
- * @param workingCopy
- * @return the scope defined by the rules, or PRIMARY_COPY if nothing was
- * set.
- * @see IJavaElementDelta, IJavaElementKind
+ * Applies the configured rules to see if the given JavaElementDelta needs to be processed or should be ignored.
+ * @param event the Java Element Delta
+ * @return true if the event should be processed, false otherwise
*/
-
public boolean apply(JavaElementDelta event) {
+ if(event.getElement() == null) {
+ return false;
+ }
int elementKind = event.getElement().getElementType();
int deltaKind = event.getDeltaKind();
IJavaElement element = event.getElement();
12 years, 2 months
- 1
- 0
JBoss Tools SVN: r44572 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-10-18 05:33:48 -0400 (Thu, 18 Oct 2012)
New Revision: 44572
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-category-4....
trunk/download.jboss.org/jbosstools/examples/project-examples-category-jb...
trunk/download.jboss.org/jbosstools/examples/project-examples-category-jb...
Log:
Reorder categories in JBoss central
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-category-4....
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-category-4.... 2012-10-18 07:15:36 UTC (rev 44571)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-category-4.... 2012-10-18 09:33:48 UTC (rev 44572)
@@ -1,15 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<categories>
+ <category name="JBoss Developer Framework Quickstarts"
+ description="These quickstarts are aimed to get you up to writing applications with minimal fuss."
+ priority="1" />
<category name="JBoss Quickstarts"
description="These quickstarts are aimed to get you up to writing applications with minimal fuss. We recommend that you work through the quickstarts in the order they are presented in this guide, however if you have previous experience with Java EE 6, you may wish to skip some or all of the quickstarts."
- priority="1" />
+ priority="2" />
- <category name="JBoss Application Server 7 Quickstarts"
- description="These quickstarts are aimed to get you up to writing applications with minimal fuss. We recommend that you work through the quickstarts in the order they are presented in this guide, however if you have previous experience with Java EE 6, you may wish to skip some or all of the quickstarts."
- priority="1" />
<category name="JBoss Maven Archetypes"
- priority="2" />
+ priority="5" />
+ <category name="GateIn Portal Quickstarts"
+ description="GateIn Portal Quickstarts"
+ priority="10" />
+
</categories>
\ No newline at end of file
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-category-jb...
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-category-jb... 2012-10-18 07:15:36 UTC (rev 44571)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-category-jb... 2012-10-18 09:33:48 UTC (rev 44572)
@@ -1,4 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<categories>
+ <category name="JBoss Developer Framework Quickstarts"
+ description="These quickstarts are aimed to get you up to writing applications with minimal fuss."
+ priority="1" />
+
+ <category name="JBoss Quickstarts"
+ description="These quickstarts are aimed to get you up to writing applications with minimal fuss. We recommend that you work through the quickstarts in the order they are presented in this guide, however if you have previous experience with Java EE 6, you may wish to skip some or all of the quickstarts."
+ priority="2" />
+
+
+ <category name="JBoss Maven Archetypes"
+ priority="5" />
+ <category name="GateIn Portal Quickstarts"
+ description="GateIn Portal Quickstarts"
+ priority="10" />
</categories>
\ No newline at end of file
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-category-jb...
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-category-jb... 2012-10-18 07:15:36 UTC (rev 44571)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-category-jb... 2012-10-18 09:33:48 UTC (rev 44572)
@@ -1,4 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<categories>
+ <category name="JBoss Developer Framework Quickstarts"
+ description="These quickstarts are aimed to get you up to writing applications with minimal fuss."
+ priority="1" />
+
+ <category name="JBoss Quickstarts"
+ description="These quickstarts are aimed to get you up to writing applications with minimal fuss. We recommend that you work through the quickstarts in the order they are presented in this guide, however if you have previous experience with Java EE 6, you may wish to skip some or all of the quickstarts."
+ priority="2" />
+
+
+ <category name="JBoss Maven Archetypes"
+ priority="5" />
+ <category name="GateIn Portal Quickstarts"
+ description="GateIn Portal Quickstarts"
+ priority="10" />
</categories>
\ No newline at end of file
12 years, 2 months
- 1
- 0
JBoss Tools SVN: r44571 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-10-18 03:15:36 -0400 (Thu, 18 Oct 2012)
New Revision: 44571
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
Log:
[JBIDE-12855][JBIDE-12888][JBIDE-12889] corrected connection lookup to use #getExpressConnectionUrl instead of #getExpressUsername
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-10-18 05:37:54 UTC (rev 44570)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-10-18 07:15:36 UTC (rev 44571)
@@ -129,14 +129,14 @@
*/
public static IApplication getApplication(IServer server) {
final String appName = getExpressApplicationName(server);
- final String userName = getExpressUsername(server);
+ final String connectionUrl = getExpressConnectionUrl(server);
try {
- final Connection ud = ConnectionsModel.getDefault().getConnectionByUrl(userName);
+ final Connection ud = ConnectionsModel.getDefault().getConnectionByUrl(connectionUrl);
if (ud != null) {
return ud.getApplicationByName(appName); // May be long running
}
} catch (OpenShiftException e) {
- Logger.error(NLS.bind("Failed to retrieve application ''{0}'' from user ''{1}}'", appName, userName), e);
+ Logger.error(NLS.bind("Failed to retrieve application ''{0}'' at url ''{1}}'", appName, connectionUrl), e);
}
return null;
}
@@ -449,8 +449,8 @@
public static IApplication findApplicationForServer(IServerAttributes server) {
try {
- String user = ExpressServerUtils.getExpressUsername(server);
- Connection connection = ConnectionsModel.getDefault().getConnectionByUrl(user);
+ String connectionUrl = ExpressServerUtils.getExpressConnectionUrl(server);
+ Connection connection = ConnectionsModel.getDefault().getConnectionByUrl(connectionUrl);
String appName = ExpressServerUtils.getExpressApplicationName(server);
IApplication app = connection == null ? null : connection.getApplicationByName(appName);
return app;
12 years, 2 months
- 1
- 0