JBoss Tools SVN: r30849 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-04-26 15:08:33 -0400 (Tue, 26 Apr 2011)
New Revision: 30849
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java
Log:
JBIDE-7614 second patch
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2011-04-26 18:48:57 UTC (rev 30848)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2011-04-26 19:08:33 UTC (rev 30849)
@@ -793,7 +793,7 @@
public static String getDefaultOutputName(IModule module) {
- return module.getName() + PublishUtil.getSuffix(module.getModuleType().getId());
+ return new Path(module.getName()).lastSegment() + PublishUtil.getSuffix(module.getModuleType().getId());
}
protected static String getOutputFolderAndName(DeploymentModulePrefs modPref, IModule m) {
14 years, 11 months
JBoss Tools SVN: r30848 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-26 14:48:57 -0400 (Tue, 26 Apr 2011)
New Revision: 30848
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java
Log:
JBIDE-3120
https://issues.jboss.org/browse/JBIDE-3120
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2011-04-26 18:47:28 UTC (rev 30847)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2011-04-26 18:48:57 UTC (rev 30848)
@@ -31,6 +31,7 @@
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IScopeDeclaration;
+import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration;
import org.jboss.tools.cdi.internal.core.impl.JavaAnnotation;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
@@ -121,8 +122,8 @@
Iterator<IScopeDeclaration> iter = scopDeclarations.iterator();
while(iter.hasNext()){
IScopeDeclaration declaration = iter.next();
- if(declaration instanceof JavaAnnotation) {
- return ((JavaAnnotation)declaration).getAnnotation();
+ if(declaration.getJavaAnnotation() != null) {
+ return declaration.getJavaAnnotation();
}
}
return null;
14 years, 11 months
JBoss Tools SVN: r30847 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-26 14:47:28 -0400 (Tue, 26 Apr 2011)
New Revision: 30847
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotationDeclaration.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationLiteral.java
Log:
JBIDE-3120
https://issues.jboss.org/browse/JBIDE-3120
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotationDeclaration.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotationDeclaration.java 2011-04-26 18:34:34 UTC (rev 30846)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotationDeclaration.java 2011-04-26 18:47:28 UTC (rev 30847)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.core;
+import org.eclipse.jdt.core.IAnnotation;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IMemberValuePair;
import org.eclipse.jdt.core.IType;
@@ -57,4 +58,12 @@
* @return the corresponding annotation
*/
ICDIAnnotation getAnnotation();
+
+ /**
+ * Returns underlying Java annotation if this declaration is based on Java source.
+ * Returns null if this declaration is based on xml source.
+ *
+ * @return underlying Java annotation if it exists
+ */
+ IAnnotation getJavaAnnotation();
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java 2011-04-26 18:34:34 UTC (rev 30846)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java 2011-04-26 18:47:28 UTC (rev 30847)
@@ -11,6 +11,7 @@
package org.jboss.tools.cdi.internal.core.impl;
import org.eclipse.core.resources.IResource;
+import org.eclipse.jdt.core.IAnnotation;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IMemberValuePair;
import org.eclipse.jdt.core.IType;
@@ -95,4 +96,11 @@
public ICDIAnnotation getAnnotation() {
return null;
}
+
+ public IAnnotation getJavaAnnotation() {
+ if(annotation instanceof JavaAnnotation) {
+ return ((JavaAnnotation) annotation).getAnnotation();
+ }
+ return null;
+ }
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationLiteral.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationLiteral.java 2011-04-26 18:34:34 UTC (rev 30846)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationLiteral.java 2011-04-26 18:47:28 UTC (rev 30847)
@@ -40,12 +40,23 @@
this.range = new SourceRange(offset, length);
if(value != null) {
this.memberValues = new IMemberValuePair[]{
- new MemberValuePair("value", value, valueType)
+ createPair("value", value, valueType)
};
}
this.annotationType = annotationType;
}
+ public void addMemberValuePair(String name, Object value, int valueType) {
+ IMemberValuePair[] pairs = new IMemberValuePair[memberValues.length + 1];
+ System.arraycopy(memberValues, 0, pairs, 0, memberValues.length);
+ pairs[memberValues.length] = createPair(name, value, valueType);
+ memberValues = pairs;
+ }
+
+ private IMemberValuePair createPair(String name, Object value, int valueType) {
+ return new MemberValuePair(name, value, valueType);
+ }
+
public int getStartPosition() {
return range == null ? -1 : range.getOffset();
}
14 years, 11 months
JBoss Tools SVN: r30846 - in trunk/jsf: plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-04-26 14:34:34 -0400 (Tue, 26 Apr 2011)
New Revision: 30846
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/plugin.properties
trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2ComponentsValidator.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java
Log:
https://issues.jboss.org/browse/JBIDE-8789
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.properties 2011-04-26 18:00:04 UTC (rev 30845)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.properties 2011-04-26 18:34:34 UTC (rev 30846)
@@ -9,6 +9,8 @@
i18nProblemName = Externalization Problem
+I18nValidator.name = Externalization Validator
+
KBProblemName=JSF EL Problem
KB_REQUIRED_FOR_JSF=JSF
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2011-04-26 18:00:04 UTC (rev 30845)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2011-04-26 18:34:34 UTC (rev 30846)
@@ -660,8 +660,8 @@
</extension>
<extension
- id="jsf2"
- name="%JSF2_ComponentsValidator.name"
+ id="i18n"
+ name="%I18nValidator.name"
point="org.eclipse.wst.validation.validatorV2">
<validator
build="true"
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2ComponentsValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2ComponentsValidator.java 2011-04-26 18:00:04 UTC (rev 30845)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2ComponentsValidator.java 2011-04-26 18:34:34 UTC (rev 30846)
@@ -72,11 +72,16 @@
}
protected boolean isValidate(IFile file) {
- boolean isValidate = false;
if (!file.isAccessible() || !file.isSynchronized(IResource.DEPTH_ZERO) || file.getProject() == null
|| !file.getProject().isAccessible()) {
return false;
}
+ IProject project = file.getProject();
+ kbProject = KbProjectFactory.getKbProject(project, false);
+ if (kbProject == null) {
+ return false;
+ }
+ boolean isValidate = false;
try {
InputStream is = file.getContents();
Scanner scanner = new Scanner(is);
@@ -92,11 +97,6 @@
JSFModelPlugin.getPluginLog().logError(e);
return isValidate;
}
- IProject project = file.getProject();
- kbProject = KbProjectFactory.getKbProject(project, false);
- if (kbProject == null) {
- isValidate = false;
- }
return isValidate;
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java 2011-04-26 18:00:04 UTC (rev 30845)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java 2011-04-26 18:34:34 UTC (rev 30846)
@@ -24,6 +24,7 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.wst.validation.ValidationFramework;
import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil;
+import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ProjectImportTestSetup;
import junit.framework.TestCase;
@@ -47,6 +48,7 @@
project = ProjectImportTestSetup.loadProject(projectName);
project.build(IncrementalProjectBuilder.FULL_BUILD,
new NullProgressMonitor());
+ JobUtils.waitForIdle();
}
//junit test add to check JBIDE-7016 by Maksim Areshkau
public void testCreatingFile() throws CoreException, IOException{
14 years, 11 months
JBoss Tools SVN: r30845 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test: src/org/jboss/tools/cdi/seam/text/ext/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-04-26 14:00:04 -0400 (Tue, 26 Apr 2011)
New Revision: 30845
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java
Log:
https://issues.jboss.org/browse/JBIDE-8787
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF 2011-04-26 16:49:59 UTC (rev 30844)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF 2011-04-26 18:00:04 UTC (rev 30845)
@@ -6,19 +6,13 @@
Require-Bundle: org.junit,
org.eclipse.core.resources,
org.eclipse.jface.text,
- org.eclipse.ui.ide,
org.jboss.tools.common.text.ext,
- org.eclipse.core.runtime,
- org.jboss.tools.cdi.text.ext,
- org.eclipse.jdt.ui,
- org.eclipse.core.commands,
- org.jboss.tools.cdi.core.test,
- org.eclipse.jdt.core,
- org.eclipse.wst.xml.ui,
- org.eclipse.jface,
org.jboss.tools.cdi.text.ext.test,
org.jboss.tools.cdi.seam.text.ext,
- org.jboss.tools.common
+ org.jboss.tools.common,
+ org.jboss.tools.cdi.core.test,
+ org.eclipse.core.runtime,
+ org.eclipse.jdt.core
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.cdi.seam.text.ext.test
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java 2011-04-26 16:49:59 UTC (rev 30844)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java 2011-04-26 18:00:04 UTC (rev 30845)
@@ -19,7 +19,7 @@
ArrayList<Region> regionList = new ArrayList<Region>();
int injectPosition = text.indexOf("@Inject");
- System.out.println("injectPosition - "+injectPosition);
+ //System.out.println("injectPosition - "+injectPosition);
if(injectPosition > 0){
regionList.add(new Region(injectPosition, 58));
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java 2011-04-26 16:49:59 UTC (rev 30844)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java 2011-04-26 18:00:04 UTC (rev 30845)
@@ -10,19 +10,24 @@
******************************************************************************/
package org.jboss.tools.cdi.seam.text.ext.test;
+import org.eclipse.jdt.internal.core.JavaModelManager;
+import org.jboss.tools.cdi.core.test.CDICoreTestSetup;
+
import junit.framework.Test;
import junit.framework.TestSuite;
public class CdiSeamTextExtAllTests {
public static Test suite() {
// it could be done here because it is not needed to be enabled back
- //JavaModelManager.getIndexManager().disable();
+ JavaModelManager.getIndexManager().disable();
- //TestSuite suiteAll = new TestSuite("CDI Core Tests");
+ TestSuite suiteAll = new TestSuite("CDI Core Tests");
TestSuite suite = new TestSuite("CDI Seam OpenOns Tests");
suite.addTestSuite(CDISeamResourceLoadingHyperlinkDetectorTest.class);
-
- return suite;
+
+ suiteAll.addTest(new CDICoreTestSetup(suite));
+
+ return suiteAll;
}
}
\ No newline at end of file
14 years, 11 months
JBoss Tools SVN: r30844 - trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stable_branch.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-26 12:49:59 -0400 (Tue, 26 Apr 2011)
New Revision: 30844
Modified:
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stable...
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stable...
Log:
JBT 3.2.x should use Savara 1.1, not 1.2
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stable...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stable... 2011-04-26 16:26:21 UTC (rev 30843)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stable... 2011-04-26 16:49:59 UTC (rev 30844)
@@ -7,7 +7,7 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1303537697000'/>
+<property name='p2.timestamp' value='1303836478000'/>
</properties>
<children size='34'>
@@ -49,7 +49,7 @@
<child location='../../jbosstools-pi4soa-3.1_stable_branch/all/repo/'/>
<child location='../../jbosstools-teiid-designer-7.4_stable_branch/all/repo/'/>
<child location='../../jbosstools-drools-5.2_stable_branch/all/repo/'/>
-<child location='../../jbosstools-savara-1.2_stable_branch/tools/'/>
+<child location='../../jbosstools-savara-1.1_stable_branch/tools/'/>
<child location='../../xulrunner-1.9.1.2/all/repo/'/>
</children>
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stable...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stable... 2011-04-26 16:26:21 UTC (rev 30843)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stable... 2011-04-26 16:49:59 UTC (rev 30844)
@@ -7,7 +7,7 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1303537697000'/>
+<property name='p2.timestamp' value='1303836478000'/>
</properties>
<children size='34'>
@@ -49,7 +49,7 @@
<child location='../../jbosstools-pi4soa-3.1_stable_branch/all/repo/'/>
<child location='../../jbosstools-teiid-designer-7.4_stable_branch/all/repo/'/>
<child location='../../jbosstools-drools-5.2_stable_branch/all/repo/'/>
-<child location='../../jbosstools-savara-1.2_stable_branch/tools/'/>
+<child location='../../jbosstools-savara-1.1_stable_branch/tools/'/>
<child location='../../xulrunner-1.9.1.2/all/repo/'/>
</children>
14 years, 11 months
JBoss Tools SVN: r30843 - in trunk/cdi: plugins/org.jboss.tools.cdi.seam.config.core and 7 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-04-26 12:26:21 -0400 (Tue, 26 Apr 2011)
New Revision: 30843
Modified:
trunk/cdi/features/org.jboss.tools.cdi.seam.feature/
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/
trunk/cdi/plugins/org.jboss.tools.cdi.seam.faces.core/
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/
trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/
trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/
Log:
Added .target to .svnignore
Property changes on: trunk/cdi/features/org.jboss.tools.cdi.seam.feature
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.faces.core
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test
___________________________________________________________________
Added: svn:ignore
+ target
14 years, 11 months
JBoss Tools SVN: r30842 - in trunk/download.jboss.org/jbosstools/updates: helios and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-26 12:18:52 -0400 (Tue, 26 Apr 2011)
New Revision: 30842
Modified:
trunk/download.jboss.org/jbosstools/updates/helios/index.html
trunk/download.jboss.org/jbosstools/updates/index.html
trunk/download.jboss.org/jbosstools/updates/indigo/index.html
trunk/download.jboss.org/jbosstools/updates/requirements/index.html
Log:
update copy on helios, indigo, requirements, and . pages
Modified: trunk/download.jboss.org/jbosstools/updates/helios/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/index.html 2011-04-26 14:52:27 UTC (rev 30841)
+++ trunk/download.jboss.org/jbosstools/updates/helios/index.html 2011-04-26 16:18:52 UTC (rev 30842)
@@ -7,7 +7,7 @@
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
- cellspacing="0" cellpadding="0">
+ cellspacing="0" cellpadding="0" width="800">
<tr>
<td colspan="2"><img
src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
@@ -20,13 +20,14 @@
<td>
<h2 class="title">JBoss Tools Requirements - Composite Mirror - Helios</h2>
<table width="100%">
-
- <!-- <tr class="light-row" style="height: 30px">
+ <tr class="light-row" style="height: 30px">
<td class="bodyText">
- <p class="bodyText"></p>
+ <p class="bodyText">
+This composite site includes all the third party projects' upstream dependencies (eg., Eclipse, WTP, Orbit) for Eclipse 3.6 / Web Tools 3.2 / Helios.
+Point Eclipse at this URL to browse or install features. You can also explore this site's contents via its <a class=link href=compositeArtifacts.xml>compositeArtifacts.xml</a> file, or <a href=../requirements/>here</a>.
+ </p>
</td>
- </tr> -->
-
+ </tr>
<tr class="dark-row" style="height: 30px">
<td class="bodyText">
<!-- <p class="bodyText"></p> -->
Modified: trunk/download.jboss.org/jbosstools/updates/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/index.html 2011-04-26 14:52:27 UTC (rev 30841)
+++ trunk/download.jboss.org/jbosstools/updates/index.html 2011-04-26 16:18:52 UTC (rev 30842)
@@ -7,7 +7,7 @@
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
- cellspacing="0" cellpadding="0">
+ cellspacing="0" cellpadding="0" width="800">
<tr>
<td colspan="2"><img
src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
@@ -26,7 +26,6 @@
<p class="bodyText"></p>
</td>
</tr> -->
-
<tr class="dark-row" style="height: 30px">
<td class="bodyText">
<!-- <p class="bodyText"></p> -->
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/index.html 2011-04-26 14:52:27 UTC (rev 30841)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/index.html 2011-04-26 16:18:52 UTC (rev 30842)
@@ -7,7 +7,7 @@
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
- cellspacing="0" cellpadding="0">
+ cellspacing="0" cellpadding="0" width="800">
<tr>
<td colspan="2"><img
src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
@@ -20,13 +20,14 @@
<td>
<h2 class="title">JBoss Tools Requirements - Composite Mirror - Indigo</h2>
<table width="100%">
-
- <!-- <tr class="light-row" style="height: 30px">
+ <tr class="light-row" style="height: 30px">
<td class="bodyText">
- <p class="bodyText"></p>
+ <p class="bodyText">
+This composite site includes all the third party projects' upstream dependencies (eg., Eclipse, WTP, Orbit) for Eclipse 3.7 / Web Tools 3.3 / Indigo.
+Point Eclipse at this URL to browse or install features. You can also explore this site's contents via its <a class=link href=compositeArtifacts.xml>compositeArtifacts.xml</a> file, or <a href=../requirements/>here</a>.
+ </p>
</td>
- </tr> -->
-
+ </tr>
<tr class="dark-row" style="height: 30px">
<td class="bodyText">
<!-- <p class="bodyText"></p> -->
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/index.html 2011-04-26 14:52:27 UTC (rev 30841)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/index.html 2011-04-26 16:18:52 UTC (rev 30842)
@@ -7,7 +7,7 @@
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
- cellspacing="0" cellpadding="0">
+ cellspacing="0" cellpadding="0" width="800">
<tr>
<td colspan="2"><img
src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
@@ -21,13 +21,25 @@
<h2 class="title">JBoss Tools Build Requirements - Update Sites</h2>
<table width="100%">
- <!-- <tr class="light-row" style="height: 30px">
+ <tr class="light-row">
<td class="bodyText">
- <p class="bodyText"></p>
+<p class="bodyText">
+This directory contains a number of child folders, each containing update sites (p2 repos) of third party plugins and features used to build JBoss Tools or contained in JBoss Developer Studio.
+</p>
+<p class="bodyText">
+While you can certainly install these plugins from the individual URLs of the folders nested below here, it is <b>by far easier</b> to simply add the composite sites for your version of Eclipse / Web Tools / JBoss Tools / JBoss Developer Studio, and install from that single URL. The big reason for this - aside from the fact that 1 URL is easier than several, is that the composite site also includes all the third party projects' upstream dependencies (eg., Eclipse, WTP, Orbit), making it a <u>one-stop shopping destination</u>.
+
+<ul>
+<li><a class=link href=../indigo>All JBoss Tools 3.3 dependencies in one update site</a> (for installing or developing with Eclipse 3.7 / Web Tools 3.3 / Indigo)</li>
+<li><a class=link href=../helios>All JBoss Tools 3.2 dependencies in one update site</a> (for installing or developing with Eclipse 3.6 / Web Tools 3.2 / Helios)</li>
+</ul>
+
+<p class="bodyText">If you want a restricted set of features/plugins, namely the target platform used to build JBoss Tools or JBoss Developer Studio, <a href="../">click here</a>.
+</p>
</td>
- </tr> -->
+ </tr>
- <tr class="dark-row" style="height: 30px">
+ <tr class="dark-row">
<td class="bodyText">
<!-- <p class="bodyText"></p> -->
@@ -66,7 +78,13 @@
<li><a class=link href=testng>testng</a></li>
<li><a class=link href=webtools>webtools</a></li>
<li><a class=link href=xulrunner-1.9.2>xulrunner-1.9.2</a></li>
-<p>
+</ul>
+ </td>
+ </tr>
+
+ <tr class="light-row">
+ <td class="bodyText">
+<br/><ul>
<h2>JBoss Tools 3.2 / Eclipse 3.6 Helios / Web Tools 3.2</h2>
<li><a class=link href=helios>helios</a></li>
<li><a class=link href=birt/2.6.2>birt/2.6.2</a></li>
@@ -89,7 +107,13 @@
<li><a class=link href=tptp>tptp/4.7</a></li>
<li><a class=link href=webtools/3.2.3>webtools/3.2.3</a></li>
<li><a class=link href=xulrunner-1.9.1.2>xulrunner-1.9.1.2</a></li>
-<p>
+</ul>
+ </td>
+ </tr>
+
+ <tr class="dark-row">
+ <td class="bodyText">
+<br/><ul>
<h2>JBoss Tools 3.1 / Eclipse 3.5 Galileo / Web Tools 3.1</h2>
<li><a class=link href=galileo>galileo</a></li>
14 years, 11 months
JBoss Tools SVN: r30841 - trunk/build/util.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-26 10:52:27 -0400 (Tue, 26 Apr 2011)
New Revision: 30841
Modified:
trunk/build/util/getLatestArtifactFromNexus.sh
Log:
add --no-check-certificate to work around expired nexus ssl cert (*sigh*)
Modified: trunk/build/util/getLatestArtifactFromNexus.sh
===================================================================
--- trunk/build/util/getLatestArtifactFromNexus.sh 2011-04-26 14:15:27 UTC (rev 30840)
+++ trunk/build/util/getLatestArtifactFromNexus.sh 2011-04-26 14:52:27 UTC (rev 30841)
@@ -37,7 +37,7 @@
pushd $tmpdir >/dev/null
# get the metadata
-wget --no-clobber -q ${URL}/maven-metadata.xml
+wget --no-clobber --no-check-certificate -q ${URL}/maven-metadata.xml
# parse it
cat maven-metadata.xml | egrep "timestamp|buildNumber" > tmp.txt
14 years, 11 months
JBoss Tools SVN: r30840 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2011-04-26 10:15:27 -0400 (Tue, 26 Apr 2011)
New Revision: 30840
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java
Log:
https://issues.jboss.org/browse/JBIDE-8731
removed jpt plugin call from console plugin
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java 2011-04-26 13:49:35 UTC (rev 30839)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java 2011-04-26 14:15:27 UTC (rev 30840)
@@ -48,7 +48,6 @@
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IDocumentExtension3;
import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
import org.eclipse.ltk.core.refactoring.CheckConditionsOperation;
import org.eclipse.ltk.core.refactoring.PerformRefactoringOperation;
import org.eclipse.ltk.core.refactoring.participants.ProcessorBasedRefactoring;
@@ -273,8 +272,6 @@
KnownConfigurations.getInstance().addConfiguration(
new ConsoleConfiguration(new EclipseLaunchConsoleConfigurationPreferences(launchConfigurations[i])), false );
}
- // force to load the plugin before any of console configuration build
- JptJpaCorePlugin.getJpaProjectManager().getJpaProjects();
}
/**
14 years, 11 months
