JBoss Tools SVN: r38900 - branches/jbosstools-3.3.0.Beta1/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-18 13:55:54 -0500 (Sat, 18 Feb 2012)
New Revision: 38900
Modified:
branches/jbosstools-3.3.0.Beta1/build/parent/pom.xml
Log:
switch to use correct branch of composite site
Modified: branches/jbosstools-3.3.0.Beta1/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta1/build/parent/pom.xml 2012-02-17 23:19:40 UTC (rev 38899)
+++ branches/jbosstools-3.3.0.Beta1/build/parent/pom.xml 2012-02-18 18:55:54 UTC (rev 38900)
@@ -35,19 +35,19 @@
<!-- 1a. URL of latest JBT target platform site -->
<jbosstools-target-site>http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S...</jbosstools-target-site>
- <!-- 1b. or use -Plocal.site -Dlocal.site=file:///home/$user/trunk/build/target-platform/REPO/ -->
+ <!-- 1b. or use -Plocal.site -Dlocal.site=file:///home/$user/3.3.indigo/build/target-platform/REPO/ -->
<!-- TODO: don't forget to update JBDS .updatesite jobs when this value changes! -->
<local.site>file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo.SR1-M/e372M-wtp332M.target/</local.site>
<!-- 2a. URL of latest JBT nightly staging composite site (all the components
in once place) -->
- <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk/</jbosstools-nightly-staging-composite>
+ <!-- for trunk use _composite_/3.3.indigo; for 3.3_stable_branch, use _composite_/3.3.indigo -->
+ <jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/core/3.3....</jbosstools-nightly-staging-composite>
<!-- this site is not enabled by default as SOA Tooling is a downstream project (sorta). -->
- <jbosstools-nightly-staging-composite-soa-tooling>http://download.jboss.org/jbosstools/builds/staging/_composite_/soa-tooli...</jbosstools-nightly-staging-composite-soa-tooling>
+ <jbosstools-nightly-staging-composite-soa-tooling>http://download.jboss.org/jbosstools/builds/staging/_composite_/soa-tooli...</jbosstools-nightly-staging-composite-soa-tooling>
<!-- 2b. or use -Plocal.composite -Dlocal.composite=file:///path/to/mirror/of/composite/staging/site/ -->
- <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
+ <!-- for trunk use _composite_/3.3.indigo; for 3.3_stable_branch, use _composite_/3.3.indigo -->
<local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/3.3.indigo/</local.composite>
<!-- 3a. URL of latest JBT requirements composite mirror -->
@@ -58,9 +58,9 @@
<!-- 4. published aggregate update site goes here, for consumption by QE
and downstream JBDS builds -->
- <jbosstools-nightly>http://download.jboss.org/jbosstools/updates/nightly/core/trunk/</jbosstools-nightly>
+ <jbosstools-nightly>http://download.jboss.org/jbosstools/updates/nightly/core/3.3.indigo/</jbosstools-nightly>
<!-- this site is not enabled by default as SOA Tooling is a downstream project (sorta). -->
- <jbosstools-nightly-soa-tooling>http://download.jboss.org/jbosstools/updates/nightly/soa-tooling/trunk/</jbosstools-nightly-soa-tooling>
+ <jbosstools-nightly-soa-tooling>http://download.jboss.org/jbosstools/updates/nightly/soa-tooling/3.3.indigo/</jbosstools-nightly-soa-tooling>
<!-- 5. extra requirements (for 3rd party "Extras" site) -->
<jboss-requirements-composite-extras-mirror>http://download.jboss.org/jbosstools/updates/indigo/extras/SR1a/</jboss-requirements-composite-extras-mirror>
@@ -432,7 +432,7 @@
<!-- To use this profile, must have first created a local.target file,
which points to a local repo. You can do this by hand or generate it from
- multiple.target using: cd ~/trunk/build/target-platform; ant See also the
+ multiple.target using: cd ~/3.3.indigo/build/target-platform; ant See also the
README in target-platform/ folder for additional usage examples. You can
also run `ant help`. If you want to build the target-platform/pom.xml AND
generate a local repo + local.target file ALL AT THE SAME TIME, you can do:
14 years, 1 month
JBoss Tools SVN: r38899 - in branches/jbosstools-3.3.0.Beta1/build: target-platform and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-17 18:19:40 -0500 (Fri, 17 Feb 2012)
New Revision: 38899
Modified:
branches/jbosstools-3.3.0.Beta1/build/parent/pom.xml
branches/jbosstools-3.3.0.Beta1/build/target-platform/multiple.target
branches/jbosstools-3.3.0.Beta1/build/target-platform/multiple.target.p2mirror.xml
Log:
switch to stable_branch
Modified: branches/jbosstools-3.3.0.Beta1/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta1/build/parent/pom.xml 2012-02-17 23:14:04 UTC (rev 38898)
+++ branches/jbosstools-3.3.0.Beta1/build/parent/pom.xml 2012-02-17 23:19:40 UTC (rev 38899)
@@ -48,7 +48,7 @@
<!-- 2b. or use -Plocal.composite -Dlocal.composite=file:///path/to/mirror/of/composite/staging/site/ -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/trunk/</local.composite>
+ <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/3.3.indigo/</local.composite>
<!-- 3a. URL of latest JBT requirements composite mirror -->
<jboss-requirements-composite-mirror>http://download.jboss.org/jbosstools/updates/indigo/SR1-M/</jboss-requirements-composite-mirror>
Modified: branches/jbosstools-3.3.0.Beta1/build/target-platform/multiple.target
===================================================================
--- branches/jbosstools-3.3.0.Beta1/build/target-platform/multiple.target 2012-02-17 23:14:04 UTC (rev 38898)
+++ branches/jbosstools-3.3.0.Beta1/build/target-platform/multiple.target 2012-02-17 23:19:40 UTC (rev 38899)
@@ -9,7 +9,7 @@
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
+ <repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
@@ -339,4 +339,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
\ No newline at end of file
+</target>
Modified: branches/jbosstools-3.3.0.Beta1/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta1/build/target-platform/multiple.target.p2mirror.xml 2012-02-17 23:14:04 UTC (rev 38898)
+++ branches/jbosstools-3.3.0.Beta1/build/target-platform/multiple.target.p2mirror.xml 2012-02-17 23:19:40 UTC (rev 38899)
@@ -28,7 +28,7 @@
<p2.mirror destination="file://${repoDir}" verbose="${verbose}">
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
-<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
+<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/"/>
<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1-M/"/>
</source>
<iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
14 years, 1 month
JBoss Tools SVN: r38898 - branches.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-17 18:14:04 -0500 (Fri, 17 Feb 2012)
New Revision: 38898
Added:
branches/jbosstools-3.3.0.Beta1/
Log:
branch for Beta1
14 years, 1 month
JBoss Tools SVN: r38897 - trunk/jst/features/org.jboss.tools.jst.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-02-17 18:08:38 -0500 (Fri, 17 Feb 2012)
New Revision: 38897
Modified:
trunk/jst/features/org.jboss.tools.jst.feature/feature.xml
Log:
added jst.ui.bot.test into jst update site for fix JBDS product update site build error
[ERROR] Cannot resolve project dependencies:
[ERROR] Software being installed: com.jboss.jbds.extras.ui.bot.test 1.0.0.qualifier
[ERROR] Missing requirement: com.jboss.jbds.extras.ui.bot.test 1.0.0.qualifier requires 'bundle org.jboss.tools.ui.bot.ext 3.2.0' but it could not be found
[ERROR]
[ERROR] Internal error: java.lang.RuntimeException: "No solution found because the problem is unsatisfiable.": ["Unable to satisfy dependency from com.jboss.jbds.extras.ui.bot.test 1.0.0.qualifier to bundle org.jboss.tools.ui.bot.ext 3.2.0.", "Unable to satisfy dependency from com.jboss.jbds.extras.ui.bot.test 1.0.0.qualifier to bundle org.jboss.tools.jst.ui.bot.test 3.3.0.", "No solution found because the problem is unsatisfiable."]
Modified: trunk/jst/features/org.jboss.tools.jst.feature/feature.xml
===================================================================
--- trunk/jst/features/org.jboss.tools.jst.feature/feature.xml 2012-02-17 23:03:57 UTC (rev 38896)
+++ trunk/jst/features/org.jboss.tools.jst.feature/feature.xml 2012-02-17 23:08:38 UTC (rev 38897)
@@ -89,4 +89,18 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.jboss.tools.jst.ui.bot.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jst.ui.firstrun.bot.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
14 years, 1 month
JBoss Tools SVN: r38896 - in trunk/requirements: seam-2.2.1.CR1 and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-17 18:03:57 -0500 (Fri, 17 Feb 2012)
New Revision: 38896
Added:
trunk/requirements/seam-2.2.1.Final/
trunk/requirements/seam-2.2.1.Final/build.properties
trunk/requirements/seam-2.2.1.Final/buildRequirement.xml
Modified:
trunk/requirements/seam-2.2.1.CR1/build.properties
trunk/requirements/seam-2.2.1.CR2/build.properties
Log:
https://issues.jboss.org/browse/JBIDE-10950 fix URLs for seam 2.2.1.x; add req builder for seam-2.2.1.Final
Modified: trunk/requirements/seam-2.2.1.CR1/build.properties
===================================================================
--- trunk/requirements/seam-2.2.1.CR1/build.properties 2012-02-17 22:41:36 UTC (rev 38895)
+++ trunk/requirements/seam-2.2.1.CR1/build.properties 2012-02-17 23:03:57 UTC (rev 38896)
@@ -1,5 +1,5 @@
#seam.build.uri=http://downloads.sourceforge.net/sourceforge/jboss
-seam.build.uri=http://softlayer.dl.sourceforge.net/project/jboss/JBoss%20Seam/2.2.1.CR1/
+seam.build.uri=http://downloads.sourceforge.net/project/jboss/JBoss%20Seam/2.2.1.CR1/
seam-2.2.1.CR1.build.uri=${seam.build.uri}
build.uri=${seam-2.2.1.CR1.build.uri}
build.archive=jboss-seam-2.2.1.CR1.zip
Modified: trunk/requirements/seam-2.2.1.CR2/build.properties
===================================================================
--- trunk/requirements/seam-2.2.1.CR2/build.properties 2012-02-17 22:41:36 UTC (rev 38895)
+++ trunk/requirements/seam-2.2.1.CR2/build.properties 2012-02-17 23:03:57 UTC (rev 38896)
@@ -1,5 +1,5 @@
#seam.build.uri=http://downloads.sourceforge.net/sourceforge/jboss
-seam.build.uri=http://softlayer.dl.sourceforge.net/project/jboss/JBoss%20Seam/2.2.1.CR2/
+seam.build.uri=http://downloads.sourceforge.net/project/jboss/JBoss%20Seam/2.2.1.CR2/
seam-2.2.1.CR2.build.uri=${seam.build.uri}
build.uri=${seam-2.2.1.CR2.build.uri}
build.archive=jboss-seam-2.2.1.CR2.zip
Added: trunk/requirements/seam-2.2.1.Final/build.properties
===================================================================
--- trunk/requirements/seam-2.2.1.Final/build.properties (rev 0)
+++ trunk/requirements/seam-2.2.1.Final/build.properties 2012-02-17 23:03:57 UTC (rev 38896)
@@ -0,0 +1,7 @@
+#seam.build.uri=http://downloads.sourceforge.net/sourceforge/jboss
+seam.build.uri=http://downloads.sourceforge.net/project/jboss/JBoss%20Seam/2.2.1.Final/
+seam-2.2.1.GA.build.uri=${seam.build.uri}
+build.uri=${seam-2.2.1.GA.build.uri}
+build.archive=jboss-seam-2.2.1.Final.zip
+build.archive.root=jboss-seam-2.2.1.GA
+md5=b490d794e805aef78cb9fee510073850
Property changes on: trunk/requirements/seam-2.2.1.Final/build.properties
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/requirements/seam-2.2.1.Final/buildRequirement.xml
===================================================================
--- trunk/requirements/seam-2.2.1.Final/buildRequirement.xml (rev 0)
+++ trunk/requirements/seam-2.2.1.Final/buildRequirement.xml 2012-02-17 23:03:57 UTC (rev 38896)
@@ -0,0 +1,3 @@
+<project default="build.requirement">
+ <import file="../seam-2.0.1.GA/buildRequirement.xml" />
+</project>
\ No newline at end of file
Property changes on: trunk/requirements/seam-2.2.1.Final/buildRequirement.xml
___________________________________________________________________
Added: svn:executable
+ *
14 years, 1 month
JBoss Tools SVN: r38895 - in trunk: download.jboss.org/jbosstools/builds/cascade and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-17 17:41:36 -0500 (Fri, 17 Feb 2012)
New Revision: 38895
Modified:
trunk/build/pom-core.xml
trunk/build/pom.xml
trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
Log:
by transitive property, central depends on usage
Modified: trunk/build/pom-core.xml
===================================================================
--- trunk/build/pom-core.xml 2012-02-17 21:27:41 UTC (rev 38894)
+++ trunk/build/pom-core.xml 2012-02-17 22:41:36 UTC (rev 38895)
@@ -580,6 +580,7 @@
<module>../runtime</module>
<module>../freemarker</module>
<module>../hibernatetools</module>
+ <module>../usage</module>
<module>../jst</module>
<module>../vpe</module>
<module>../jsf</module>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2012-02-17 21:27:41 UTC (rev 38894)
+++ trunk/build/pom.xml 2012-02-17 22:41:36 UTC (rev 38895)
@@ -700,6 +700,7 @@
<module>../runtime</module>
<module>../freemarker</module>
<module>../hibernatetools</module>
+ <module>../usage</module>
<module>../jst</module>
<module>../vpe</module>
<module>../jsf</module>
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2012-02-17 21:27:41 UTC (rev 38894)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2012-02-17 22:41:36 UTC (rev 38895)
@@ -39,7 +39,7 @@
tptp [REMOVED]
smooks [removed from JBDS, still in JBT]
seam -> hibernate, jsf
-central -> examples, portlet, seam, as, archives, jmx, jsf, vpe, jst, hibernate, freemarker, runtime, common, tests, maven
+central -> examples, portlet, seam, as, archives, jmx, jsf, vpe, jst, hibernate, freemarker, runtime, common, tests, maven, usage
runtime -> common, tests, jmx
esb -> as, jst, common, tests
cdi -> jst
14 years, 1 month
JBoss Tools SVN: r38894 - in trunk/examples/plugins/org.jboss.tools.project.examples: schema and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-02-17 16:27:41 -0500 (Fri, 17 Feb 2012)
New Revision: 38894
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml
trunk/examples/plugins/org.jboss.tools.project.examples/schema/downloadruntimes.exsd
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/DownloadRuntimeDialog.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/runtimes/DownloadRuntime.java
Log:
JBIDE-9899 runtime downloads should be clear where it is from (url) and if community show disclaimer
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml 2012-02-17 20:24:33 UTC (rev 38893)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml 2012-02-17 21:27:41 UTC (rev 38894)
@@ -95,44 +95,51 @@
name="JBoss AS 7.1.0 Certified Java EE 6 Full Profile"
version="7.1.0.Final"
size="100MB"
- url="http://download.jboss.org/jbossas/7.1/jboss-as-7.1.0.Final/jboss-as-7.1.0..."/>
+ url="http://download.jboss.org/jbossas/7.1/jboss-as-7.1.0.Final/jboss-as-7.1.0..."
+ disclaimer="true"/>
<runtime
id="org.jboss.tools.runtime.core.as.701"
name="JBoss AS 7.0.1 Everything (NOT Java EE6 Certified)"
version="7.0.1.Final"
size="74MB"
- url="http://download.jboss.org/jbossas/7.0/jboss-as-7.0.1.Final/jboss-as-7.0.1..."/>
+ url="http://download.jboss.org/jbossas/7.0/jboss-as-7.0.1.Final/jboss-as-7.0.1..."
+ disclaimer="true"/>
<runtime
id="org.jboss.tools.runtime.core.as.702"
name="JBoss AS 7.0.2 Everything (NOT Java EE6 Certified)"
version="7.0.2.Final"
size="75MB"
- url="http://download.jboss.org/jbossas/7.0/jboss-as-7.0.2.Final/jboss-as-7.0.2..."/>
+ url="http://download.jboss.org/jbossas/7.0/jboss-as-7.0.2.Final/jboss-as-7.0.2..."
+ disclaimer="true"/>
<runtime
id="org.jboss.tools.runtime.core.seam.222"
name="JBoss Seam 2.2.2.Final"
version="2.2.2.Final"
size="113.2MB"
- url="http://sourceforge.net/projects/jboss/files/JBoss%20Seam/2.2.2.Final/jbos..."/>
+ url="http://sourceforge.net/projects/jboss/files/JBoss%20Seam/2.2.2.Final/jbos..."
+ disclaimer="true"/>
<runtime
id="org.jboss.tools.runtime.core.seam.202"
name="JBoss Seam 2.0.2.SP1"
version="2.0.2.SP1"
size="92.3MB"
- url="http://sourceforge.net/projects/jboss/files/JBoss%20Seam/2.0.2.SP1/jboss-..."/>
+ url="http://sourceforge.net/projects/jboss/files/JBoss%20Seam/2.0.2.SP1/jboss-..."
+ disclaimer="true"/>
<runtime
id="org.jboss.tools.runtime.core.as.610"
name="JBoss AS 6.1.0"
version="6.1.0.Final"
size="183MB"
- url="http://download.jboss.org/jbossas/6.1/jboss-as-distribution-6.1.0.Final.z..."/>
+ url="http://download.jboss.org/jbossas/6.1/jboss-as-distribution-6.1.0.Final.z..."
+ disclaimer="true"/>
<runtime
id="org.jboss.tools.runtime.core.as.423"
name="JBoss AS 4.2.3"
version="4.2.3"
size="100MB"
- url="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-4.2.3.GA/jboss-4...."/>
+ url="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-4.2.3.GA/jboss-4...."
+ disclaimer="true"/>
</extension>
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/schema/downloadruntimes.exsd
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/schema/downloadruntimes.exsd 2012-02-17 20:24:33 UTC (rev 38893)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/schema/downloadruntimes.exsd 2012-02-17 21:27:41 UTC (rev 38894)
@@ -84,6 +84,13 @@
</documentation>
</annotation>
</attribute>
+ <attribute name="disclaimer" type="boolean">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
</complexType>
</element>
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2012-02-17 20:24:33 UTC (rev 38893)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2012-02-17 21:27:41 UTC (rev 38894)
@@ -201,6 +201,8 @@
private static final String VERSION = "version"; //$NON-NLS-1$
private static final String URL = "url"; //$NON-NLS-1$
+
+ private static final String DISCLAIMER = "disclaimer"; //$NON-NLS-1$
private Map<String, DownloadRuntime> downloadRuntimes;
@@ -1015,7 +1017,11 @@
String id = configurationElement.getAttribute(ID);
String version = configurationElement.getAttribute(VERSION);
String url = configurationElement.getAttribute(URL);
+ String disclaimer = configurationElement.getAttribute(DISCLAIMER);
DownloadRuntime downloadRuntime = new DownloadRuntime(id, name, version, url);
+ if (Boolean.FALSE.toString().equals(disclaimer)) {
+ downloadRuntime.setDisclaimer(false);
+ }
downloadRuntimes.put(id, downloadRuntime);
}
}
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/DownloadRuntimeDialog.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/DownloadRuntimeDialog.java 2012-02-17 20:24:33 UTC (rev 38893)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/DownloadRuntimeDialog.java 2012-02-17 21:27:41 UTC (rev 38894)
@@ -44,9 +44,13 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.DirectoryDialog;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
import org.jboss.tools.project.examples.ProjectExamplesActivator;
import org.jboss.tools.project.examples.filetransfer.ECFExamplesTransport;
import org.jboss.tools.project.examples.runtimes.DownloadRuntime;
@@ -96,7 +100,7 @@
Composite contents = new Composite(area, SWT.NONE);
GridData gd = new GridData(GridData.FILL_BOTH);
//gd.heightHint = 200;
- gd.widthHint = 600;
+ gd.widthHint = 700;
contents.setLayoutData(gd);
contents.setLayout(new GridLayout(1, false));
applyDialogFont(contents);
@@ -107,7 +111,63 @@
pathComposite.setLayoutData(gd);
pathComposite.setLayout(new GridLayout(3, false));
-
+ if (downloadRuntime.isDisclaimer()) {
+ Group disclaimerComposite = new Group(pathComposite, SWT.NONE);
+ gd = new GridData(SWT.FILL, SWT.FILL, true, false);
+ gd.horizontalSpan = 3;
+ disclaimerComposite.setLayoutData(gd);
+ disclaimerComposite.setLayout(new GridLayout(1, false));
+ disclaimerComposite.setText("Warning");
+ new Label(disclaimerComposite, SWT.NONE).setText("This is a community project and, as such is not supported with an SLA.");
+ Link link = new Link(disclaimerComposite, SWT.NONE);
+ link.setText("Any questions or problems can be raised through the <a>JBoss AS 7 User Forum</a> where the community will provide their best efforts to assist.");
+ Link link1 = new Link(disclaimerComposite, SWT.NONE);
+ link1.setText("This project is included in the JBoss Enterprise Application Platform for which a <a>support subscription</a> is available.");
+
+ link.addSelectionListener( new SelectionAdapter( ) {
+
+ public void widgetSelected( SelectionEvent e )
+ {
+ String text = e.text;
+ if ("JBoss AS 7 User Forum".equals(text)) {
+ IWorkbenchBrowserSupport support = PlatformUI.getWorkbench()
+ .getBrowserSupport();
+ try {
+ URL url = new URL("http://community.jboss.org/en/jbossas/as7_users?view=discussions"); //$NON-NLS-1$
+ support.getExternalBrowser().openURL(url);
+ } catch (Exception e1) {
+ ProjectExamplesActivator.log(e1);
+ }
+ }
+
+ }
+ } );
+ link1.addSelectionListener( new SelectionAdapter( ) {
+
+ public void widgetSelected( SelectionEvent e )
+ {
+ String text = e.text;
+ if ("support subscription".equals(text)) {
+ IWorkbenchBrowserSupport support = PlatformUI.getWorkbench()
+ .getBrowserSupport();
+ try {
+ URL url = new URL("http://www.redhat.com/jboss/"); //$NON-NLS-1$
+ support.getExternalBrowser().openURL(url);
+ } catch (Exception e1) {
+ ProjectExamplesActivator.log(e1);
+ }
+ }
+
+ }
+ } );
+ }
+ Label urlLabel = new Label(pathComposite, SWT.NONE);
+ urlLabel.setText("URL:");
+ Text urlText = new Text(pathComposite, SWT.READ_ONLY|SWT.BORDER);
+ gd = new GridData(SWT.FILL, SWT.FILL, true, false);
+ gd.horizontalSpan=2;
+ urlText.setLayoutData(gd);
+ urlText.setText(downloadRuntime.getUrl());
Label pathLabel = new Label(pathComposite, SWT.NONE);
pathLabel.setText("Install folder:");
@@ -185,6 +245,9 @@
});
deleteOnExit = new Button(pathComposite, SWT.CHECK);
+ gd = new GridData(SWT.FILL, SWT.FILL, true, false);
+ gd.horizontalSpan=3;
+ deleteOnExit.setLayoutData(gd);
deleteOnExit.setText("Delete archive after installing");
delete = dialogSettings.get(DELETE_ON_EXIT);
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/runtimes/DownloadRuntime.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/runtimes/DownloadRuntime.java 2012-02-17 20:24:33 UTC (rev 38893)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/runtimes/DownloadRuntime.java 2012-02-17 21:27:41 UTC (rev 38894)
@@ -20,6 +20,7 @@
private String id;
private String version;
private String url;
+ private boolean disclaimer = true;
public DownloadRuntime(String id, String name, String version, String url) {
super();
@@ -85,4 +86,12 @@
+ version + ", url=" + url + "]";
}
+ public boolean isDisclaimer() {
+ return disclaimer;
+ }
+
+ public void setDisclaimer(boolean disclaimer) {
+ this.disclaimer = disclaimer;
+ }
+
}
14 years, 1 month
JBoss Tools SVN: r38893 - trunk/examples/plugins/org.jboss.tools.project.examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-02-17 15:24:33 -0500 (Fri, 17 Feb 2012)
New Revision: 38893
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml
Log:
JBIDE-10944 as7.1 should be available as installable runtime
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml 2012-02-17 19:28:26 UTC (rev 38892)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml 2012-02-17 20:24:33 UTC (rev 38893)
@@ -91,6 +91,12 @@
<extension
point="org.jboss.tools.project.examples.downloadruntimes">
<runtime
+ id="org.jboss.tools.runtime.core.as.710"
+ name="JBoss AS 7.1.0 Certified Java EE 6 Full Profile"
+ version="7.1.0.Final"
+ size="100MB"
+ url="http://download.jboss.org/jbossas/7.1/jboss-as-7.1.0.Final/jboss-as-7.1.0..."/>
+ <runtime
id="org.jboss.tools.runtime.core.as.701"
name="JBoss AS 7.0.1 Everything (NOT Java EE6 Certified)"
version="7.0.1.Final"
14 years, 1 month
JBoss Tools SVN: r38892 - trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-02-17 14:28:26 -0500 (Fri, 17 Feb 2012)
New Revision: 38892
Modified:
trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlink.java
Log:
JBIDE-10127
Resolve selector in open-on of style class in VPE
Assert Failure found by org.jboss.tools.jsf.text.ext.test.OpenOnsTest.testStyleClassOpenOns() JUnit Test Case is fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlink.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlink.java 2012-02-17 19:07:13 UTC (rev 38891)
+++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/CSSClassHyperlink.java 2012-02-17 19:28:26 UTC (rev 38892)
@@ -363,7 +363,8 @@
if (restOfRule.length() > 0) {
StringBuilder sb = new StringBuilder();
for (char ch : restOfRule.toCharArray()) {
- if (!Character.isJavaIdentifierPart(ch))
+ if (!Character.isJavaIdentifierPart(ch)
+ && ch != '-' && ch != '_')
break;
sb.append(ch);
}
@@ -382,7 +383,8 @@
// Get attr name
StringBuilder sb = new StringBuilder();
for (char ch : restOfRule.toCharArray()) {
- if (!Character.isJavaIdentifierPart(ch))
+ if (!Character.isJavaIdentifierPart(ch)
+ && ch != '-' && ch != '_')
break;
sb.append(ch);
}
@@ -405,7 +407,8 @@
boolean checkWord(String word) {
for (char ch : word.toCharArray()) {
- if (!Character.isJavaIdentifierPart(ch)) {
+ if (!Character.isJavaIdentifierPart(ch)
+ && ch != '-' && ch != '_') {
return false;
}
}
14 years, 1 month
JBoss Tools SVN: r38891 - in trunk/jst/plugins/org.jboss.tools.jst.web.ui: src/org/jboss/tools/jst/web/ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-02-17 14:07:13 -0500 (Fri, 17 Feb 2012)
New Revision: 38891
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java
Log:
JBIDE-10787
https://issues.jboss.org/browse/JBIDE-10787
Fixed small issues in New JBoss Datasource wizard.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2012-02-17 18:18:05 UTC (rev 38890)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2012-02-17 19:07:13 UTC (rev 38891)
@@ -192,7 +192,7 @@
</selection>
</wizard>
<wizard
- name="New DS XML"
+ name="New JBoss Datasource"
icon="$nl$/images/xstudio/wizards/new_properties_file.gif"
category="org.jboss.tools.jst.web"
class="org.jboss.tools.jst.web.ui.wizards.newfile.NewDSXMLWizard"
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties 2012-02-17 18:18:05 UTC (rev 38890)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties 2012-02-17 19:07:13 UTC (rev 38891)
@@ -78,8 +78,8 @@
UI_WIZARD_XHTML_NEW_TITLE=New XHTML Page
UI_WIZARD_XHTML_NEW_Description=Create New XHTML Page
-NewDSXMLWizard_TITLE=New DS XML File
-NewDSXMLWizard_DESCRIPTION=Create New DS XML
+NewDSXMLWizard_TITLE=New JBoss Datasource
+NewDSXMLWizard_DESCRIPTION=Create New JBoss Datasource
NewDSXMLWizard_CONNECTION_PROFILE_FIELD=Connection profile:
NewDSXMLWizard_TEMPLATE_FIELD=Template:
NewDSXMLWizard_EDIT_BUTTON=Edit...
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java 2012-02-17 18:18:05 UTC (rev 38890)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java 2012-02-17 19:07:13 UTC (rev 38891)
@@ -48,6 +48,7 @@
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPage;
@@ -201,10 +202,26 @@
q.setLayout(l);
connProfileSelEditor.doFillIntoGrid(q);
templateSelEditor.doFillIntoGrid(q);
-// sync.register(connProfileSelEditor);
+ connProfileSelEditor.addPropertyChangeListener(new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ validatePage();
+ }
+ });
validatePage();
}
+ protected boolean validatePage() {
+ boolean valid = super.validatePage();
+ if(valid && connProfileSelEditor != null) {
+ String p = connProfileSelEditor.getValueAsString();
+ if(p == null || p.length() == 0) {
+ valid = false;
+ setErrorMessage("Connenction profile must be set.");
+ }
+ }
+ return valid;
+ }
+
}
/**
@@ -212,9 +229,9 @@
*/
private Object getConnectionProfileDefaultValue() {
List<String> values = getConnectionProfileNameList();
- String defaultDs = ""; // Use preference, or dialog settings?
+ String defaultDs = NewDSXMLWizardFactory.EMPTY_PROFILE; // Use preference, or dialog settings?
return values.contains(defaultDs) ? defaultDs
- : !values.isEmpty() ? values.get(0) : ""; //$NON-NLS-1$
+ : !values.isEmpty() ? values.get(0) : NewDSXMLWizardFactory.EMPTY_PROFILE; //$NON-NLS-1$
}
private static List<String> getConnectionProfileNameList() {
@@ -409,9 +426,10 @@
}
class NewDSXMLWizardFactory {
+ static String EMPTY_PROFILE = " "; //$NON-NLS-1$
public static String[] TEMPLATE_LIST = {
- "Default", "AS7"
+ "Format: JBoss AS 5", "Format: JBoss AS 7" //$NON-NLS-1$ //$NON-NLS-2$
};
public static IFieldEditor createTemplateFieldEditor(Object defaultValue) {
@@ -432,8 +450,8 @@
EditConnectionProfileAction editAction = new EditConnectionProfileAction(validator);
NewConnectionProfileAction newAction = new NewConnectionProfileAction(validator);
List<String> profiles = getConnectionProfileNameList();
- if(canBeEmpty) {
- profiles.add(0, ""); //$NON-NLS-1$
+ if(canBeEmpty || profiles.isEmpty()) {
+ profiles.add(0, EMPTY_PROFILE);
}
IFieldEditor connProfileSelEditor = IFieldEditorFactory.INSTANCE.createComboWithTwoButtons(
IDSDataModelProperties.CONNECTION_PROFILE,
@@ -446,11 +464,11 @@
editAction.setEditor(connProfileSelEditor);
newAction.setEditor(connProfileSelEditor);
final ButtonFieldEditor editButton = (ButtonFieldEditor)((CompositeEditor)connProfileSelEditor).getEditors().get(2);
- editButton.setEnabled(!"".equals(defaultValue)); //$NON-NLS-1$
- if(canBeEmpty) {
+ editButton.setEnabled(!"".equals(defaultValue) && !EMPTY_PROFILE.equals(defaultValue)); //$NON-NLS-1$
+ if(canBeEmpty || profiles.isEmpty()) {
connProfileSelEditor.addPropertyChangeListener(new PropertyChangeListener(){
public void propertyChange(PropertyChangeEvent evt) {
- boolean ediatble = !"".equals(evt.getNewValue()); //$NON-NLS-1$
+ boolean ediatble = !"".equals(evt.getNewValue()) && !EMPTY_PROFILE.equals(evt.getNewValue()); //$NON-NLS-1$
editButton.setEnabled(ediatble);
}
});
@@ -459,8 +477,8 @@
final IProfileListener profileListener = new IProfileListener() {
private void update() {
final List<String> profiles = getConnectionProfileNameList();
- if(canBeEmpty) {
- profiles.add(0, ""); //$NON-NLS-1$
+ if(canBeEmpty || profiles.isEmpty()) {
+ profiles.add(0, EMPTY_PROFILE);
}
Display.getDefault().asyncExec(new Runnable() {
public void run() {
@@ -616,9 +634,12 @@
((ITaggedFieldEditor) ((CompositeEditor) connProfileSelEditor)
.getEditors().get(1)).setTags(getConnectionProfileNameList()
.toArray(new String[0]));
+ Control c = (Control)connProfileSelEditor.getEditorControls()[0];
+ c.getParent().layout();
+ c.getParent().getParent().layout();
+ validator.validate(profile.getName(), null);
}
});
- validator.validate(profile.getName(), null);
}
/* (non-Javadoc)
14 years, 1 month