April 2012 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r40417 - in trunk/build/aggregate: DEPRECATED_bottests-site and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-04-23 14:01:23 -0400 (Mon, 23 Apr 2012) New Revision: 40417 Added: trunk/build/aggregate/DEPRECATED_bottests-site/ trunk/build/aggregate/DEPRECATED_bottests-site/README.deprecated.txt Log: add deprecation marker for bottests site (JBIDE-11077) Added: trunk/build/aggregate/DEPRECATED_bottests-site/README.deprecated.txt =================================================================== --- trunk/build/aggregate/DEPRECATED_bottests-site/README.deprecated.txt (rev 0) +++ trunk/build/aggregate/DEPRECATED_bottests-site/README.deprecated.txt 2012-04-23 18:01:23 UTC (rev 40417) @@ -0,0 +1,16 @@ +This site is deprecated in favour of these two new sites: + +http://download.jboss.org/jbosstools/updates/nightly/coretests/trunk/ +http://download.jboss.org/jbosstools/updates/nightly/soatests/trunk/ + +To build these sites, see ../coretests/ and ../soatests/. + +See also ../pom.xml for more info and building advice. + +New sites with test plugins on them are built from these jobs: + +http://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_trunk.coretests.aggregate/ +http://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_trunk.soatests.aggregate/ + +http://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_stable_branch.coretests.aggregate/ +http://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_stable_branch.soatests.aggregate/ \ No newline at end of file

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40416 - trunk/build/aggregate/site.

by jbosstools-commits＠lists.jboss.org

