JBoss Tools SVN: r39368 - in trunk/documentation/whatsnew/openshift: images and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2012-03-08 06:54:04 -0500 (Thu, 08 Mar 2012)
New Revision: 39368
Added:
trunk/documentation/whatsnew/openshift/images/edit-embedded-cartridges.png
trunk/documentation/whatsnew/openshift/images/menu-edit-embedded-cartridges.png
trunk/documentation/whatsnew/openshift/images/secure-storage.png
trunk/documentation/whatsnew/openshift/images/server-adapter-wizard-2.png
trunk/documentation/whatsnew/openshift/images/server-adapter-wizard.png
trunk/documentation/whatsnew/openshift/images/server-editor.png
Modified:
trunk/documentation/whatsnew/openshift/images/openshift-console.png
trunk/documentation/whatsnew/openshift/openshift-news-3.3.0.Beta1.html
Log:
[JBIDE-11031] wrinting N&N for OpenShift
Added: trunk/documentation/whatsnew/openshift/images/edit-embedded-cartridges.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/openshift/images/edit-embedded-cartridges.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/openshift/images/menu-edit-embedded-cartridges.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/openshift/images/menu-edit-embedded-cartridges.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/documentation/whatsnew/openshift/images/openshift-console.png
===================================================================
(Binary files differ)
Added: trunk/documentation/whatsnew/openshift/images/secure-storage.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/openshift/images/secure-storage.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/openshift/images/server-adapter-wizard-2.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/openshift/images/server-adapter-wizard-2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/openshift/images/server-adapter-wizard.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/openshift/images/server-adapter-wizard.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/openshift/images/server-editor.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/openshift/images/server-editor.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/documentation/whatsnew/openshift/openshift-news-3.3.0.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/openshift/openshift-news-3.3.0.Beta1.html 2012-03-08 10:12:24 UTC (rev 39367)
+++ trunk/documentation/whatsnew/openshift/openshift-news-3.3.0.Beta1.html 2012-03-08 11:54:04 UTC (rev 39368)
@@ -55,6 +55,11 @@
applications. It allows you to manage your resources on the Red Hat
PaaS. Actions in the context menu allow you to create new users,
manage domains, applications, etc. <br />
+ <p>
+ <small>
+ <a href="https://issues.jboss.org/browse/JBIDE-10528">Related Jira</a>
+ </small>
+ </p>
</td>
</tr>
<tr>
@@ -74,6 +79,23 @@
</tr>
<tr>
<td valign="top" align="left"><a name="itemname3" id="itemname3"></a>
+ <b>User passwords</b>
+ </td>
+ <td valign="top">
+ We now allow you to store your OpenShift user password in the secure storage.
+ You wont have to retype it over and over again.
+ <p>
+ <img src="images/secure-storage.png"/>
+ </p>
+ <p>
+ <small>
+ <a href="https://issues.jboss.org/browse/JBIDE-10693">Related Jira</a>
+ </small>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a>
<b>Embedded cartridges</b>
</td>
<td valign="top">
@@ -122,6 +144,23 @@
</tr>
<tr>
<td valign="top" align="left"><a name="itemname3" id="itemname3"></a>
+ <b>OpenShift Server Editor</b></td>
+ <td valign="top">
+ The OpenShift <b>Server Editor</b> now reports
+ <p>
+ <img src="images/server-editor.png" />
+ </p>
+ The <b>Server Editor</b> now reports all relevant details of the <b>workspace project</b> it will publish to the <b>OpenShift PaaS</b>.
+ You'll find the project, the OpenShift application, the host, user name, git branch and deployments directory.
+ <p>
+ <small>
+ <a href="https://issues.jboss.org/browse/JBIDE-10716">Related Jira</a>
+ </small>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a>
<b>Source & Binary Deployment</b></td>
<td valign="top">
The new <b>OpenShift Server adapter</b> is now able to publish source and binary artifacts.
@@ -135,7 +174,20 @@
and push them to the OpenShift application. JBoss AS7.1, will then pick those wars and deploy them.
This is what we call the <b>binary</b> mode where binary artifacts are published to OpenShift.
</td>
- </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>Import wizards</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a>
+ <b>Existing projects</b></td>
+ <td valign="top">
+
+ </td>
</table>
</body>
14 years, 1 month
JBoss Tools SVN: r39367 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-08 05:12:24 -0500 (Thu, 08 Mar 2012)
New Revision: 39367
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java
Log:
JBIDE-11210 to trunk (small UI freeze)
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java 2012-03-08 08:39:41 UTC (rev 39366)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java 2012-03-08 10:12:24 UTC (rev 39367)
@@ -13,6 +13,7 @@
import java.net.URL;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -55,7 +56,8 @@
@Override
public URL getModuleRootURL(IModule module) {
- IProject appProj = ExpressServerUtils.findProjectForServersApplication(getServer());
+ String appProjString = ExpressServerUtils.getExpressDeployProject(getServer());
+ IProject appProj = appProjString == null ? null : ResourcesPlugin.getWorkspace().getRoot().getProject(appProjString);
IProject p =module.getProject();
boolean shouldIgnore = ExpressServerUtils.getIgnoresContextRoot(getServer()) && p.equals(appProj);
return JBossServer.getModuleRootURL(module, getServer().getHost(), 80, shouldIgnore);
14 years, 1 month
JBoss Tools SVN: r39366 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-08 03:39:41 -0500 (Thu, 08 Mar 2012)
New Revision: 39366
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
Log:
JBIDE-11166 to trunk slim patch
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-03-08 06:41:55 UTC (rev 39365)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-03-08 08:39:41 UTC (rev 39366)
@@ -99,7 +99,12 @@
if( module.length > 1 )
return 0;
+ // Magic Project
String destProjName = ExpressServerUtils.getExpressDeployProject(behaviour.getServer());
+
+ if( isInDestProjectTree(destProjName, module))
+ return IServer.PUBLISH_STATE_NONE;
+
IProject destProj = ResourcesPlugin.getWorkspace().getRoot().getProject(destProjName);
if( destProj.equals(module[module.length-1].getProject()))
@@ -137,6 +142,19 @@
}
return 0;
}
+
+ protected boolean isInDestProjectTree(String magicProject, IModule[] module) {
+ IProject magic = magicProject == null ? null :
+ ResourcesPlugin.getWorkspace().getRoot().getProject(magicProject);
+ IProject moduleProject = module == null ? null : module.length == 0 ? null : module[module.length-1].getProject();
+ if( magic == null || moduleProject == null )
+ return false;
+
+ IPath moduleProjectRoot = moduleProject.getLocation();
+ IPath magicProjectRoot = magic.getLocation();
+ boolean ret = magicProjectRoot.isPrefixOf(moduleProjectRoot);
+ return ret;
+ }
protected PushOperationResult commitAndPushProject(IProject p,
DeployableServerBehavior behaviour, IProgressMonitor monitor) throws CoreException {
14 years, 1 month
JBoss Tools SVN: r39365 - branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/META-INF.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-03-08 01:41:55 -0500 (Thu, 08 Mar 2012)
New Revision: 39365
Modified:
branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/META-INF/MANIFEST.MF
Log:
revert patch for https://issues.jboss.org/browse/JBIDE-11047 - product build broken due to platform filter
Modified: branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/META-INF/MANIFEST.MF 2012-03-08 02:21:35 UTC (rev 39364)
+++ branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/META-INF/MANIFEST.MF 2012-03-08 06:41:55 UTC (rev 39365)
@@ -8,8 +8,3 @@
Export-Package: org.jboss.tools.vpe.browsersim.browser
Require-Bundle: org.eclipse.swt;bundle-version="3.7.0"
Bundle-Vendor: JBoss by Red Hat
-Eclipse-PlatformFilter: (|
- (&(osgi.ws=win32)(osgi.os=win32)(osgi.arch=x86))
- (&(osgi.ws=cocoa)(osgi.os=macosx) (|(osgi.arch=x86)(osgi.arch=x86_64)) )
- (&(osgi.ws=gtk)(osgi.os=linux) (|(osgi.arch=x86)(osgi.arch=x86_64)) )
- )
14 years, 1 month
JBoss Tools SVN: r39364 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2012-03-07 21:21:35 -0500 (Wed, 07 Mar 2012)
New Revision: 39364
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java
Log:
JBIDE-11203
https://issues.jboss.org/browse/JBIDE-11203
Layout fix.
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-03-08 01:36:13 UTC (rev 39363)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java 2012-03-08 02:21:35 UTC (rev 39364)
@@ -320,7 +320,7 @@
Composite topLevel = new Composite(parent, SWT.NONE);
topLevel.setLayout(new GridLayout());
topLevel.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL
- | GridData.HORIZONTAL_ALIGN_FILL));
+ | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
topLevel.setFont(parent.getFont());
PlatformUI.getWorkbench().getHelpSystem().setHelp(topLevel,
IIDEHelpContextIds.NEW_FILE_WIZARD_PAGE);
@@ -333,6 +333,8 @@
}, false);
templateSelEditor = NewDSXMLWizardFactory.createTemplateFieldEditor(NewDSXMLWizardFactory.TEMPLATE_LIST[0]);
Composite q = new Composite(topLevel, 0);
+ q.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL
+ | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
GridLayout l = new GridLayout(4, false);
q.setLayout(l);
connProfileSelEditor.doFillIntoGrid(q);
14 years, 1 month
JBoss Tools SVN: r39363 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2012-03-07 20:36:13 -0500 (Wed, 07 Mar 2012)
New Revision: 39363
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/CoreValidationTest.java
Log:
https://issues.jboss.org/browse/JBIDE-11198 CDI Validation reports N+1 problems per file even N problems per file configured in CDI Validation Preferences
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/CoreValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/CoreValidationTest.java 2012-03-08 01:13:53 UTC (rev 39362)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/CoreValidationTest.java 2012-03-08 01:36:13 UTC (rev 39363)
@@ -95,7 +95,7 @@
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/MaxNumberOfProblems.java");
int max = CDIPreferences.getMaxNumberOfProblemMarkersPerFile(tckProject);
assertTrue("The maximum number of problems per file should be less than 30. Now it's " + max + " and it means that this test should be fixed.", max<30);
- IMarker[] markers = AbstractResourceMarkerTest.findMarkers(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS);
+ IMarker[] markers = AbstractResourceMarkerTest.findMarkers(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, false);
assertEquals(max, markers.length);
}
14 years, 1 month
JBoss Tools SVN: r39362 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2012-03-07 20:13:53 -0500 (Wed, 07 Mar 2012)
New Revision: 39362
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/CoreValidationTest.java
Log:
https://issues.jboss.org/browse/JBIDE-11198 CDI Validation reports N+1 problems per file even N problems per file configured in CDI Validation Preferences
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/CoreValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/CoreValidationTest.java 2012-03-08 01:06:06 UTC (rev 39361)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/CoreValidationTest.java 2012-03-08 01:13:53 UTC (rev 39362)
@@ -94,6 +94,7 @@
public void testMaximumProblemsPerFile() throws CoreException {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/MaxNumberOfProblems.java");
int max = CDIPreferences.getMaxNumberOfProblemMarkersPerFile(tckProject);
+ assertTrue("The maximum number of problems per file should be less than 30. Now it's " + max + " and it means that this test should be fixed.", max<30);
IMarker[] markers = AbstractResourceMarkerTest.findMarkers(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS);
assertEquals(max, markers.length);
}
14 years, 1 month
JBoss Tools SVN: r39361 - in trunk: cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2012-03-07 20:06:06 -0500 (Wed, 07 Mar 2012)
New Revision: 39361
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/MaxNumberOfProblems.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/CoreValidationTest.java
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java
Log:
https://issues.jboss.org/browse/JBIDE-11198 CDI Validation reports N+1 problems per file even N problems per file configured in CDI Validation Preferences
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/MaxNumberOfProblems.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/MaxNumberOfProblems.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/MaxNumberOfProblems.java 2012-03-08 01:06:06 UTC (rev 39361)
@@ -0,0 +1,45 @@
+package org.jboss.jsr299.tck.tests.jbt.validation;
+
+import javax.inject.Inject;
+
+public class MaxNumberOfProblems {
+
+ @Inject Clazz c1;
+ @Inject Clazz c2;
+ @Inject Clazz c3;
+ @Inject Clazz c4;
+ @Inject Clazz c5;
+ @Inject Clazz c6;
+ @Inject Clazz c7;
+ @Inject Clazz c8;
+ @Inject Clazz c9;
+ @Inject Clazz c10;
+ @Inject Clazz c11;
+ @Inject Clazz c12;
+ @Inject Clazz c13;
+ @Inject Clazz c14;
+ @Inject Clazz c15;
+ @Inject Clazz c16;
+ @Inject Clazz c17;
+ @Inject Clazz c18;
+ @Inject Clazz c19;
+ @Inject Clazz c20;
+ @Inject Clazz c21;
+ @Inject Clazz c22;
+ @Inject Clazz c23;
+ @Inject Clazz c24;
+ @Inject Clazz c25;
+ @Inject Clazz c26;
+ @Inject Clazz c27;
+ @Inject Clazz c28;
+ @Inject Clazz c29;
+ @Inject Clazz c30;
+
+ public static class Clazz {
+
+ }
+
+ public static class Clazz2 extends Clazz {
+
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/MaxNumberOfProblems.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/CoreValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/CoreValidationTest.java 2012-03-08 00:43:31 UTC (rev 39360)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/CoreValidationTest.java 2012-03-08 01:06:06 UTC (rev 39361)
@@ -12,18 +12,24 @@
import java.util.List;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.preference.IPersistentPreferenceStore;
import org.eclipse.jface.preference.IPreferenceStore;
import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.preferences.CDIPreferences;
import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator;
import org.jboss.tools.cdi.internal.core.validation.CDIProjectTree;
+import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
import org.jboss.tools.common.preferences.SeverityPreferences;
import org.jboss.tools.common.validation.IValidator;
import org.jboss.tools.common.validation.ValidationContext;
import org.jboss.tools.common.validation.ValidatorManager;
import org.jboss.tools.common.validation.internal.LinkCollection;
import org.jboss.tools.common.validation.internal.ProjectValidationContext;
+import org.jboss.tools.tests.AbstractResourceMarkerTest;
/**
* @author Alexey Kazakov
@@ -81,6 +87,17 @@
assertTrue("Validation context for CDIproject with wrong ID is not empty", collection.isEmpty());
}
+ /**
+ * https://issues.jboss.org/browse/JBIDE-11198
+ * @throws CoreException
+ */
+ public void testMaximumProblemsPerFile() throws CoreException {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/MaxNumberOfProblems.java");
+ int max = CDIPreferences.getMaxNumberOfProblemMarkersPerFile(tckProject);
+ IMarker[] markers = AbstractResourceMarkerTest.findMarkers(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS);
+ assertEquals(max, markers.length);
+ }
+
private LinkCollection getCoreLinks(IProject project) {
return getCoreLinks(project, CDICoreValidator.SHORT_ID);
}
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java 2012-03-08 00:43:31 UTC (rev 39360)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java 2012-03-08 01:06:06 UTC (rev 39361)
@@ -523,7 +523,7 @@
}
if(maxNumberOfMarkersPerFile>0) {
int existingMarkers = resource.findMarkers(markerType, true, IResource.DEPTH_ZERO).length;
- if(existingMarkers>maxNumberOfMarkersPerFile) {
+ if(existingMarkers>=maxNumberOfMarkersPerFile) {
return null;
}
}
14 years, 1 month
JBoss Tools SVN: r39360 - trunk/documentation/guides/GettingStartedGuide/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-03-07 19:43:31 -0500 (Wed, 07 Mar 2012)
New Revision: 39360
Modified:
trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
trunk/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml
trunk/documentation/guides/GettingStartedGuide/en-US/rad_jsf_application.xml
Log:
updated with qe updates
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-03-08 00:36:20 UTC (rev 39359)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-03-08 00:43:31 UTC (rev 39360)
@@ -8,7 +8,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
<edition>5.0.0</edition>
-<pubsnumber>12</pubsnumber>
+<pubsnumber>13</pubsnumber>
<abstract>
<para>The Getting Started Guide explains the JBoss Developer Studio.</para>
</abstract>
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml 2012-03-08 00:36:20 UTC (rev 39359)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml 2012-03-08 00:43:31 UTC (rev 39360)
@@ -11,16 +11,15 @@
</keywordset>
</chapterinfo>
<title>Developing a simple JSP web application</title>
- <note>
+<!-- <note>
<title>Note:</title>
<para>
We highly recommend developing in <property>Seam</property>. This chapter is for users who for some reason cannot use Seam.
</para>
- </note>
+</note> -->
<para>
- In this chapter you'll find out how to create a simple <ulink
- url="http://java.sun.com/products/jsp/">JSP</ulink> application using <property>JBoss Developer Studio</property>. The application will show a classic "Hello World!" on the page.
+ In this chapter you'll find out how to create a simple JSP application using <property>JBoss Developer Studio</property>. The application will show a classic "Hello World!" on the page.
</para>
<para>
@@ -263,7 +262,7 @@
<?dbhtml filename="DeployTheProject.html"?>
<title>Deploying the project</title>
<para>
- Writing ant scripts and managing the packaging process can be quite a complicated and time consuming task for even the most trivial web applications. However, <property>JBoss Developer Studio</property> relieves you of this burden. All you need is to start <property>JBoss Server</property> and launch your application in your favorite browser.
+ Writing ant scripts and managing the packaging process can be quite a complicated and time consuming task for even the most trivial web applications. However, <property>JBoss Developer Studio</property> relieves you of this burden. All you need is to start your <property>JBoss Server</property> and launch your application in your favorite browser.
</para>
<para>
@@ -274,7 +273,7 @@
<?dbhtml filename="JarConfig.html"?>
<title>JAR Config</title>
<para>
- Project archives managing is available through Project Archives view.
+ Project archives managing is available through the Project Archives view.
</para>
<itemizedlist>
@@ -376,7 +375,7 @@
<?dbhtml filename="AutoRedeploy.html"?>
<title>Auto redeploy</title>
<para>
- When you are creating a web application and register it on <property>JBoss Server</property> it is automatically deployed into the <filename>/deploy</filename> directory of the server. JBoss Developer Studio comes with the feature of auto-redeploy. It means that you don't need to restart <property>JBoss Server</property>. Any changes made in the application in exploded format will trigger a redeployment on the server.
+ When you create a web application and register it on the <property>JBoss Server</property> as it is automatically deployed into the <filename>/deploy</filename> directory of the server. JBoss Developer Studio's auto-redeploy feature ensures you do not need to restart the server. Any changes made in the application in exploded format will trigger a redeployment on the server.
</para>
<para>
@@ -450,13 +449,13 @@
<?dbhtml filename="LaunchingTheProject.html"?>
<title>Launch JSP Project</title>
<para>
- Let's now launch our project on server. We'll use <property>JBoss Server</property> that is shipped with <property>JBoss Developer Studio</property>. You can do it by performing one of the following actions:
+ Now launch the project onto a JBoss server:
</para>
<itemizedlist>
<listitem>
<para>
- Start JBoss Server from Servers view by clicking the Start the server icon (
+ Start a JBoss Server from the Servers view by clicking the Start the server icon (
<inlinemediaobject>
<imageobject>
<imagedata fileref="images/jsp_application/jsp_application_18.png"/>
@@ -499,7 +498,7 @@
</figure>
<para>
- Thus with the help of this chapter you've learnt how to organize a Dynamic Web Project with a minimal configuration, add new elements to it (in our case it's just one JSP page) and deploy and run it on the <property>JBoss Server</property> shipped with <property>JBoss Developer Studio</property>.
+ You have learnt how to organize a Dynamic Web Project with a minimal configuration, add new elements to it (in our case it is a JSP page), deploy, and run it on a JBoss Server from within JBoss Developer Studio.
</para>
</section>
</section>
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/rad_jsf_application.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/rad_jsf_application.xml 2012-03-08 00:36:20 UTC (rev 39359)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/rad_jsf_application.xml 2012-03-08 00:43:31 UTC (rev 39360)
@@ -9,24 +9,23 @@
<keyword>RAD</keyword>
</keywordset>
</chapterinfo>
- <title>RAD development of a simple JSF application</title>
+ <title>Rapid Application Development of a JSF application</title>
- <note>
+<!-- <note>
<title>Note:</title>
<para>We highly recommend developing in <property>Seam</property>. This chapter is for users
who for some reason cannot use <property>Seam</property>.</para>
- </note>
+ </note> -->
- <para>In this chapter you will learn how to create a simple JSF application being based on the
- <property>"RAD"</property> philosophy. We will create the familiar
+ <para>In this chapter you will learn how to create a JSF application being based on the Rapid Application Development (RAD) philosophy. We will create the familiar
Guess Number application. The game is played according to the following rules. You are asked to guess a number
between 0 and 100. If the guess is correct, a success page is displayed with a link to play
again. If the guess is incorrect, a message is printed notifying that a smaller or a larger
number should be entered and the game continues.</para>
- <para>We'll show you how to create such an application from scratch, along the way
+ <para>You will now learn how to create such an application from scratch, along the way
demonstrating the powerful features included in JBoss Developer Studio such as project templating, Visual
Page Editor, code completion and others. You will design the JSF application and then run
- the application from inside JBoss Developer Studio using the bundled JBoss server.</para>
+ the application from inside JBoss Developer Studio using a JBoss server.</para>
<section id="SettingUpTheProject12">
<?dbhtml filename="SettingUpTheProject12.html"?>
@@ -80,7 +79,7 @@
should be tried. The second page is called <filename>success.jsp</filename>. This page will be shown after you guess
the number correctly. From this page you also have the option to play the game again.</para>
- <para>Now, we will guide you through the steps on how to do this.</para>
+ <para>Steps for adding two pages to your application:</para>
<itemizedlist>
<listitem>
<para>First a folder called <filename>pages</filename> needs to be created under the <filename>WebContent</filename> folder. To do this right click on the <filename>WebContent</filename> folder in the Package Explorer view and select <menuchoice><guimenuitem>New</guimenuitem><guimenuitem>Folder</guimenuitem></menuchoice>. Set the <guilabel>Folder Name</guilabel> to <filename>pages</filename> and click the <guibutton>Finish</guibutton> button.</para>
@@ -185,9 +184,9 @@
<section id="CreatingResourceFile">
<?dbhtml filename="CreatingResourceFile.html"?>
<title>Creating Resource File</title>
- <para>A resource file is just a file with a <emphasis>.properties</emphasis> extension for
+ <para>A resource file is a file with a <emphasis>.properties</emphasis> extension for
collecting text messages in one central place. JBoss Developer Studio allows you to
- create quickly a resource file. The messages stored in resource file can be displayed to
+ create quickly a resource file. The messages stored in a resource file can be displayed to
you on a Web page during application execution. </para>
<para>
With resource file you don't hard code anything into the JSP pages. It also makes it easier to translate your application to other languages. All you have to do is to translate all your messages to the other language and save them in a new properties file with a name that ends with the appropriate ISO-639 language code.
14 years, 1 month
JBoss Tools SVN: r39359 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2012-03-07 19:36:20 -0500 (Wed, 07 Mar 2012)
New Revision: 39359
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDISettingsPreferencePage.java
Log:
https://issues.jboss.org/browse/JBIDE-11196 Pressing "Restore Default" button on "CDI (Context and Dependency Injection) Settings" Project Properties page throws JavaNullPointer exception
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDISettingsPreferencePage.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDISettingsPreferencePage.java 2012-03-08 00:35:56 UTC (rev 39358)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDISettingsPreferencePage.java 2012-03-08 00:36:20 UTC (rev 39359)
@@ -23,7 +23,6 @@
import org.eclipse.swt.widgets.Control;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.CDIUtil;
-import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.common.ui.preferences.SettingsPage;
import org.jboss.tools.common.ui.widget.editor.IFieldEditor;
import org.jboss.tools.common.ui.widget.editor.IFieldEditorFactory;
14 years, 1 month