JBoss Tools SVN: r40802 - trunk/build/aggregate.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-04 14:57:04 -0400 (Fri, 04 May 2012)
New Revision: 40802
Modified:
trunk/build/aggregate/build.xml
Log:
allow individual aggregates to override the template file (eg., for webtools site which can will for now be used for both Indigo and Juno)
Modified: trunk/build/aggregate/build.xml
===================================================================
--- trunk/build/aggregate/build.xml 2012-05-04 18:54:50 UTC (rev 40801)
+++ trunk/build/aggregate/build.xml 2012-05-04 18:57:04 UTC (rev 40802)
@@ -544,8 +544,11 @@
<antcallback target="generate.directory.xml" return="directory.xml.html"/>
+ <condition property="index-template.html" value="${output.dir}/index-template.html" else="${basedir}/index-template.html">
+ <available file="${output.dir}/index-template.html" />
+ </condition>
<copy todir="${output.dir}" overwrite="true">
- <fileset file="${basedir}/index-template.html" />
+ <fileset file="${index-template.html}" />
<mapper type="merge" to="index.html" />
<filterchain>
<expandproperties />
12 years, 8 months
JBoss Tools SVN: r40801 - in trunk/jst/tests/org.jboss.tools.jst.web.test: src/org/jboss/tools/jst/web/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-05-04 14:54:50 -0400 (Fri, 04 May 2012)
New Revision: 40801
Added:
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/web.xml.original
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebXMLValidationTest.java
Log:
JBIDE-11782
https://issues.jboss.org/browse/JBIDE-11782
Methods in WebXMLValidationTest are made independent of the order of their execution.
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/web.xml.original
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/web.xml.original (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/web.xml.original 2012-05-04 18:54:50 UTC (rev 40801)
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <display-name>jsf</display-name>
+ <listener>
+ <listener-class>abc</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <!-- <servlet-class>javax.faces.webapp.FacesServlet111</servlet-class> -->
+ <servlet-class>javax.faces.webapp.FacesServlet111</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+</web-app>
Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebXMLValidationTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebXMLValidationTest.java 2012-05-04 17:36:57 UTC (rev 40800)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebXMLValidationTest.java 2012-05-04 18:54:50 UTC (rev 40801)
@@ -108,6 +108,9 @@
markers = webxml.findMarkers(WebXMLCoreValidator.PROBLEM_TYPE, false, IResource.DEPTH_ZERO);
assertTrue(hasMarkerOnLine(markers, 18));
assertFalse(hasMarkerOnLine(markers, 19));
+
+ String patho = "WebContent/WEB-INF/web.xml.original";
+ replaceFile(project, patho, path0);
}
static boolean hasMarkerOnLine(IMarker[] ms, int line) {
12 years, 8 months
JBoss Tools SVN: r40800 - in trunk/common: plugins/org.jboss.tools.common.mylyn/META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-04 13:36:57 -0400 (Fri, 04 May 2012)
New Revision: 40800
Modified:
trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml
trunk/common/plugins/org.jboss.tools.common.mylyn/META-INF/MANIFEST.MF
Log:
set actual versions of mylyn and atlassian connector from TP into org.jboss.tools.common.mylyn/META-INF/MANIFEST.MF and org.jboss.tools.common.mylyn.feature/feature.xml
Modified: trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml 2012-05-04 17:22:45 UTC (rev 40799)
+++ trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml 2012-05-04 17:36:57 UTC (rev 40800)
@@ -8,18 +8,18 @@
<plugin id="org.jboss.tools.common.mylyn" download-size="0" install-size="0" version="0.0.0" />
<requires>
- <import feature="org.eclipse.mylyn_feature" version="3.6.2" match="greaterOrEqual" />
- <import feature="org.eclipse.mylyn.ide_feature" version="3.6.2" match="greaterOrEqual" />
- <import feature="org.eclipse.mylyn.commons" version="3.6.2" match="greaterOrEqual" />
- <import feature="org.eclipse.mylyn.context_feature" version="3.6.2" match="greaterOrEqual" />
- <import feature="org.eclipse.mylyn.bugzilla_feature" version="3.6.2" match="greaterOrEqual" />
- <import feature="org.eclipse.mylyn.java_feature" version="3.6.2" match="greaterOrEqual" />
- <import feature="org.eclipse.mylyn.pde_feature" version="3.6.2" match="greaterOrEqual" />
- <import feature="org.eclipse.mylyn.team_feature" version="3.6.2" match="greaterOrEqual" />
+ <import feature="org.eclipse.mylyn_feature" version="3.6.5" match="greaterOrEqual" />
+ <import feature="org.eclipse.mylyn.ide_feature" version="3.6.5" match="greaterOrEqual" />
+ <import feature="org.eclipse.mylyn.commons" version="3.6.5" match="greaterOrEqual" />
+ <import feature="org.eclipse.mylyn.context_feature" version="3.6.5" match="greaterOrEqual" />
+ <import feature="org.eclipse.mylyn.bugzilla_feature" version="3.6.5" match="greaterOrEqual" />
+ <import feature="org.eclipse.mylyn.java_feature" version="3.6.5" match="greaterOrEqual" />
+ <import feature="org.eclipse.mylyn.pde_feature" version="3.6.5" match="greaterOrEqual" />
+ <import feature="org.eclipse.mylyn.team_feature" version="3.6.5" match="greaterOrEqual" />
- <import feature="org.eclipse.mylyn.versions" version="0.8.2" match="greaterOrEqual" />
+ <import feature="org.eclipse.mylyn.versions" version="0.8.5" match="greaterOrEqual" />
</requires>
-
+
<!-- JBDS-2098 add required mylyn and atlassian plugins/features; not sure if we need subclipse, bamboo, crucible, or fisheye support -->
<!--
<plugin id="com.atlassian.connector.eclipse.bamboo.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
Modified: trunk/common/plugins/org.jboss.tools.common.mylyn/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.mylyn/META-INF/MANIFEST.MF 2012-05-04 17:22:45 UTC (rev 40799)
+++ trunk/common/plugins/org.jboss.tools.common.mylyn/META-INF/MANIFEST.MF 2012-05-04 17:36:57 UTC (rev 40800)
@@ -6,14 +6,14 @@
Bundle-Vendor: JBoss by Red Hat
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.jboss.tools.common.mylyn,
- org.eclipse.mylyn;bundle-version="3.6.0",
+ org.eclipse.mylyn;bundle-version="3.6.5",
org.eclipse.mylyn.commons.core;bundle-version="3.6.0",
- org.eclipse.mylyn.commons.ui;bundle-version="3.6.0",
- org.eclipse.mylyn.tasks.core;bundle-version="3.6.0",
- org.eclipse.mylyn.tasks.ui;bundle-version="3.6.0",
+ org.eclipse.mylyn.commons.ui;bundle-version="3.6.1",
+ org.eclipse.mylyn.tasks.core;bundle-version="3.6.1",
+ org.eclipse.mylyn.tasks.ui;bundle-version="3.6.5",
org.eclipse.core.runtime;bundle-version="3.7.0",
- com.atlassian.connector.eclipse.commons.core;bundle-version="3.0.0";resolution:=optional,
- com.atlassian.connector.eclipse.commons.ui;bundle-version="3.0.0";resolution:=optional,
- com.atlassian.connector.eclipse.jira.core;bundle-version="3.0.0";resolution:=optional,
- com.atlassian.connector.eclipse.jira.ui;bundle-version="3.0.0";resolution:=optional
+ com.atlassian.connector.eclipse.commons.core;bundle-version="3.0.2";resolution:=optional,
+ com.atlassian.connector.eclipse.commons.ui;bundle-version="3.0.2";resolution:=optional,
+ com.atlassian.connector.eclipse.jira.core;bundle-version="3.0.2";resolution:=optional,
+ com.atlassian.connector.eclipse.jira.ui;bundle-version="3.0.2";resolution:=optional
Eclipse-BundleShape: dir
12 years, 8 months
JBoss Tools SVN: r40799 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-05-04 13:22:45 -0400 (Fri, 04 May 2012)
New Revision: 40799
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java
Log:
Corrected expected results - did this ever work before?
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java 2012-05-04 14:54:26 UTC (rev 40798)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java 2012-05-04 17:22:45 UTC (rev 40799)
@@ -24,12 +24,12 @@
bot.sleep(Timing.time3S());
assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]"));
assertNotNull("Calling Send message failed, nothing appened to server log",text);
- assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("Order Items"));
+ assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("Order Value Objects Populated"));
text = executeClient(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformxml2pojo.test","ReceiveJMSMessage.java");
assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]"));
assertNotNull("Calling Send message failed, nothing appened to server log",text);
- assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("Order Items"));
+ assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("Order Value Objects Populated"));
SWTTestExt.servers.removeAllProjectsFromServer();
}
}
12 years, 8 months
JBoss Tools SVN: r40798 - trunk/documentation/whatsnew.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-05-04 10:54:26 -0400 (Fri, 04 May 2012)
New Revision: 40798
Modified:
trunk/documentation/whatsnew/index.html
Log:
Changed N&N links from "Visual Page Editor" to "Visual Page Editor/BrowserSim" when it is appropriate
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2012-05-04 14:51:48 UTC (rev 40797)
+++ trunk/documentation/whatsnew/index.html 2012-05-04 14:54:26 UTC (rev 40798)
@@ -68,7 +68,7 @@
<p><a href="ws/ws-news-1.2.2.Beta1.html">Webservices Tools</a></p>
<p><a href="jst/jst-news-3.3.0.Beta1.html">JST/JSF</a></p>
- <p><a href="vpe/vpe-news-3.3.0.Beta1.html">Visual Page Editor</a></p>
+ <p><a href="vpe/vpe-news-3.3.0.Beta1.html">Visual Page Editor/BrowserSim</a></p>
<p><a href="hibernate/hibernate-news-3.5.0.Beta1.html">Hibernate Tools</a></p>
@@ -89,7 +89,7 @@
<p><a href="as/as-news-3.3.0.M5.html">JBoss AS Server
Tools</a></p>
<p><a href="jst/jst-news-3.3.0.M5.html">JST/JSF</a></p>
- <p><a href="vpe/vpe-news-3.3.0.M5.html">Visual Page Editor</a></p>
+ <p><a href="vpe/vpe-news-3.3.0.M5.html">Visual Page Editor/BrowserSim</a></p>
<p><a href="cdi/cdi-news-3.3.0.M5.html">CDI/Seam 3 Tools</a></p>
<p><a href="forge/forge-news-3.3.0.M5.html">Forge Tools</a></p>
<p><a href="hibernate/hibernate-news-3.5.0.M5.html">Hibernate Tools</a></p>
12 years, 8 months
JBoss Tools SVN: r40797 - trunk/documentation/whatsnew.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-05-04 10:51:48 -0400 (Fri, 04 May 2012)
New Revision: 40797
Modified:
trunk/documentation/whatsnew/index.html
Log:
https://issues.jboss.org/browse/JBIDE-11744 : Create "New and Noteworthy" for 3.3.0.Beta3 /
https://issues.jboss.org/browse/JBIDE-11755 : Visual Editor Component N&N
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2012-05-04 14:48:04 UTC (rev 40796)
+++ trunk/documentation/whatsnew/index.html 2012-05-04 14:51:48 UTC (rev 40797)
@@ -34,8 +34,17 @@
<hr>
</td>
</tr>
+
<tr>
<td valign="top" align="left">
+ <p align="right"><b>3.3.0.Beta3</b>
+ <td valign="top">
+ <p><a href="vpe/vpe-news-3.3.0.Beta3.html">Visual Page Editor/BrowserSim</a></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
<p align="right"><b>3.3.0.Beta1</b>
<td valign="top">
12 years, 8 months
JBoss Tools SVN: r40796 - in trunk/documentation/whatsnew/vpe: images/3.3.0.Beta3 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-05-04 10:48:04 -0400 (Fri, 04 May 2012)
New Revision: 40796
Modified:
trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/browsersim-android.png
trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/browsersim-iphone4.png
trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/browsersim-rotate.png
trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/view-source-option.png
trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.Beta3.html
Log:
https://issues.jboss.org/browse/JBIDE-11755 : Visual Editor Component N&N
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/browsersim-android.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/browsersim-iphone4.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/browsersim-rotate.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/view-source-option.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.Beta3.html
___________________________________________________________________
Added: svn:mime-type
+ text/html
12 years, 8 months
JBoss Tools SVN: r40795 - in trunk/documentation/whatsnew/vpe: images and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-05-04 10:45:17 -0400 (Fri, 04 May 2012)
New Revision: 40795
Added:
trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/
trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/browsersim-android.png
trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/browsersim-iphone4.png
trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/browsersim-rotate.png
trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/view-source-option.png
trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.Beta3.html
Log:
https://issues.jboss.org/browse/JBIDE-11755 : Visual Editor Component N&N
Added: trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/browsersim-android.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/browsersim-android.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/browsersim-iphone4.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/browsersim-iphone4.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/browsersim-rotate.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/browsersim-rotate.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/view-source-option.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.Beta3/view-source-option.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.Beta3.html
===================================================================
--- trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.Beta3.html (rev 0)
+++ trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.Beta3.html 2012-05-04 14:45:17 UTC (rev 40795)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css" />
+<title>Visual Page Editor/BrowserSim 3.3.0.Beta3 What's New</title>
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-17645367-5']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+</script></head>
+<body>
+<h1 style="text-align:left">Visual Page Editor/BrowserSim 3.3.0.Beta3 What's New</h1>
+
+<p align="right">
+<a href="../index.html">< Main Index</a>
+<a href="../hibernate/hibernate-news-3.3.0.Beta3.html">Hibernate Tools ></a>
+</p>
+
+<table border="0" cellpadding="10" cellspacing="0">
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>BrowserSim</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <b><p>
+ View Source Option
+ <p></b>
+ </td>
+ <td valign="top">
+ <p>Now BrowserSim has a View Source option, so it is easy to view the HTML source directly in Eclipse.</p>
+ <p>
+ <img src="images/3.3.0.Beta3/view-source-option.png" width="555px" height="756px">
+ </p>
+ <p><small>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-11179">Related Jira</a>
+ </small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <b><p>
+ Two new skins for BrowserSim
+ <p></b>
+ </td>
+ <td valign="top">
+ <p>BrowserSim got iPhone 4 and Android skins.</p>
+ <p style="width:850px">
+ <img src="images/3.3.0.Beta3/browsersim-iphone4.png" style="padding-right:20px;" height="711px" width="376px">
+ <img src="images/3.3.0.Beta3/browsersim-android.png" height="635px" width="419px">
+ </p>
+ <p><small>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-10945">Related Jira</a>
+ </small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <b><p>
+ Rotate phone "on" the skin
+ <p></b>
+ </td>
+ <td valign="top">
+ <p>Now phones may be rotated by a right mouse click on one of the four corners.</p>
+ <p>
+ <img src="images/3.3.0.Beta3/browsersim-rotate.png" width="376px" height="711px">
+ </p>
+ <p><small>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-11053">Related Jira</a>
+ </small></p>
+ </td>
+ </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
12 years, 8 months
JBoss Tools SVN: r40794 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-05-04 10:19:48 -0400 (Fri, 04 May 2012)
New Revision: 40794
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java
Log:
JBIDE-11478 npe fix
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java 2012-05-04 14:13:10 UTC (rev 40793)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java 2012-05-04 14:19:48 UTC (rev 40794)
@@ -94,7 +94,8 @@
}
} else {
ServerExtendedProperties props = (ServerExtendedProperties)server.loadAdapter(ServerExtendedProperties.class, new NullProgressMonitor());
- urlString = props.getWelcomePageUrl();
+ if( props != null )
+ urlString = props.getWelcomePageUrl();
}
}
return urlString;
12 years, 8 months
JBoss Tools SVN: r40793 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details: jpa2 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2012-05-04 10:13:10 -0400 (Fri, 04 May 2012)
New Revision: 40793
Added:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersistenceUnitClassesComposite.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersistenceUnitGeneralComposite.java
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersistenceXmlUiFactory.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/jpa2/HibernatePersistenceXml2_0UiFactory.java
Log:
https://issues.jboss.org/browse/JBIDE-11773
Remove <exclude-unlisted-classes> element instead of setting it to false
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersistenceUnitClassesComposite.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersistenceUnitClassesComposite.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersistenceUnitClassesComposite.java 2012-05-04 14:13:10 UTC (rev 40793)
@@ -0,0 +1,328 @@
+/*******************************************************************************
+ * Copyright (c) 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.hibernate.jpt.ui.internal.persistence.details;
+
+import java.util.ListIterator;
+
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.search.IJavaSearchScope;
+import org.eclipse.jdt.core.search.SearchEngine;
+import org.eclipse.jdt.ui.IJavaElementSearchConstants;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages;
+import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane;
+import org.eclipse.jpt.common.ui.internal.widgets.AddRemovePane.Adapter;
+import org.eclipse.jpt.common.ui.internal.widgets.Pane;
+import org.eclipse.jpt.common.utility.internal.model.value.ItemPropertyListValueModelAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
+import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
+import org.eclipse.jpt.common.utility.internal.model.value.swing.ObjectListSelectionModel;
+import org.eclipse.jpt.common.utility.model.value.ListValueModel;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
+import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
+import org.eclipse.jpt.jpa.core.context.persistence.ClassRef;
+import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
+import org.eclipse.jpt.jpa.ui.JptJpaUiPlugin;
+import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
+import org.eclipse.jpt.jpa.ui.internal.JpaMappingImageHelper;
+import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.internal.persistence.JptUiPersistenceMessages;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.SelectionDialog;
+import org.eclipse.ui.progress.IProgressService;
+
+
+/**
+ *
+ * @author Dmitry Geraskov (geraskov(a)gmail.com)
+ *
+ */
+public class HibernatePersistenceUnitClassesComposite extends Pane<PersistenceUnit> {
+
+ public HibernatePersistenceUnitClassesComposite(
+ Pane<? extends PersistenceUnit> parentPane, Composite parent) {
+ super(parentPane, parent);
+ }
+
+ private void addMappedClass(ObjectListSelectionModel listSelectionModel) {
+
+ IType type = chooseType();
+
+ if (type != null) {
+ String className = type.getFullyQualifiedName('$');
+ if(classRefExists(className)) {
+ return;
+ }
+ ClassRef classRef = getSubject().addSpecifiedClassRef(className);
+ listSelectionModel.setSelectedValue(classRef);
+ }
+ }
+
+ private boolean classRefExists(String className) {
+ for ( ListIterator<ClassRef> i = getSubject().specifiedClassRefs(); i.hasNext(); ) {
+ ClassRef classRef = i.next();
+ if( classRef.getClassName().equals(className)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private Adapter buildAdapter() {
+ return new AddRemoveListPane.AbstractAdapter() {
+ public void addNewItem(ObjectListSelectionModel listSelectionModel) {
+ addMappedClass(listSelectionModel);
+ }
+
+ @Override
+ public boolean enableOptionOnSelectionChange(ObjectListSelectionModel listSelectionModel) {
+ if (!super.enableOptionOnSelectionChange(listSelectionModel)) {
+ return false;
+ }
+
+ return findType((ClassRef) listSelectionModel.selectedValue()) != null;
+ }
+
+ @Override
+ public boolean hasOptionalButton() {
+ return true;
+ }
+
+ @Override
+ public String optionalButtonText() {
+ return JptUiPersistenceMessages.PersistenceUnitClassesComposite_open;
+ }
+
+ @Override
+ public void optionOnSelection(ObjectListSelectionModel listSelectionModel) {
+ openMappedClass((ClassRef) listSelectionModel.selectedValue());
+ }
+
+ public void removeSelectedItems(ObjectListSelectionModel listSelectionModel) {
+ for (Object item : listSelectionModel.selectedValues()) {
+ getSubject().removeSpecifiedClassRef((ClassRef) item);
+ }
+ }
+ };
+ }
+
+ private WritablePropertyValueModel<Boolean> buildExcludeUnlistedMappedClassesHolder() {
+ return new PropertyAspectAdapter<PersistenceUnit, Boolean>(
+ getSubjectHolder(),
+ PersistenceUnit.SPECIFIED_EXCLUDE_UNLISTED_CLASSES_PROPERTY)
+ {
+ @Override
+ protected Boolean buildValue_() {
+ return this.subject.getSpecifiedExcludeUnlistedClasses();
+ }
+
+ @Override
+ protected void setValue_(Boolean value) {
+ if (value != null && !value){
+ //fix for https://issues.jboss.org/browse/JBIDE-11773 and https://hibernate.onjira.com/browse/HHH-7301
+ //remove the element
+ value = null;
+ }
+ this.subject.setSpecifiedExcludeUnlistedClasses(value);
+ }
+ };
+ }
+
+ private ILabelProvider buildLabelProvider() {
+ return new LabelProvider() {
+ @Override
+ public Image getImage(Object element) {
+ ClassRef classRef = (ClassRef) element;
+ JavaPersistentType persistentType = classRef.getJavaPersistentType();
+ Image image = null;
+
+ if (persistentType != null) {
+ image = JpaMappingImageHelper.imageForTypeMapping(persistentType.getMappingKey());
+ }
+
+ if (image != null) {
+ return image;
+ }
+
+ return JptJpaUiPlugin.getImage(JptUiIcons.WARNING);
+ }
+
+ @Override
+ public String getText(Object element) {
+ ClassRef classRef = (ClassRef) element;
+ String name = classRef.getClassName();
+
+ if (name == null) {
+ name = JptUiPersistenceMessages.PersistenceUnitClassesComposite_mappedClassesNoName;
+ }
+
+ return name;
+ }
+ };
+ }
+
+ private ListValueModel<ClassRef> buildItemListHolder() {
+ return new ItemPropertyListValueModelAdapter<ClassRef>(
+ buildListHolder(),
+ ClassRef.JAVA_PERSISTENT_TYPE_PROPERTY,
+ ClassRef.CLASS_NAME_PROPERTY
+ );
+ }
+
+ private ListValueModel<ClassRef> buildListHolder() {
+ return new ListAspectAdapter<PersistenceUnit, ClassRef>(getSubjectHolder(), PersistenceUnit.SPECIFIED_CLASS_REFS_LIST) {
+ @Override
+ protected ListIterator<ClassRef> listIterator_() {
+ return subject.specifiedClassRefs();
+ }
+
+ @Override
+ protected int size_() {
+ return subject.specifiedClassRefsSize();
+ }
+ };
+ }
+
+ private WritablePropertyValueModel<ClassRef> buildSelectedItemHolder() {
+ return new SimplePropertyValueModel<ClassRef>();
+ }
+
+ /**
+ * Prompts the user the Open Type dialog.
+ *
+ * @return Either the selected type or <code>null</code> if the user
+ * canceled the dialog
+ */
+ private IType chooseType() {
+ IJavaProject javaProject = getJavaProject();
+ IJavaElement[] elements = new IJavaElement[] { javaProject };
+ IJavaSearchScope scope = SearchEngine.createJavaSearchScope(elements);
+ IProgressService service = PlatformUI.getWorkbench().getProgressService();
+ SelectionDialog typeSelectionDialog;
+
+ try {
+ typeSelectionDialog = JavaUI.createTypeDialog(
+ getShell(),
+ service,
+ scope,
+ IJavaElementSearchConstants.CONSIDER_CLASSES,
+ false,
+ ""
+ );
+ }
+ catch (JavaModelException e) {
+ JptJpaUiPlugin.log(e);
+ return null;
+ }
+
+ typeSelectionDialog.setTitle(JptCommonUiMessages.ClassChooserPane_dialogTitle);
+ typeSelectionDialog.setMessage(JptCommonUiMessages.ClassChooserPane_dialogMessage);
+
+ if (typeSelectionDialog.open() == Window.OK) {
+ return (IType) typeSelectionDialog.getResult()[0];
+ }
+
+ return null;
+ }
+
+ private IType findType(ClassRef classRef) {
+ String className = classRef.getClassName();
+
+ if (className != null) {
+ try {
+ return getSubject().getJpaProject().getJavaProject().findType(className.replace('$', '.'));
+ }
+ catch (JavaModelException e) {
+ JptJpaUiPlugin.log(e);
+ }
+ }
+
+ return null;
+ }
+
+ /*
+ * (non-Javadoc)
+ */
+ @Override
+ protected void initializeLayout(Composite container) {
+
+ // Description
+ addMultiLineLabel(
+ container,
+ JptUiPersistenceMessages.PersistenceUnitClassesComposite_description
+ );
+
+ // List pane
+ new AddRemoveListPane<PersistenceUnit>(
+ this,
+ container,
+ this.buildAdapter(),
+ this.buildItemListHolder(),
+ this.buildSelectedItemHolder(),
+ this.buildLabelProvider(),
+ JpaHelpContextIds.PERSISTENCE_XML_GENERAL
+ )
+ {
+ @Override
+ protected void initializeTable(Table table) {
+ super.initializeTable(table);
+
+ Composite container = table.getParent();
+ GridData gridData = (GridData) container.getLayoutData();
+ gridData.heightHint = 75;
+ }
+ };
+
+ this.addCheckBox(
+ container,
+ JptUiPersistenceMessages.PersistenceUnitClassesComposite_excludeUnlistedMappedClasses,
+ buildExcludeUnlistedMappedClassesHolder(),
+ JpaHelpContextIds.PERSISTENCE_XML_GENERAL
+ );
+ }
+
+ private void openMappedClass(ClassRef classRef) {
+
+ IType type = findType(classRef);
+
+ if (type != null) {
+ try {
+ IJavaElement javaElement = type.getParent();
+ JavaUI.openInEditor(javaElement, true, true);
+ }
+ catch (PartInitException e) {
+ JptJpaUiPlugin.log(e);
+ }
+ catch (JavaModelException e) {
+ JptJpaUiPlugin.log(e);
+ }
+ }
+ }
+
+ private IJavaProject getJavaProject() {
+ return getSubject().getJpaProject().getJavaProject();
+ }
+}
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersistenceUnitGeneralComposite.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersistenceUnitGeneralComposite.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersistenceUnitGeneralComposite.java 2012-05-04 14:13:10 UTC (rev 40793)
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.hibernate.jpt.ui.internal.persistence.details;
+
+import org.eclipse.jpt.common.ui.WidgetFactory;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
+import org.eclipse.jpt.jpa.ui.internal.persistence.JptUiPersistenceMessages;
+import org.eclipse.jpt.jpa.ui.internal.persistence.details.GenericPersistenceUnitGeneralComposite;
+import org.eclipse.jpt.jpa.ui.internal.persistence.details.PersistenceUnitClassesComposite;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ *
+ * @author Dmitry Geraskov (geraskov(a)gmail.com)
+ *
+ */
+public class HibernatePersistenceUnitGeneralComposite extends
+ GenericPersistenceUnitGeneralComposite {
+
+ public HibernatePersistenceUnitGeneralComposite(
+ PropertyValueModel<PersistenceUnit> subjectHolder,
+ Composite container, WidgetFactory widgetFactory) {
+ super(subjectHolder, container, widgetFactory);
+ }
+
+ protected void initializeMappedClassesPane(Composite container) {
+
+ container = addCollapsibleSection(
+ container,
+ JptUiPersistenceMessages.PersistenceUnitGeneralComposite_mappedClasses
+ );
+
+ updateGridData(container);
+ updateGridData(container.getParent());
+
+ new HibernatePersistenceUnitClassesComposite(this, container);
+ }
+
+}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersistenceXmlUiFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersistenceXmlUiFactory.java 2012-05-04 14:10:26 UTC (rev 40792)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersistenceXmlUiFactory.java 2012-05-04 14:13:10 UTC (rev 40793)
@@ -19,7 +19,6 @@
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
import org.eclipse.jpt.jpa.ui.details.JpaPageComposite;
-import org.eclipse.jpt.jpa.ui.internal.persistence.details.GenericPersistenceUnitGeneralComposite;
import org.eclipse.jpt.jpa.ui.internal.persistence.details.PersistenceUnitConnectionComposite;
import org.eclipse.jpt.jpa.ui.internal.persistence.details.PersistenceUnitPropertiesComposite;
import org.eclipse.jpt.jpa.ui.internal.persistence.details.PersistenceXmlUiFactory;
@@ -39,7 +38,7 @@
Composite parent, WidgetFactory widgetFactory) {
List<JpaPageComposite> pages = new ArrayList<JpaPageComposite>(1);
- pages.add(new GenericPersistenceUnitGeneralComposite(subjectHolder, parent, widgetFactory));
+ pages.add(new HibernatePersistenceUnitGeneralComposite(subjectHolder, parent, widgetFactory));
pages.add(new PersistenceUnitConnectionComposite(subjectHolder, parent, widgetFactory));
pages.add(new PersistenceUnitPropertiesComposite(subjectHolder, parent, widgetFactory));
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/jpa2/HibernatePersistenceXml2_0UiFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/jpa2/HibernatePersistenceXml2_0UiFactory.java 2012-05-04 14:10:26 UTC (rev 40792)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/jpa2/HibernatePersistenceXml2_0UiFactory.java 2012-05-04 14:13:10 UTC (rev 40793)
@@ -23,12 +23,12 @@
import org.eclipse.jpt.jpa.ui.details.JpaPageComposite;
import org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.connection.GenericPersistenceUnit2_0ConnectionTab;
import org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.options.GenericPersistenceUnit2_0OptionsTab;
-import org.eclipse.jpt.jpa.ui.internal.persistence.details.GenericPersistenceUnitGeneralComposite;
import org.eclipse.jpt.jpa.ui.internal.persistence.details.PersistenceUnitPropertiesComposite;
import org.eclipse.jpt.jpa.ui.internal.persistence.details.PersistenceXmlUiFactory;
import org.eclipse.swt.widgets.Composite;
import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersistenceUnit;
import org.jboss.tools.hibernate.jpt.core.internal.context.basic.BasicHibernateProperties;
+import org.jboss.tools.hibernate.jpt.ui.internal.persistence.details.HibernatePersistenceUnitGeneralComposite;
import org.jboss.tools.hibernate.jpt.ui.internal.persistence.details.HibernatePropertiesComposite;
/**
@@ -50,7 +50,7 @@
PropertyValueModel<JpaOptions2_0> options2_0Holder = this
.buildJpaOptions2_0Holder(subjectHolder);
- pages.add(new GenericPersistenceUnitGeneralComposite(subjectHolder,
+ pages.add(new HibernatePersistenceUnitGeneralComposite(subjectHolder,
parent, widgetFactory));
pages.add(new GenericPersistenceUnit2_0ConnectionTab(
connection2_0Holder, parent, widgetFactory));
12 years, 8 months