Author: mickael_istria Date: 2012-04-23 13:44:21 -0400 (Mon, 23 Apr 2012) New Revision: 40416 Modified: trunk/build/aggregate/site/site.xml Log: JBIDE-11533 Aggregated missing features. Modified: trunk/build/aggregate/site/site.xml =================================================================== --- trunk/build/aggregate/site/site.xml 2012-04-23 17:25:18 UTC (rev 40415) +++ trunk/build/aggregate/site/site.xml 2012-04-23 17:44:21 UTC (rev 40416) @@ -240,16 +240,10 @@    -  <feature url="features/org.jboss.tools.xulrunner.feature.source_0.0.0.jar" id="org.jboss.tools.xulrunner.feature.source" version="0.0.0"> - <category name="AllSources" /> </feature> <feature url="features/org.mozilla.xulrunner.feature.source_0.0.0.jar" id="org.mozilla.xulrunner.feature.source" version="0.0.0"> - <category name="AllSources" /> </feature> - <feature url="features/org.jboss.tools.seam.feature.source_0.0.0.jar" id="org.jboss.tools.seam.feature.source" version="0.0.0"> + + <feature url="features/org.jboss.tools.seam.feature.source_0.0.0.jar" id="org.jboss.tools.seam.feature.source" version="0.0.0"> <category name="AllSources" /> </feature> <feature url="features/org.jboss.tools.cdi.feature.source_0.0.0.jar" id="org.jboss.tools.cdi.feature.source" version="0.0.0"> @@ -276,7 +270,6 @@ <feature url="features/org.jboss.tools.cdi.seam.feature.source_0.0.0.jar" id="org.jboss.tools.cdi.seam.feature.source" version="0.0.0"> <category name="AllSources" /> </feature> - --> <feature url="features/org.jboss.tools.jmx.feature.source_0.0.0.jar" id="org.jboss.tools.jmx.feature.source" version="0.0.0"> <category name="AllSources" /> </feature> @@ -284,7 +277,7 @@ <category name="AllSources" /> </feature> <feature url="features/org.jboss.tools.openshift.express.feature.source_0.0.0.jar" id="org.jboss.tools.openshift.express.feature.source" version="0.0.0"> - <category name="AllSources" /> + <category name="AllSources" /> </feature> <feature url="features/org.jboss.tools.openshift.egit.integration.feature.source_0.0.0.jar" id="org.jboss.tools.openshift.egit.integration.feature.source" version="0.0.0"> <category name="AllSources" /> @@ -292,7 +285,6 @@ <feature url="features/org.jboss.ide.eclipse.archives.feature.source_0.0.0.jar" id="org.jboss.ide.eclipse.archives.feature.source" version="0.0.0"> <category name="AllSources" /> </feature> -  <feature url="features/org.jboss.tools.birt.feature.source_0.0.0.jar" id="org.jboss.tools.birt.feature.source" version="0.0.0"> <category name="AllSources" /> </feature> -  <feature url="features/org.jboss.tools.maven.jbosspackaging.feature.source_0.0.0.jar" id="org.jboss.tools.maven.jbosspackaging.feature.source" version="0.0.0"> <category name="AllSources" /> - </feature> - <feature url="features/org.jboss.tools.maven.project.examples.feature.source_0.0.0.jar" id="org.jboss.tools.maven.project.examples.feature.source" version="0.0.0"> + </feature> + <feature url="features/org.jboss.tools.maven.gwt.feature.source_0.0.0.jar" id="org.jboss.tools.maven.gwt.feature.source" version="0.0.0"> <category name="AllSources" /> </feature> +  <feature url="features/org.jboss.tools.gwt.feature.source_0.0.0.jar" id="org.jboss.tools.gwt.feature.source" version="0.0.0"> <category name="AllSources" /> </feature> - --> - <feature url="features/org.jboss.tools.common.jdt.feature.source_0.0.0.jar" id="org.jboss.tools.common.jdt.feature.source" version="0.0.0"> - <category name="AllSources" /> - </feature> <feature url="features/org.jboss.tools.common.mylyn.feature.source_0.0.0.jar" id="org.jboss.tools.common.mylyn.feature.source" version="0.0.0"> - <category name="AllSources" /> + <category name="AllSources"/> </feature> - <feature url="features/org.jboss.tools.common.all.feature.source_0.0.0.jar" id="org.jboss.tools.common.all.feature.source" version="0.0.0"> + <feature url="features/org.jboss.tools.common.jdt.feature.source_0.0.0.jar" id="org.jboss.tools.common.jdt.feature.source" version="0.0.0"> <category name="AllSources" /> </feature> -  - - +  +  +  <category-def name="AbridgedTools" label="Abridged JBoss Tools 3.3"> <description>Contains most of the JBoss Tools features. Excluded are those related to integration with 3rd party

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40415 - trunk/build/aggregate/soa-site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-04-23 13:25:18 -0400 (Mon, 23 Apr 2012) New Revision: 40415 Added: trunk/build/aggregate/soa-site/README.component.owners.txt Modified: trunk/build/aggregate/soa-site/README.building.txt Log: reorder README.building.txt to match new README.component.owners.txt file Modified: trunk/build/aggregate/soa-site/README.building.txt =================================================================== --- trunk/build/aggregate/soa-site/README.building.txt 2012-04-23 17:25:11 UTC (rev 40414) +++ trunk/build/aggregate/soa-site/README.building.txt 2012-04-23 17:25:18 UTC (rev 40415) @@ -1,29 +1,34 @@ -1. First, build the various components referenced in site.xml (or pull them from upstream previous builds hosted on http://download.jboss.org/jbosstools/builds/staging/) +1. First, build components in external repos: -Components are here: + Eclipse BPEL Editor: http://git.eclipse.org/c/bpel/org.eclipse.bpel.git/ - esb: http://anonsvn.jboss.org/repos/jbosstools/trunk/esb/ + bpmn2: http://git.eclipse.org/c/bpmn2-modeler/org.eclipse.bpmn2-modeler.git/ - smooks: http://anonsvn.jboss.org/repos/jbosstools/trunk/smooks/ + Drools, Guvnor & jBPM5: https://github.com/droolsjbpm/droolsjbpm-tools - jbpm: http://anonsvn.jboss.org/repos/jbosstools/trunk/jbpm AND http://anonsvn.jboss.org/repos/jbosstools/trunk/flow/ + pi4soa: https://pi4soa.svn.sourceforge.net/svnroot/pi4soa - modeshape: http://anonsvn.jboss.org/repos/jbosstools/trunk/modeshape/ + Savara: https://github.com/savara/savara-tools-eclipse AND https://github.com/scribble/scribble-tools-eclipse - pi4soa: https://pi4soa.svn.sourceforge.net/svnroot/pi4soa + SwitchYard: https://github.com/jboss-switchyard/tools/ - savara: https://github.com/savara/savara-tools-eclipse AND https://github.com/scribble/scribble-tools-eclipse + Teiid Designer: http://anonsvn.jboss.org/repos/tdesigner/trunk/ - drools & guvnor: https://github.com/droolsjbpm/droolsjbpm-tools +2. Next, build the various components referenced in site.xml (or pull them from upstream previous builds hosted on http://download.jboss.org/jbosstools/builds/staging/) - Teiid: http://anonsvn.jboss.org/repos/tdesigner/trunk/ + Central Discovery: http://anonsvn.jboss.org/repos/jbosstools/trunk/build/aggregate/soa-site/ - bpmn2: http://git.eclipse.org/c/bpmn2-modeler/org.eclipse.bpmn2-modeler.git/ + ESB: http://anonsvn.jboss.org/repos/jbosstools/trunk/esb/ - BPEL: http://git.eclipse.org/c/bpel/org.eclipse.bpel.git/ AND http://anonsvn.jboss.org/repos/jbosstools/trunk/bpel/ + JBoss BPEL Editor: http://anonsvn.jboss.org/repos/jbosstools/trunk/bpel/ -2. Next, ensure the parent pom in ../../parent/pom.xml has been built w/ `mvn clean install` (this may not be required as the next step should resolve/build it automatically) + jBPM3 & 4: http://anonsvn.jboss.org/repos/jbosstools/trunk/jbpm/ + http://anonsvn.jboss.org/repos/jbosstools/trunk/flow/ + Modeshape: http://anonsvn.jboss.org/repos/jbosstools/trunk/modeshape/ + + Runtime Detection: http://anonsvn.jboss.org/repos/jbosstools/trunk/runtime-soa/ + 3. Build this folder w/ `mvn clean install` 4. Review the resulting update site in site/target/site/: @@ -34,4 +39,6 @@ file:///path/to/site/target/site/ +Note that there is a second JBoss Central discovery plugin for use with JBDS. It can be built from source here: + https://svn.jboss.org/repos/devstudio/trunk/product-soa/ Added: trunk/build/aggregate/soa-site/README.component.owners.txt =================================================================== --- trunk/build/aggregate/soa-site/README.component.owners.txt (rev 0) +++ trunk/build/aggregate/soa-site/README.component.owners.txt 2012-04-23 17:25:18 UTC (rev 40415) @@ -0,0 +1,29 @@ +Locations, team leads, and components of SOA-P and BRMS Tooling sources +----------------------------------------------------------------------- + +Hosted externally: + +Eclipse BPEL Editor: Bob Brodt - http://git.eclipse.org/c/bpel/org.eclipse.bpel.git/ +bpmn2: Bob Brodt - http://git.eclipse.org/c/bpmn2-modeler/org.eclipse.bpmn2-modeler.git/ +Drools/Guvnor/jBPM5: Kris Verlaenen - https://github.com/droolsjbpm/droolsjbpm +pi4soa: Gary Brown - http://sourceforge.net/projects/pi4soa/ +Savara: Gary Brown - https://github.com/savara/savara-tools-eclipse +SwitchYard: Rob Cernich - https://github.com/jboss-switchyard/tools/ +Teiid Designer: Barry Lafond - http://svn.jboss.org/repos/tdesigner/ + +-- + +Hosted in JBT SVN https://svn.jboss.org/repos/jbosstools/ + +Central Discovery (JBoss Tools): Doug Palmer +ESB: Brian Fitzpatrick +JBoss BPEL Editor: Bob Brodt +jBPM3 & 4: Koen Aers (see jbpm and flow components) +Modeshape: Dan Florian / elvisisking +Runtime detection: Doug Palmer + +-- + +Hosted in JBDS SVN https://svn.jboss.org/repos/devstudio/ + +Central Discovery (JBDS): Doug Palmer

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40414 - trunk/build/aggregate.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-04-23 13:25:11 -0400 (Mon, 23 Apr 2012) New Revision: 40414 Modified: trunk/build/aggregate/pom.xml Log: sources site no longer exists; remove from list Modified: trunk/build/aggregate/pom.xml =================================================================== --- trunk/build/aggregate/pom.xml 2012-04-23 17:07:32 UTC (rev 40413) +++ trunk/build/aggregate/pom.xml 2012-04-23 17:25:11 UTC (rev 40414) @@ -19,7 +19,6 @@ mvn clean install -f site/pom.xml -Dcollect.zips.skip mvn clean install -f soa-site/pom.xml -Dcollect.zips.skip - mvn clean install -f site/sources/pom.xml mvn clean install -f webtools-site/pom.xml mvn clean install -f bottests-site/pom.xml mvn clean install -f coretests-site/pom.xml

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40413 - trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils.

by jbosstools-commits＠lists.jboss.org

Author: bfitzpat Date: 2012-04-23 13:07:32 -0400 (Mon, 23 Apr 2012) New Revision: 40413 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SOAPDOMParser.java Log: JBIDE-11577 - Fixing JSON pretty print in the WS tester to now handle collections Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SOAPDOMParser.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SOAPDOMParser.java 2012-04-23 16:55:39 UTC (rev 40412) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SOAPDOMParser.java 2012-04-23 17:07:32 UTC (rev 40413) @@ -286,6 +286,15 @@ } } return output; + } else if (inJSON.startsWith("[") && inJSON.endsWith("]")) { //$NON-NLS-1$ //$NON-NLS-2$ + String output = "[\r\n"; //$NON-NLS-1$ + inJSON = inJSON.substring(1, inJSON.length() - 1); + String innerParts = prettyPrintJSON(inJSON); + output = output + innerParts; + output = output + "\r\n]"; //$NON-NLS-1$ + return output; } return inJSON; - }} + } + +}

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40411 - trunk/central/site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-04-23 11:58:13 -0400 (Mon, 23 Apr 2012) New Revision: 40411 Modified: trunk/central/site/site.xml Log: expose org.jboss.tools.community.central.feature instead of org.jboss.tools.central.feature so people will install the all-in-one feature which includes AS, Seam, Runtime, etc. (JBIDE-10803) Modified: trunk/central/site/site.xml =================================================================== --- trunk/central/site/site.xml 2012-04-23 15:55:44 UTC (rev 40410) +++ trunk/central/site/site.xml 2012-04-23 15:58:13 UTC (rev 40411) @@ -3,9 +3,11 @@ <description> To install these features, point Eclipse at this site. </description> - <feature url="features/org.jboss.tools.central.feature_0.0.0.jar" id="org.jboss.tools.central.feature" version="0.0.0"> + <feature url="features/org.jboss.tools.community.central.feature_0.0.0.jar" id="org.jboss.tools.community.central.feature" version="0.0.0"> <category name="JBoss Central Nightly Build Update Site"/> </feature> + <feature url="features/org.jboss.tools.central.feature_0.0.0.jar" id="org.jboss.tools.central.feature" version="0.0.0"> + </feature> <feature url="features/org.jboss.tools.central.discovery.feature_0.0.0.jar" id="org.jboss.tools.central.discovery.feature" version="0.0.0"> </feature>

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40410 - trunk/central/features/org.jboss.tools.community.central.feature.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-04-23 11:55:44 -0400 (Mon, 23 Apr 2012) New Revision: 40410 Modified: trunk/central/features/org.jboss.tools.community.central.feature/feature.xml Log: JBIDE-10803 - include AS, Seam, Runtime features when installing Central; also include org.jboss.tools.runtime.as.detector.feature and org.jboss.tools.runtime.seam.detector.feature for funsies. Modified: trunk/central/features/org.jboss.tools.community.central.feature/feature.xml =================================================================== --- trunk/central/features/org.jboss.tools.community.central.feature/feature.xml 2012-04-23 15:55:41 UTC (rev 40409) +++ trunk/central/features/org.jboss.tools.community.central.feature/feature.xml 2012-04-23 15:55:44 UTC (rev 40410) @@ -12,12 +12,18 @@ %license </license> -  <requires> <import feature="org.jboss.tools.central.feature" version="1.0.0.qualifier" match="greaterOrEqual"/> +  <import feature="org.jboss.tools.project.examples.feature" version="1.2.1.qualifier" match="greaterOrEqual"/> <import feature="org.jboss.tools.community.project.examples.feature" version="1.2.1.qualifier" match="greaterOrEqual"/> <import feature="org.jboss.tools.maven.project.examples.feature" version="1.3.0.qualifier" match="greaterOrEqual"/> +  + <import feature="org.jboss.ide.eclipse.as.feature" version="2.3.0.qualifier" match="greaterOrEqual"/> + <import feature="org.jboss.tools.seam.feature" version="3.3.0.qualifier" match="greaterOrEqual"/> + <import feature="org.jboss.tools.runtime.core.feature" version="1.3.0.qualifier" match="greaterOrEqual"/> + <import feature="org.jboss.tools.runtime.as.detector.feature" version="1.3.0.qualifier" match="greaterOrEqual"/> + <import feature="org.jboss.tools.runtime.seam.detector.feature" version="1.3.0.qualifier" match="greaterOrEqual"/> </requires> <plugin id="org.jboss.tools.community.central" download-size="0" install-size="0" version="0.0.0"/>

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40409 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui: wizard and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: xcoulon Date: 2012-04-23 11:55:41 -0400 (Mon, 23 Apr 2012) New Revision: 40409 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java Log: In progress - https://issues.jboss.org/browse/JBIDE-11400 Migrate current openshift plugins to the new RESTful client library Fixed - https://issues.jboss.org/browse/JBIDE-11195 Consider renaming "OpenShift Express Console" to "OpenShift Explorer" or "OpenShift Navigator" Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java 2012-04-23 15:55:38 UTC (rev 40408) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java 2012-04-23 15:55:41 UTC (rev 40409) @@ -63,7 +63,7 @@ } if (id.equals("2.Type")) { - return application.getCartridge(); + return application.getCartridge().getName(); } if (id.equals("5.Git URI")) { return application.getGitUrl(); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java 2012-04-23 15:55:38 UTC (rev 40408) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java 2012-04-23 15:55:41 UTC (rev 40409) @@ -180,17 +180,19 @@ } private void createLinks(String log, int baseIndex, List<StyleRange> styles) { - Matcher matcher = HTTP_LINK_REGEX.matcher(log); - while (matcher.find() - && matcher.groupCount() == 1) { - int linkStart = matcher.start() + baseIndex; - int linkStop = matcher.end() + baseIndex; - StyleRange linkStyle = createLinkStyleRange(linkStart, linkStop); - styles.add(linkStyle); - String url = matcher.group(1); - LinkSubstring linkEntry = - new LinkSubstring(linkStart, linkStop, url); - linkSubstrings.add(linkEntry); + if(log != null) { + Matcher matcher = HTTP_LINK_REGEX.matcher(log); + while (matcher.find() + && matcher.groupCount() == 1) { + int linkStart = matcher.start() + baseIndex; + int linkStop = matcher.end() + baseIndex; + StyleRange linkStyle = createLinkStyleRange(linkStart, linkStop); + styles.add(linkStyle); + String url = matcher.group(1); + LinkSubstring linkEntry = + new LinkSubstring(linkStart, linkStop, url); + linkSubstrings.add(linkEntry); + } } } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2012-04-23 15:55:38 UTC (rev 40408) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2012-04-23 15:55:41 UTC (rev 40409) @@ -118,7 +118,7 @@ @Override public void update(ViewerCell cell) { - IEmbeddedCartridge cartridge = (IEmbeddedCartridge) cell.getElement(); + IEmbeddableCartridge cartridge = (IEmbeddableCartridge) cell.getElement(); cell.setText(cartridge.getName()); } }, viewer, tableLayout); @@ -130,7 +130,6 @@ TableViewerColumn column = new TableViewerColumn(viewer, SWT.LEFT); column.getColumn().setText(name); column.setLabelProvider(cellLabelProvider); - layout.setColumnData(column.getColumn(), new ColumnWeightData(weight, true)); } @@ -140,7 +139,7 @@ @Override public void checkStateChanged(CheckStateChangedEvent event) { try { - IEmbeddedCartridge cartridge = (IEmbeddedCartridge) event.getElement(); + IEmbeddableCartridge cartridge = (IEmbeddableCartridge) event.getElement(); if (event.getChecked()) { if (IEmbeddedCartridge.PHPMYADMIN_34.equals(cartridge)) { addPhpMyAdminCartridge(cartridge); @@ -210,7 +209,7 @@ } } - private void addPhpMyAdminCartridge(IEmbeddedCartridge cartridge) throws OpenShiftException, SocketTimeoutException { + private void addPhpMyAdminCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException, SocketTimeoutException { if (!viewer.getChecked(IEmbeddedCartridge.MYSQL_51)) { if (MessageDialog.openQuestion(getShell(), "Embed mysql cartridge", "To embed phpmyadmin, you'd also have to embed mysql.")) { @@ -225,11 +224,11 @@ } } - private void addCartridge(IEmbeddedCartridge cartridge) throws OpenShiftException, SocketTimeoutException { + private void addCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException, SocketTimeoutException { model.getSelectedEmbeddableCartridges().add(cartridge); } - private void removeMySQLCartridge(IEmbeddedCartridge cartridge) throws OpenShiftException, SocketTimeoutException { + private void removeMySQLCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException, SocketTimeoutException { List<IEmbeddableCartridge> checkedCartridges = model.getSelectedEmbeddableCartridges(); if (viewer.getChecked(IEmbeddedCartridge.PHPMYADMIN_34)) { if (MessageDialog.openQuestion(getShell(), "Remove phpmyadmin cartridge", @@ -245,7 +244,7 @@ } } - private void removeCartridge(IEmbeddedCartridge cartridge) throws OpenShiftException, SocketTimeoutException { + private void removeCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException, SocketTimeoutException { model.getSelectedEmbeddableCartridges().remove(cartridge); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2012-04-23 15:55:38 UTC (rev 40408) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2012-04-23 15:55:41 UTC (rev 40409) @@ -55,9 +55,7 @@ || application.getEmbeddedCartridges() == null) { return; } - for(IEmbeddedCartridge configuredCartridge : application.getEmbeddedCartridges()) { - selectedCartridges.add(configuredCartridge); - } + selectedCartridges.addAll(application.getEmbeddedCartridges()); } public List<IEmbeddableCartridge> loadEmbeddableCartridges() throws OpenShiftException, SocketTimeoutException { @@ -141,21 +139,21 @@ ListDiff listDiff = Diffs.computeListDiff(getApplication().getEmbeddedCartridges(), selectedCartridges); for (ListDiffEntry entry : listDiff.getDifferences()) { if (entry.isAddition()) { - addedCartridges.add((IEmbeddedCartridge) entry.getElement()); + addedCartridges.add((IEmbeddableCartridge) entry.getElement()); } else { - removedCartridges.add((IEmbeddedCartridge) entry.getElement()); + removedCartridges.add((IEmbeddableCartridge) entry.getElement()); } } } - private static class CartridgeComparator implements Comparator<IEmbeddedCartridge> { + private static class CartridgeComparator implements Comparator<IEmbeddableCartridge> { @Override - public int compare(IEmbeddedCartridge thisCartridge, IEmbeddedCartridge thatCartridge) { + public int compare(IEmbeddableCartridge thisCartridge, IEmbeddableCartridge thatCartridge) { // mysql has to be added/removed before phpmyadmin - if (thisCartridge.equals(IEmbeddedCartridge.MYSQL_51)) { + if (thisCartridge.equals(IEmbeddableCartridge.MYSQL_51)) { return -1; - } else if (thatCartridge.equals(IEmbeddedCartridge.MYSQL_51)) { + } else if (thatCartridge.equals(IEmbeddableCartridge.MYSQL_51)) { return 1; } return 0;

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40408 - trunk/build/aggregate/site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-04-23 11:55:38 -0400 (Mon, 23 Apr 2012) New Revision: 40408 Modified: trunk/build/aggregate/site/site.xml Log: expose org.jboss.tools.community.central.feature instead of org.jboss.tools.central.feature so people will install the all-in-one feature which includes AS, Seam, Runtime, etc. (JBIDE-10803); remove Struts from AbridgedTools Modified: trunk/build/aggregate/site/site.xml =================================================================== --- trunk/build/aggregate/site/site.xml 2012-04-23 15:54:31 UTC (rev 40407) +++ trunk/build/aggregate/site/site.xml 2012-04-23 15:55:38 UTC (rev 40408) @@ -18,10 +18,12 @@ --> <feature url="features/org.jboss.tools.central.feature_0.0.0.jar" id="org.jboss.tools.central.feature" version="0.0.0"> + </feature> +  + <feature url="features/org.jboss.tools.community.central.feature_0.0.0.jar" id="org.jboss.tools.community.central.feature" version="0.0.0"> <category name="AbridgedTools" /> <category name="GeneralTools" /> </feature> -  <feature url="features/org.jboss.tools.central.discovery.feature_0.0.0.jar" id="org.jboss.tools.central.discovery.feature" version="0.0.0"> </feature> <feature url="features/org.jboss.tools.richfaces.feature_0.0.0.jar" id="org.jboss.tools.richfaces.feature" version="0.0.0"> @@ -101,7 +103,6 @@ <category name="GeneralTools" /> </feature> <feature url="features/org.jboss.tools.struts.feature_0.0.0.jar" id="org.jboss.tools.struts.feature" version="0.0.0"> - <category name="AbridgedTools" /> <category name="WebTools" /> </feature> <feature url="features/org.jboss.tools.ws.feature_0.0.0.jar" id="org.jboss.tools.ws.feature" version="0.0.0">

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40407 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.

by jbosstools-commits＠lists.jboss.org

Author: xcoulon Date: 2012-04-23 11:54:31 -0400 (Mon, 23 Apr 2012) New Revision: 40407 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT-sources.jar trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar Log: updated client lib Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT-sources.jar =================================================================== (Binary files differ) Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar =================================================================== (Binary files differ)

13 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits April 2012