August 2012 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r43079 - 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-08-16 18:45:09 -0400 (Thu, 16 Aug 2012) New Revision: 43079 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/AYTAnnotationValidationTest.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/AYTDefenitionErrorsValidationTest.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/AnnotationsValidationTest.java trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/AbstractAnnotationTest.java Log: https://issues.jboss.org/browse/JBIDE-10611 As-you-type CDI validation Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2012-08-16 22:38:16 UTC (rev 43078) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2012-08-16 22:45:09 UTC (rev 43079) @@ -54,6 +54,7 @@ import org.jboss.tools.cdi.core.test.tck.lookup.ResolutionByNameTest; import org.jboss.tools.cdi.core.test.tck.lookup.ResolutionByTypeTest; import org.jboss.tools.cdi.core.test.tck.lookup.UnsatisfiedDependencyTest; +import org.jboss.tools.cdi.core.test.tck.validation.AYTAnnotationValidationTest; import org.jboss.tools.cdi.core.test.tck.validation.AYTDefenitionErrorsValidationTest; import org.jboss.tools.cdi.core.test.tck.validation.AnnotationsValidationTest; import org.jboss.tools.cdi.core.test.tck.validation.BeansXmlValidationTest; @@ -134,6 +135,12 @@ // As-you-type validation tests suite.addTestSuite(AYTDefenitionErrorsValidationTest.class); +// suite.addTestSuite(DeploymentProblemsValidationTests.class); +// suite.addTestSuite(BeansXmlValidationTest.class); + suite.addTestSuite(AYTAnnotationValidationTest.class); +// suite.addTestSuite(CoreValidationTest.class); +// suite.addTestSuite(ELValidationTest.class); +// suite.addTestSuite(SuppressWarningsTests.class); // Refactoring test suite.addTestSuite(NamedBeanRefactoringTest.class); Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/AYTAnnotationValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/AYTAnnotationValidationTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/AYTAnnotationValidationTest.java 2012-08-16 22:45:09 UTC (rev 43079) @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.cdi.core.test.tck.validation; + +import org.jboss.tools.tests.IAnnotationTest; + +/** + * @author Alexey Kazakov + */ +public class AYTAnnotationValidationTest extends AnnotationsValidationTest { + + private CDIAnnotationTest annotationTest = new CDIAnnotationTest(); + + @Override + protected IAnnotationTest getAnnotationTest() { + return annotationTest; + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/AYTAnnotationValidationTest.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/AYTDefenitionErrorsValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/AYTDefenitionErrorsValidationTest.java 2012-08-16 22:38:16 UTC (rev 43078) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/AYTDefenitionErrorsValidationTest.java 2012-08-16 22:45:09 UTC (rev 43079) @@ -20,6 +20,7 @@ private CDIAnnotationTest annotationTest = new CDIAnnotationTest(); + @Override protected IAnnotationTest getAnnotationTest() { return annotationTest; } Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/AnnotationsValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/AnnotationsValidationTest.java 2012-08-16 22:38:16 UTC (rev 43078) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/AnnotationsValidationTest.java 2012-08-16 22:45:09 UTC (rev 43079) @@ -16,6 +16,7 @@ import org.eclipse.core.resources.IFile; import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages; import org.jboss.tools.tests.AbstractResourceMarkerTest; +import org.jboss.tools.tests.IAnnotationTest; /** * Wrong targets in CDI annotation types. @@ -24,101 +25,107 @@ */ public class AnnotationsValidationTest extends ValidationTest { + private IAnnotationTest annotationTest = new AbstractResourceMarkerTest(); + + protected IAnnotationTest getAnnotationTest() { + return annotationTest; + } + public void testQualifierWithMissingTarget() throws Exception { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/annotations/qualifier/broken/Hairy_MissingTarget.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE.substring(0, 56) + ".*", 36); + getAnnotationTest().assertAnnotationIsCreated(file, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE.substring(0, 56) + ".*", 36); } public void testQualifierWithMissingRetention() throws Exception { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/annotations/qualifier/broken/Hairy_MissingRetention.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE, 36); + getAnnotationTest().assertAnnotationIsCreated(file, CDIValidationMessages.MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE, 36); } public void testQualifierWithWrongTarget() throws Exception { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/annotations/qualifier/broken/Hairy_WrongTarget.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE.substring(0, 56) + ".*", 32); + getAnnotationTest().assertAnnotationIsCreated(file, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE.substring(0, 56) + ".*", 32); } public void testQualifierWithTargetOk() throws Exception { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/annotations/qualifier/HairyTargetOk.java"); - AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE.substring(0, 56) + ".*", 14); + getAnnotationTest().assertAnnotationIsNotCreated(file, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE.substring(0, 56) + ".*", 14); } public void testStereotypeWithMissingTarget() throws Exception { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/annotations/stereotype/broken/FishStereotype_MissingTarget.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_STEREOTYPE_TYPE.substring(0, 56) + ".*", 19); + getAnnotationTest().assertAnnotationIsCreated(file, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_STEREOTYPE_TYPE.substring(0, 56) + ".*", 19); } public void testStereotypeWithMissingRetention() throws Exception { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/annotations/stereotype/broken/FishStereotype_MissingRetention.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.MISSING_RETENTION_ANNOTATION_IN_STEREOTYPE_TYPE, 19); + getAnnotationTest().assertAnnotationIsCreated(file, CDIValidationMessages.MISSING_RETENTION_ANNOTATION_IN_STEREOTYPE_TYPE, 19); } public void testStereotypeWithWrongTarget() throws Exception { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/annotations/stereotype/broken/FishStereotype_WrongTarget.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_STEREOTYPE_TYPE.substring(0, 56) + ".*", 15); + getAnnotationTest().assertAnnotationIsCreated(file, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_STEREOTYPE_TYPE.substring(0, 56) + ".*", 15); } public void testScopeWithMissingTarget() throws Exception { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/annotations/scope/broken/FooScoped_MissingTarget.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE.substring(0, 52) + ".*", 33); + getAnnotationTest().assertAnnotationIsCreated(file, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE.substring(0, 52) + ".*", 33); } public void testScopeWithMissingRetention() throws Exception { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/annotations/scope/broken/FooScoped_MissingRetention.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.MISSING_RETENTION_ANNOTATION_IN_SCOPE_TYPE, 33); + getAnnotationTest().assertAnnotationIsCreated(file, CDIValidationMessages.MISSING_RETENTION_ANNOTATION_IN_SCOPE_TYPE, 33); } public void testScopeWithWrongTarget() throws Exception { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/annotations/scope/broken/FooScoped_WrongTarget.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE.substring(0, 52) + ".*", 30); + getAnnotationTest().assertAnnotationIsCreated(file, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE.substring(0, 52) + ".*", 30); } public void testStereotypesWithAdditionalStereotypesWithTMFTarget() throws Exception { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/target/StereotypeTMFBroken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_STEREOTYPE_TYPE_TMF, "StereotypeWTypeTarget", "StereotypeTMFBroken"), 15); + getAnnotationTest().assertAnnotationIsCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_STEREOTYPE_TYPE_TMF, "StereotypeWTypeTarget", "StereotypeTMFBroken"), 15); } public void testStereotypesWithAdditionalStereotypesWithMTarget() throws Exception { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/target/StereotypeMBroken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_STEREOTYPE_TYPE_M, "StereotypeWTypeTarget", "StereotypeMBroken"), 13); + getAnnotationTest().assertAnnotationIsCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_STEREOTYPE_TYPE_M, "StereotypeWTypeTarget", "StereotypeMBroken"), 13); } public void testStereotypesWithAdditionalStereotypesWithFTarget() throws Exception { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/target/StereotypeFBroken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_STEREOTYPE_TYPE_F, "StereotypeWTypeTarget", "StereotypeFBroken"), 13); + getAnnotationTest().assertAnnotationIsCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_STEREOTYPE_TYPE_F, "StereotypeWTypeTarget", "StereotypeFBroken"), 13); } public void testStereotypesWithAdditionalStereotypesWithMFTarget() throws Exception { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/target/StereotypeMFBroken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_STEREOTYPE_TYPE_MF, "StereotypeWTypeTarget", "StereotypeMFBroken"), 14); + getAnnotationTest().assertAnnotationIsCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_STEREOTYPE_TYPE_MF, "StereotypeWTypeTarget", "StereotypeMFBroken"), 14); } public void testStereotypesWithAdditionalStereotypesOk() throws Exception { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/target/StereotypeOk.java"); - AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_STEREOTYPE_TYPE_TMF, "StereotypeWTypeTarget", "StereotypeOk"), 13); - AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_STEREOTYPE_TYPE_M, "StereotypeWTypeTarget", "StereotypeOk"), 13); - AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_STEREOTYPE_TYPE_F, "StereotypeWTypeTarget", "StereotypeOk"), 13); - AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_STEREOTYPE_TYPE_MF, "StereotypeWTypeTarget", "StereotypeOk"), 13); + getAnnotationTest().assertAnnotationIsNotCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_STEREOTYPE_TYPE_TMF, "StereotypeWTypeTarget", "StereotypeOk"), 13); + getAnnotationTest().assertAnnotationIsNotCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_STEREOTYPE_TYPE_M, "StereotypeWTypeTarget", "StereotypeOk"), 13); + getAnnotationTest().assertAnnotationIsNotCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_STEREOTYPE_TYPE_F, "StereotypeWTypeTarget", "StereotypeOk"), 13); + getAnnotationTest().assertAnnotationIsNotCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_STEREOTYPE_TYPE_MF, "StereotypeWTypeTarget", "StereotypeOk"), 13); } public void testInterceptorBindingWithAdditionalInterceptorBindings() throws Exception { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/target/InterceptorBindingBroken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_INTERCEPTOR_BINDING_TYPE, "InterceptorBindingWTypeTarget", "InterceptorBindingBroken"), 16); + getAnnotationTest().assertAnnotationIsCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_INTERCEPTOR_BINDING_TYPE, "InterceptorBindingWTypeTarget", "InterceptorBindingBroken"), 16); } public void testInterceptorBindingWithAdditionalInterceptorBindingsOk() throws Exception { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/target/InterceptorBindingOk.java"); - AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_INTERCEPTOR_BINDING_TYPE, "InterceptorBindingWTypeTarget", "InterceptorBindingOk"), 15); + getAnnotationTest().assertAnnotationIsNotCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_INTERCEPTOR_BINDING_TYPE, "InterceptorBindingWTypeTarget", "InterceptorBindingOk"), 15); } public void testInterceptorBindingsForStereotypes() throws Exception { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/target/StereotypeWithInterceptorBindingBroken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_INTERCEPTOR_BINDING_TYPE_FOR_STEREOTYPE, "StereotypeWithInterceptorBindingBroken", "InterceptorBindingWTypeTarget"), 16); + getAnnotationTest().assertAnnotationIsCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_INTERCEPTOR_BINDING_TYPE_FOR_STEREOTYPE, "StereotypeWithInterceptorBindingBroken", "InterceptorBindingWTypeTarget"), 16); } public void testInterceptorBindingsForStereotypesOk() throws Exception { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/target/StereotypeOk.java"); - AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_INTERCEPTOR_BINDING_TYPE_FOR_STEREOTYPE, "StereotypeOk", "InterceptorBindingWTypeTarget"), 15); + getAnnotationTest().assertAnnotationIsNotCreated(file, MessageFormat.format(CDIValidationMessages.ILLEGAL_TARGET_IN_INTERCEPTOR_BINDING_TYPE_FOR_STEREOTYPE, "StereotypeOk", "InterceptorBindingWTypeTarget"), 15); } } \ No newline at end of file Modified: trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/AbstractAnnotationTest.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/AbstractAnnotationTest.java 2012-08-16 22:38:16 UTC (rev 43078) +++ trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/AbstractAnnotationTest.java 2012-08-16 22:45:09 UTC (rev 43079) @@ -175,7 +175,7 @@ manager.validateJavaElement(dirtyRegions, helper, reporter); // manager.validateString(dirtyRegions, helper, reporter); - StringBuffer messagesSB = new StringBuffer("AYT annotations: [\r\n"); //$NON-NLS-1$ + StringBuffer messagesSB = new StringBuffer("AYT messages: [\r\n"); //$NON-NLS-1$ List<IMessage> messages = new ArrayList<IMessage>(); i=0; for (Object object : reporter.getMessages()) { @@ -195,7 +195,7 @@ assertEquals("The number of markers doesn't equal to the number of AYT messages for " + resource + ".\r\nThe full list of the markers and messages:\r\n" + markersSB + "\r\n" + messagesSB, allMarkers.length, messages.size()); for (IMessage message : messages) { - assertTrue("Can't find message: [" + message + "] for " + resource + ".\r\nThe full list of the markers and messages:\r\n" + markersSB + "\r\n" + messagesSB, contains(allMarkers, message)); + assertTrue("Can't find message: [text=\"" + message.getText() + "\"; line=\"" + message.getLineNumber() + "\"; start=\"" + message.getOffset() + "\"; end=\"" + message.getOffset() + message.getLength() + "\"; type=\"] for " + resource + ".\r\nThe full list of the markers and messages:\r\n" + markersSB + "\r\n" + messagesSB, contains(allMarkers, message)); } } catch (BadLocationException e) { throw new CoreException(new Status(IStatus.ERROR, BaseTestPlugin.PLUGIN_ID, e.getMessage(), e));

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r43078 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-08-16 18:38:16 -0400 (Thu, 16 Aug 2012) New Revision: 43078 Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java Log: https://issues.jboss.org/browse/JBIDE-10611 As-you-type CDI validation Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java 2012-08-16 18:52:09 UTC (rev 43077) +++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java 2012-08-16 22:38:16 UTC (rev 43078) @@ -210,7 +210,10 @@ public static final String CLEAN_ALL_ANNOTATIONS_ATTRIBUTE = "org.jboss.tools.common.validation.cleanAllAnnotaions"; private static IMessage addMesssage(IValidator validator, boolean cleanAllAnnotaions, IReporter reporter, int offset, int length, IResource target, int lineNumber, int severity, String textMessage, Object[] messageArguments, String bundleName) { - Message message = new ValidationMessage(severity, messageArguments!=null?MessageFormat.format(textMessage, messageArguments):textMessage, target); + if(messageArguments==null) { + messageArguments = new String[0]; + } + Message message = new ValidationMessage(severity, MessageFormat.format(textMessage, messageArguments), target); message.setOffset(offset); message.setLength(length); message.setLineNo(lineNumber);

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r43077 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2012-08-16 14:52:09 -0400 (Thu, 16 Aug 2012) New Revision: 43077 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProjectAsYouType.java Log: JBIDE-12433 https://issues.jboss.org/browse/JBIDE-12433 As-you-type project implementation currently will be based on the project of the modified file rather than on the root project. Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProjectAsYouType.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProjectAsYouType.java 2012-08-16 15:00:33 UTC (rev 43076) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProjectAsYouType.java 2012-08-16 18:52:09 UTC (rev 43077) @@ -83,6 +83,16 @@ IInterceptorBinding interceptorBinding; public CDIProjectAsYouType(ICDIProject project, IFile file) { + if(file.getProject() != project.getNature().getProject()) { + /** + * Validation is done in context of the root project, + * however, at present as-you-type project based on the root project + * appears to be too complicated to implement, so that currently + * it will be based on the project of the file itself. + */ + ICDIProject p = CDICorePlugin.getCDIProject(file.getProject(), true); + if(p != null) project = p; + } this.project = project; this.file = file; try {

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r43076 - trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2012-08-16 11:00:33 -0400 (Thu, 16 Aug 2012) New Revision: 43076 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConnectionProfileUtil.java Log: https://issues.jboss.org/browse/JBIDE-8192 Added information to dead code Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java 2012-08-16 14:46:02 UTC (rev 43075) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java 2012-08-16 15:00:33 UTC (rev 43076) @@ -131,6 +131,8 @@ } @SuppressWarnings("unused") + // autoConfigureDialect(localCfg); Disabled for now since it causes very looong timeouts for + // non-running databases + i havent been needed until now... private void autoConfigureDialect(Configuration localCfg) { if (localCfg.getProperty(Environment.DIALECT) == null) { String dialect = ConnectionProfileUtil.autoDetectDialect(localCfg.getProperties()); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConnectionProfileUtil.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConnectionProfileUtil.java 2012-08-16 14:46:02 UTC (rev 43075) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConnectionProfileUtil.java 2012-08-16 15:00:33 UTC (rev 43076) @@ -115,6 +115,9 @@ try { connection = DriverManager.getConnection(url, user, pass); // SQL Dialect: + //note this code potentially could throw class cast exception + //see https://issues.jboss.org/browse/JBIDE-8192 + //probably when not Hiberante3.5 is used Dialect dialect = DialectFactory.buildDialect(properties, connection); return dialect.toString(); } catch (SQLException e) {

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r43075 - trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2012-08-16 10:46:02 -0400 (Thu, 16 Aug 2012) New Revision: 43075 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java Log: https://issues.jboss.org/browse/JBIDE-7908 Added "Do not ask again message" Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java 2012-08-16 13:24:14 UTC (rev 43074) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java 2012-08-16 14:46:02 UTC (rev 43075) @@ -26,8 +26,11 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.internal.ui.dialogs.OptionalMessageDialog; +import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jface.window.Window; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorSite; import org.eclipse.ui.IKeyBindingService; @@ -222,18 +225,15 @@ tf.setMatchSchema(".*"); //$NON-NLS-1$ tf.setMatchName(".*"); //$NON-NLS-1$ repository.addTableFilter(tf); - if(tableFilters.length==0) { - boolean b = MessageDialog.openQuestion(getContainer().getShell(), MapperMessages.ReverseEngineeringEditor_no_filters_defined, MapperMessages.ReverseEngineeringEditor_no_filters_has_been_defined); - if(!b) { + String dialogId = ReverseEngineeringEditor.class.getName(); + if(tableFilters.length==0 && OptionalMessageDialog.isDialogEnabled(dialogId)) { + int returnCode = OptionalMessageDialog.open(dialogId,getContainer().getShell(), + MapperMessages.ReverseEngineeringEditor_no_filters_defined, null, + MapperMessages.ReverseEngineeringEditor_no_filters_has_been_defined, MessageDialog.QUESTION, + new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, 0); + if (returnCode == Window.CANCEL) return null; - } } - //if(!hasIncludes && tableFilters.length>0) { // not true anymore since it is converted to a include everything... - //boolean b = MessageDialog.openQuestion(getContainer().getShell(), "Only exclude filters defined", "Only exclude filters has been defined.\n This will result in no tables being read from the database schema.\n Do you wish to continue reading the database schema ?"); - //if(!b) { - // return null; - //} - //} LazyDatabaseSchema lazyDatabaseSchema = new LazyDatabaseSchema(configuration, repository.getReverseEngineeringStrategy(new DefaultReverseEngineeringStrategy()));

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r43074 - in trunk/maven: plugins/org.jboss.tools.maven.cdi/META-INF and 28 other directories.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2012-08-16 09:24:14 -0400 (Thu, 16 Aug 2012) New Revision: 43074 Modified: trunk/maven/plugins/org.jboss.tools.maven.cdi/.classpath trunk/maven/plugins/org.jboss.tools.maven.cdi/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.core/.classpath trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.gwt/.classpath trunk/maven/plugins/org.jboss.tools.maven.gwt/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.hibernate/.classpath trunk/maven/plugins/org.jboss.tools.maven.hibernate/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.classpath trunk/maven/plugins/org.jboss.tools.maven.jaxrs/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/.classpath trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.jpa/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.jsf/.classpath trunk/maven/plugins/org.jboss.tools.maven.jsf/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.portlet/.classpath trunk/maven/plugins/org.jboss.tools.maven.portlet/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.profiles.core/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.profiles.ui/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.project.examples/.classpath trunk/maven/plugins/org.jboss.tools.maven.project.examples/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.seam/.classpath trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/.classpath trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.ui/.classpath trunk/maven/plugins/org.jboss.tools.maven.ui/.classpath trunk/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF trunk/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/.classpath trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF Log: JBIDE-12378 : Update .classpath and BREE in MANIFEST.MF to use JavaSE-1.6 Modified: trunk/maven/plugins/org.jboss.tools.maven.cdi/.classpath =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.cdi/.classpath 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.cdi/.classpath 2012-08-16 13:24:14 UTC (rev 43074) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: trunk/maven/plugins/org.jboss.tools.maven.cdi/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.cdi/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.cdi/META-INF/MANIFEST.MF 2012-08-16 13:24:14 UTC (rev 43074) @@ -15,5 +15,5 @@ org.jboss.tools.cdi.core Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Modified: trunk/maven/plugins/org.jboss.tools.maven.core/.classpath =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/.classpath 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.core/.classpath 2012-08-16 13:24:14 UTC (rev 43074) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2012-08-16 13:24:14 UTC (rev 43074) @@ -12,8 +12,8 @@ org.eclipse.wst.common.frameworks;visibility:=reexport, org.eclipse.jst.common.frameworks;visibility:=reexport, org.eclipse.wst.common.modulecore;visibility:=reexport, - org.eclipse.m2e.core;bundle-version="[1.0,1.2)";visibility:=reexport, - org.eclipse.m2e.maven.runtime;bundle-version="[1.0,1.2)";visibility:=reexport, + org.eclipse.m2e.core;bundle-version="[1.0,2.0)";visibility:=reexport, + org.eclipse.m2e.maven.runtime;bundle-version="[1.0,2.0)";visibility:=reexport, org.eclipse.jdt.core;visibility:=reexport, org.eclipse.m2e.jdt;bundle-version="[1.0,2.0)";visibility:=reexport, org.eclipse.jst.j2ee;visibility:=reexport, @@ -30,7 +30,7 @@ org.eclipse.wst.common.emfworkbench.integration, org.eclipse.m2e.wtp;bundle-version="0.16.0";resolution:=optional Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Export-Package: org.jboss.tools.maven.core, org.jboss.tools.maven.core.internal.project.facet, Modified: trunk/maven/plugins/org.jboss.tools.maven.gwt/.classpath =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.gwt/.classpath 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.gwt/.classpath 2012-08-16 13:24:14 UTC (rev 43074) @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Modified: trunk/maven/plugins/org.jboss.tools.maven.gwt/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.gwt/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.gwt/META-INF/MANIFEST.MF 2012-08-16 13:24:14 UTC (rev 43074) @@ -5,7 +5,7 @@ Bundle-Version: 1.4.0.qualifier Bundle-Activator: org.jboss.tools.maven.gwt.MavenGWTPlugin Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0", - org.eclipse.m2e.core;bundle-version="[1.0.200,1.2.0)", + org.eclipse.m2e.core;bundle-version="[1.0.0,1.2.0)", org.eclipse.core.resources;bundle-version="3.7.100", com.google.gwt.eclipse.core;bundle-version="2.5.0", org.eclipse.jdt.core;bundle-version="3.7.0", Modified: trunk/maven/plugins/org.jboss.tools.maven.hibernate/.classpath =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.hibernate/.classpath 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.hibernate/.classpath 2012-08-16 13:24:14 UTC (rev 43074) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: trunk/maven/plugins/org.jboss.tools.maven.hibernate/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.hibernate/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.hibernate/META-INF/MANIFEST.MF 2012-08-16 13:24:14 UTC (rev 43074) @@ -14,6 +14,6 @@ org.eclipse.wst.common.emfworkbench.integration, org.hibernate.eclipse.console Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Modified: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.classpath =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.classpath 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/.classpath 2012-08-16 13:24:14 UTC (rev 43074) @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Modified: trunk/maven/plugins/org.jboss.tools.maven.jaxrs/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jaxrs/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.jaxrs/META-INF/MANIFEST.MF 2012-08-16 13:24:14 UTC (rev 43074) @@ -15,7 +15,7 @@ org.eclipse.jst.ws.jaxrs.core Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Export-Package: org.jboss.tools.maven.jaxrs, org.jboss.tools.maven.jaxrs.configurators Modified: trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/.classpath =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/.classpath 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/.classpath 2012-08-16 13:24:14 UTC (rev 43074) @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Modified: trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/META-INF/MANIFEST.MF 2012-08-16 13:24:14 UTC (rev 43074) @@ -15,7 +15,7 @@ org.sonatype.m2e.mavenarchiver;bundle-version="0.14.0", org.jboss.ide.eclipse.as.ui.mbeans;bundle-version="2.3.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Export-Package: org.jboss.tools.maven.jbosspackaging, Modified: trunk/maven/plugins/org.jboss.tools.maven.jpa/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jpa/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.jpa/META-INF/MANIFEST.MF 2012-08-16 13:24:14 UTC (rev 43074) @@ -14,7 +14,7 @@ org.eclipse.jpt.jpa.core, org.eclipse.jpt.common.core Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5, +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.6 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/.classpath =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jsf/.classpath 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.jsf/.classpath 2012-08-16 13:24:14 UTC (rev 43074) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.jsf/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.jsf/META-INF/MANIFEST.MF 2012-08-16 13:24:14 UTC (rev 43074) @@ -14,7 +14,7 @@ org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100", org.eclipse.jst.jsf.core;bundle-version="1.3.4" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Export-Package: org.jboss.tools.maven.jsf, Modified: trunk/maven/plugins/org.jboss.tools.maven.portlet/.classpath =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.portlet/.classpath 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.portlet/.classpath 2012-08-16 13:24:14 UTC (rev 43074) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: trunk/maven/plugins/org.jboss.tools.maven.portlet/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.portlet/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.portlet/META-INF/MANIFEST.MF 2012-08-16 13:24:14 UTC (rev 43074) @@ -14,6 +14,6 @@ org.eclipse.jst.j2ee, org.eclipse.wst.common.emfworkbench.integration Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Modified: trunk/maven/plugins/org.jboss.tools.maven.profiles.core/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.profiles.core/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.profiles.core/META-INF/MANIFEST.MF 2012-08-16 13:24:14 UTC (rev 43074) @@ -10,7 +10,7 @@ org.eclipse.m2e.core;bundle-version="[1.0.0,1.2.0)";visibility:=reexport, org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.2.0)";visibility:=reexport Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Export-Package: org.jboss.tools.maven.profiles.core, org.jboss.tools.maven.profiles.core.profiles Modified: trunk/maven/plugins/org.jboss.tools.maven.profiles.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.profiles.ui/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.profiles.ui/META-INF/MANIFEST.MF 2012-08-16 13:24:14 UTC (rev 43074) @@ -18,6 +18,6 @@ org.eclipse.jdt;bundle-version="3.7.0", org.jboss.tools.maven.profiles.core Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Export-Package: org.jboss.tools.maven.profiles.ui Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/.classpath =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/.classpath 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/.classpath 2012-08-16 13:24:14 UTC (rev 43074) @@ -2,6 +2,6 @@ <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/META-INF/MANIFEST.MF 2012-08-16 13:24:14 UTC (rev 43074) @@ -11,7 +11,7 @@ org.jboss.tools.project.examples, org.eclipse.ui.ide, org.eclipse.m2e.archetype.common;bundle-version="[1.0.0,2.0.0)", - org.eclipse.m2e.core.ui;bundle-version="[1.0,1.2)", + org.eclipse.m2e.core.ui;bundle-version="[1.0,2.0)", org.eclipse.wst.web.ui;bundle-version="1.1.400", org.eclipse.ui.forms, org.jboss.ide.eclipse.as.core;bundle-version="2.3.0", Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/.classpath =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/.classpath 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/.classpath 2012-08-16 13:24:14 UTC (rev 43074) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF 2012-08-16 13:24:14 UTC (rev 43074) @@ -18,5 +18,5 @@ org.eclipse.wst.common.emfworkbench.integration, org.eclipse.jst.jsf.core Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Modified: trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/.classpath =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/.classpath 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/.classpath 2012-08-16 13:24:14 UTC (rev 43074) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="lib" path="lib/nexus-indexer-lucene-rest-api-client.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry exported="true" kind="lib" path="lib/nexus-indexer-lucene-rest-api-client.jar"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.ui/.classpath =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.ui/.classpath 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.ui/.classpath 2012-08-16 13:24:14 UTC (rev 43074) @@ -2,6 +2,6 @@ <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/.classpath =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/.classpath 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/.classpath 2012-08-16 13:24:14 UTC (rev 43074) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF 2012-08-16 13:24:14 UTC (rev 43074) @@ -12,14 +12,16 @@ org.eclipse.wst.common.frameworks.ui, org.eclipse.core.resources, org.jboss.tools.maven.core, - org.eclipse.m2e.core.ui;bundle-version="[1.0.0,1.2.0)", + org.eclipse.m2e.core.ui;bundle-version="[1.0.0,2.0.0)", org.eclipse.ui.ide, org.eclipse.jface.text, org.eclipse.jdt.ui;bundle-version="3.7.0", org.eclipse.jdt;bundle-version="3.7.0", - org.eclipse.compare;bundle-version="3.5.202" + org.eclipse.compare;bundle-version="3.5.202", + org.eclipse.jst.j2ee.ui;bundle-version="1.1.503", + org.eclipse.jst.jee.ui;bundle-version="1.0.401" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Export-Package: org.jboss.tools.maven.ui, org.jboss.tools.maven.ui.internal.libprov, Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF 2012-08-16 13:24:14 UTC (rev 43074) @@ -38,6 +38,6 @@ org.eclipse.ui.ide, org.eclipse.m2e.wtp;bundle-version="0.16.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Eclipse-RegisterBuddy: org.apache.log4j Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/.classpath =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/.classpath 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/.classpath 2012-08-16 13:24:14 UTC (rev 43074) @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF 2012-08-16 13:24:14 UTC (rev 43074) @@ -26,7 +26,7 @@ org.eclipse.datatools.connectivity.db.generic, org.hamcrest Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Eclipse-RegisterBuddy: org.apache.log4j Import-Package: org.apache.maven.model

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r43073 - in branches/jbosstools-3.3.x/maven: plugins/org.jboss.tools.maven.cdi/META-INF and 29 other directories.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2012-08-16 09:05:51 -0400 (Thu, 16 Aug 2012) New Revision: 43073 Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.cdi/.classpath branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.cdi/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.core/.classpath branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.gwt/.classpath branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.hibernate/.classpath branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.hibernate/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jaxrs/.classpath branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jaxrs/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jbosspackaging/.classpath branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jbosspackaging/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jpa/.classpath branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jpa/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jsf/.classpath branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jsf/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.portlet/.classpath branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.portlet/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.profiles.core/.classpath branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.profiles.core/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.profiles.ui/.classpath branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.profiles.ui/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.project.examples/.classpath branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.project.examples/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.seam/.classpath branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.sourcelookup.core/.classpath branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/.classpath branches/jbosstools-3.3.x/maven/tests/org.jboss.tools.maven.configurators.tests/.classpath branches/jbosstools-3.3.x/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF branches/jbosstools-3.3.x/maven/tests/org.jboss.tools.maven.ui.bot.test/.classpath branches/jbosstools-3.3.x/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF Log: JBIDE-12378 : Update .classpath and BREE in MANIFEST.MF to use JavaSE-1.6 Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.cdi/.classpath =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.cdi/.classpath 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.cdi/.classpath 2012-08-16 13:05:51 UTC (rev 43073) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.cdi/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.cdi/META-INF/MANIFEST.MF 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.cdi/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) @@ -15,5 +15,5 @@ org.jboss.tools.cdi.core Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.core/.classpath =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.core/.classpath 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.core/.classpath 2012-08-16 13:05:51 UTC (rev 43073) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) @@ -12,23 +12,23 @@ org.eclipse.wst.common.frameworks;visibility:=reexport, org.eclipse.jst.common.frameworks;visibility:=reexport, org.eclipse.wst.common.modulecore;visibility:=reexport, - org.eclipse.m2e.core;bundle-version="[1.0,1.2)";visibility:=reexport, - org.eclipse.m2e.maven.runtime;bundle-version="[1.0,1.2)";visibility:=reexport, + org.eclipse.m2e.core;bundle-version="[1.0,2.0)";visibility:=reexport, + org.eclipse.m2e.maven.runtime;bundle-version="[1.0,2.0)";visibility:=reexport, org.eclipse.jdt.core;visibility:=reexport, - org.eclipse.m2e.jdt;bundle-version="[1.0,1.2)";visibility:=reexport, + org.eclipse.m2e.jdt;bundle-version="[1.0,2.0)";visibility:=reexport, org.eclipse.jst.j2ee;visibility:=reexport, org.eclipse.jst.j2ee.web;visibility:=reexport, org.jboss.tools.common;visibility:=reexport, org.eclipse.jdt.launching;visibility:=reexport, org.eclipse.ui.workbench;visibility:=reexport, - org.eclipse.m2e.model.edit;bundle-version="[1.0,1.2)";visibility:=reexport, + org.eclipse.m2e.model.edit;bundle-version="[1.0,2.0)";visibility:=reexport, org.eclipse.core.expressions, - org.maven.ide.eclipse.wtp;bundle-version="[0.13.0,0.17.0)";visibility:=reexport, + org.maven.ide.eclipse.wtp;bundle-version="[0.13.0,0.16.0)";visibility:=reexport, org.eclipse.jdt.ui;bundle-version="3.7.0", org.eclipse.jpt.common.core;bundle-version="1.0.0", org.eclipse.jpt.jpa.core Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Export-Package: org.jboss.tools.maven.core, org.jboss.tools.maven.core.internal.project.facet, Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.gwt/.classpath =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.gwt/.classpath 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.gwt/.classpath 2012-08-16 13:05:51 UTC (rev 43073) @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.hibernate/.classpath =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.hibernate/.classpath 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.hibernate/.classpath 2012-08-16 13:05:51 UTC (rev 43073) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.hibernate/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.hibernate/META-INF/MANIFEST.MF 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.hibernate/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) @@ -14,6 +14,6 @@ org.eclipse.wst.common.emfworkbench.integration, org.hibernate.eclipse.console Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jaxrs/.classpath =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jaxrs/.classpath 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jaxrs/.classpath 2012-08-16 13:05:51 UTC (rev 43073) @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jaxrs/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jaxrs/META-INF/MANIFEST.MF 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jaxrs/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) @@ -15,7 +15,7 @@ org.eclipse.jst.ws.jaxrs.core Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Export-Package: org.jboss.tools.maven.jaxrs, org.jboss.tools.maven.jaxrs.configurators Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jbosspackaging/.classpath =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jbosspackaging/.classpath 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jbosspackaging/.classpath 2012-08-16 13:05:51 UTC (rev 43073) @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jbosspackaging/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jbosspackaging/META-INF/MANIFEST.MF 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jbosspackaging/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) @@ -16,7 +16,7 @@ org.jboss.ide.eclipse.as.ui.mbeans;bundle-version="2.3.0", org.maven.ide.eclipse.wtp;bundle-version="[0.13.0,0.17.0) Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Export-Package: org.jboss.tools.maven.jbosspackaging, Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jpa/.classpath =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jpa/.classpath 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jpa/.classpath 2012-08-16 13:05:51 UTC (rev 43073) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src/"/> <classpathentry kind="output" path="target/classes"/> Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jpa/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jpa/META-INF/MANIFEST.MF 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jpa/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) @@ -14,7 +14,7 @@ org.eclipse.jpt.jpa.core, org.eclipse.jpt.common.core Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5, +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.6 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jsf/.classpath =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jsf/.classpath 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jsf/.classpath 2012-08-16 13:05:51 UTC (rev 43073) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jsf/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jsf/META-INF/MANIFEST.MF 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.jsf/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) @@ -14,7 +14,7 @@ org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100", org.eclipse.jst.jsf.core;bundle-version="1.3.4" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Export-Package: org.jboss.tools.maven.jsf, Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.portlet/.classpath =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.portlet/.classpath 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.portlet/.classpath 2012-08-16 13:05:51 UTC (rev 43073) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.portlet/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.portlet/META-INF/MANIFEST.MF 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.portlet/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) @@ -14,6 +14,6 @@ org.eclipse.jst.j2ee, org.eclipse.wst.common.emfworkbench.integration Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.profiles.core/.classpath =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.profiles.core/.classpath 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.profiles.core/.classpath 2012-08-16 13:05:51 UTC (rev 43073) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src/"/> <classpathentry kind="output" path="target/classes"/> Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.profiles.core/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.profiles.core/META-INF/MANIFEST.MF 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.profiles.core/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) @@ -10,7 +10,7 @@ org.eclipse.m2e.core;bundle-version="[1.0.0,1.2.0)";visibility:=reexport, org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.2.0)";visibility:=reexport Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Export-Package: org.jboss.tools.maven.profiles.core, org.jboss.tools.maven.profiles.core.profiles Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.profiles.ui/.classpath =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.profiles.ui/.classpath 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.profiles.ui/.classpath 2012-08-16 13:05:51 UTC (rev 43073) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src/"/> <classpathentry kind="output" path="target/classes"/> Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.profiles.ui/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.profiles.ui/META-INF/MANIFEST.MF 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.profiles.ui/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) @@ -18,6 +18,6 @@ org.eclipse.jdt;bundle-version="3.7.0", org.jboss.tools.maven.profiles.core Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Export-Package: org.jboss.tools.maven.profiles.ui Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.project.examples/.classpath =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.project.examples/.classpath 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.project.examples/.classpath 2012-08-16 13:05:51 UTC (rev 43073) @@ -2,6 +2,6 @@ <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.project.examples/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.project.examples/META-INF/MANIFEST.MF 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.project.examples/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) @@ -10,8 +10,8 @@ org.jboss.tools.maven.core, org.jboss.tools.project.examples, org.eclipse.ui.ide, - org.eclipse.m2e.archetype.common;bundle-version="[1.0,1.2)", - org.eclipse.m2e.core.ui;bundle-version="[1.0,1.2)", + org.eclipse.m2e.archetype.common;bundle-version="[1.0,2.0)", + org.eclipse.m2e.core.ui;bundle-version="[1.0,2.0)", org.eclipse.wst.web.ui;bundle-version="1.1.400", org.eclipse.ui.forms, org.jboss.ide.eclipse.as.core;bundle-version="2.3.0", Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.seam/.classpath =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.seam/.classpath 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.seam/.classpath 2012-08-16 13:05:51 UTC (rev 43073) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) @@ -18,5 +18,5 @@ org.eclipse.wst.common.emfworkbench.integration, org.eclipse.jst.jsf.core Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.sourcelookup.core/.classpath =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.sourcelookup.core/.classpath 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.sourcelookup.core/.classpath 2012-08-16 13:05:51 UTC (rev 43073) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="lib" path="lib/nexus-indexer-lucene-rest-api-client.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry exported="true" kind="lib" path="lib/nexus-indexer-lucene-rest-api-client.jar"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/.classpath =================================================================== --- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/.classpath 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/.classpath 2012-08-16 13:05:51 UTC (rev 43073) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: branches/jbosstools-3.3.x/maven/tests/org.jboss.tools.maven.configurators.tests/.classpath =================================================================== --- branches/jbosstools-3.3.x/maven/tests/org.jboss.tools.maven.configurators.tests/.classpath 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/tests/org.jboss.tools.maven.configurators.tests/.classpath 2012-08-16 13:05:51 UTC (rev 43073) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src/"/> <classpathentry kind="output" path="target/classes"/> Modified: branches/jbosstools-3.3.x/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) @@ -37,6 +37,6 @@ org.jboss.tools.maven.jdt, org.eclipse.ui.ide Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Eclipse-RegisterBuddy: org.apache.log4j Modified: branches/jbosstools-3.3.x/maven/tests/org.jboss.tools.maven.ui.bot.test/.classpath =================================================================== --- branches/jbosstools-3.3.x/maven/tests/org.jboss.tools.maven.ui.bot.test/.classpath 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/tests/org.jboss.tools.maven.ui.bot.test/.classpath 2012-08-16 13:05:51 UTC (rev 43073) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src/"/> <classpathentry kind="output" path="target/classes"/> Modified: branches/jbosstools-3.3.x/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.x/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF 2012-08-16 12:06:24 UTC (rev 43072) +++ branches/jbosstools-3.3.x/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF 2012-08-16 13:05:51 UTC (rev 43073) @@ -25,7 +25,7 @@ org.eclipse.datatools.connectivity, org.eclipse.datatools.connectivity.db.generic Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Eclipse-RegisterBuddy: org.apache.log4j Import-Package: org.apache.maven.model Export-Package: org.jboss.tools.maven.ui.bot.test

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r43072 - trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite.

by jbosstools-commits＠lists.jboss.org

Author: jpeterka Date: 2012-08-16 08:06:24 -0400 (Thu, 16 Aug 2012) New Revision: 43072 Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/JenkinsSuite.java Log: Test added into hb ui bot jenkins suite Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/JenkinsSuite.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/JenkinsSuite.java 2012-08-16 10:54:53 UTC (rev 43071) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/JenkinsSuite.java 2012-08-16 12:06:24 UTC (rev 43072) @@ -1,5 +1,6 @@ package org.jboss.tools.hb.ui.bot.suite; +import org.jboss.tools.hb.ui.bot.test.configuration.CreateConfigurationFileTest; import org.jboss.tools.hb.ui.bot.test.perspective.PerspectiveTest; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.junit.runner.RunWith; @@ -13,7 +14,8 @@ */ @RunWith(RequirementAwareSuite.class) @SuiteClasses({ - PerspectiveTest.class + PerspectiveTest.class, + CreateConfigurationFileTest.class }) public class JenkinsSuite {

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r43071 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2012-08-16 06:54:53 -0400 (Thu, 16 Aug 2012) New Revision: 43071 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHasChildren.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java Log: https://issues.jboss.org/browse/JBIDE-3225 - adding text for a4j:push and a4j:actionParam Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2012-08-16 10:04:38 UTC (rev 43070) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2012-08-16 10:54:53 UTC (rev 43071) @@ -182,6 +182,11 @@ </vpe:tag> <vpe:tag name="a4j:actionparam" case-sensitive="yes"> + <vpe:if test="haschildren('true')"> + <vpe:template children="yes" modify="no" > + <div></div> + </vpe:template> + </vpe:if> <vpe:template children="no" modify="no" > </vpe:template> </vpe:tag> @@ -281,6 +286,11 @@ </vpe:tag> <vpe:tag name="a4j:push" case-sensitive="yes"> + <vpe:if test="haschildren('true')"> + <vpe:template children="yes" modify="no" > + <div></div> + </vpe:template> + </vpe:if> <vpe:template children="no" modify="no" > </vpe:template> </vpe:tag> Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHasChildren.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHasChildren.java 2012-08-16 10:04:38 UTC (rev 43070) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHasChildren.java 2012-08-16 10:54:53 UTC (rev 43071) @@ -7,7 +7,7 @@ * * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ + ******************************************************************************/ package org.jboss.tools.vpe.editor.template.expression; import org.w3c.dom.Node; @@ -17,17 +17,21 @@ public class VpeFunctionHasChildren extends VpeFunction { - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { + boolean includeTextNodes = "true".equalsIgnoreCase( //$NON-NLS-1$ + getParameter(0).exec(pageContext, sourceNode).stringValue()); + boolean status = false; - if(sourceNode != null){ - if(sourceNode.hasChildNodes()){ + if (sourceNode != null) { + if (sourceNode.hasChildNodes()) { NodeList list = sourceNode.getChildNodes(); - if(list.getLength() == 1 && ((Node)list.item(0)).getNodeType() == Node.TEXT_NODE){ + if (!includeTextNodes && (list.getLength() == 1) + && ((Node) list.item(0)).getNodeType() == Node.TEXT_NODE) { status = false; - }else status = true; + } else + status = true; } } - return new VpeValue(status); } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2012-08-16 10:04:38 UTC (rev 43070) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2012-08-16 10:54:53 UTC (rev 43071) @@ -80,16 +80,17 @@ public static final String ATTR_ID = "id"; //$NON-NLS-1$ public static final String ATTR_TYPE = "type"; //$NON-NLS-1$ public static final String ATTR_TEXT = "text"; //$NON-NLS-1$ - public static final String ATTR_CLASS = "class"; //$NON-NLS-1$ public static final String ATTR_TITLE = "title"; //$NON-NLS-1$ public static final String ATTR_NAME = "name"; //$NON-NLS-1$ public static final String ATTR_VALUE = "value"; //$NON-NLS-1$ public static final String ATTR_STYLE = "style"; //$NON-NLS-1$ public static final String ATTR_SIZE = "size"; //$NON-NLS-1$ public static final String ATTR_MULTIPLE = "multiple"; //$NON-NLS-1$ - public static final String ATTR_COLSPAN = "colspan"; //$NON-NLS-1$ public static final String ATTR_CELLSPACING = "cellspacing"; //$NON-NLS-1$ public static final String ATTR_CELLPADDING = "cellpadding"; //$NON-NLS-1$ + public static final String ATTR_CHECKED = "checked"; //$NON-NLS-1$ + public static final String ATTR_COLSPAN = "colspan"; //$NON-NLS-1$ + public static final String ATTR_CLASS = "class"; //$NON-NLS-1$ public static final String ATTR_WIDTH = "width"; //$NON-NLS-1$ public static final String ATTR_HEIGHT = "height"; //$NON-NLS-1$ public static final String ATTR_HSPACE = "hspace"; //$NON-NLS-1$

12 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r43070 - in trunk/jsf: plugins/org.jboss.tools.jsf.vpe.jsf/templates and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2012-08-16 06:04:38 -0400 (Thu, 16 Aug 2012) New Revision: 43070 Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfMessages.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectBooleanCheckbox.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputHidden.jsp.xml Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextAreaTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputHidden.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java Log: https://issues.jboss.org/browse/JBIDE-3225 - adding text for h:inputHidden, h:inputTextarea, h:messages, h:selectBooleanCheckbox Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextAreaTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextAreaTemplate.java 2012-08-16 09:00:22 UTC (rev 43069) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextAreaTemplate.java 2012-08-16 10:04:38 UTC (rev 43070) @@ -16,9 +16,9 @@ import org.jboss.tools.vpe.editor.mapping.VpeElementData; import org.jboss.tools.vpe.editor.template.VpeCreationData; import org.jboss.tools.vpe.editor.util.HTML; +import org.jboss.tools.vpe.editor.util.VisualDomUtil; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; -import org.mozilla.interfaces.nsIDOMHTMLTextAreaElement; import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Attr; import org.w3c.dom.Element; @@ -33,14 +33,7 @@ nsIDOMElement textArea = visualDocument .createElement(HTML.TAG_TEXTAREA); - -// Commented as fix for JBIDE-3012. -// ((nsIDOMHTMLTextAreaElement) textArea -// .queryInterface(nsIDOMHTMLTextAreaElement.NS_IDOMHTMLTEXTAREAELEMENT_IID)) -// .setReadOnly(true); - VpeCreationData creationData = new VpeCreationData(textArea); - copyGeneralJsfAttributes(sourceElement, textArea); ComponentUtil.copyDisabled(sourceElement, textArea); @@ -65,6 +58,13 @@ } textArea.appendChild(text); + /* + * https://issues.jboss.org/browse/JBIDE-3225 + * Components should render usual text inside + */ + VpeCreationData creationData = VisualDomUtil.createTemplateWithTextContainer( + sourceElement, textArea, HTML.TAG_DIV, visualDocument); + creationData.setElementData(elementData); return creationData; Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfMessages.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfMessages.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfMessages.java 2012-08-16 10:04:38 UTC (rev 43070) @@ -0,0 +1,53 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.vpe.jsf.template; + +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.util.HTML; +import org.jboss.tools.vpe.editor.util.VisualDomUtil; +import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMText; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +public class JsfMessages extends VpeAbstractTemplate { + + private static final String MESSAGES = "Error Messages"; //$NON-NLS-1$ + + @Override + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + Element sourceElement = (Element) sourceNode; + nsIDOMElement ul = visualDocument.createElement(HTML.TAG_UL); + nsIDOMElement li = visualDocument.createElement(HTML.TAG_LI); + nsIDOMText text = visualDocument.createTextNode(MESSAGES); + if (sourceElement.hasAttribute(JSF.ATTR_STYLE)) { + ul.setAttribute(JSF.ATTR_STYLE, sourceElement.getAttribute(JSF.ATTR_STYLE)); + } + if (sourceElement.hasAttribute(JSF.ATTR_STYLE_CLASS)) { + ul.setAttribute(HTML.ATTR_CLASS, sourceElement.getAttribute(JSF.ATTR_STYLE_CLASS)); + } + li.appendChild(text); + ul.appendChild(li); + /* + * https://issues.jboss.org/browse/JBIDE-3225 + * Components should render usual text inside + */ + VpeCreationData creationData = VisualDomUtil.createTemplateWithTextContainer( + sourceElement, ul, HTML.TAG_DIV, visualDocument); + + return creationData; + } + +} Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectBooleanCheckbox.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectBooleanCheckbox.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectBooleanCheckbox.java 2012-08-16 10:04:38 UTC (rev 43070) @@ -0,0 +1,62 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.vpe.jsf.template; + +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.util.HTML; +import org.jboss.tools.vpe.editor.util.VisualDomUtil; +import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMElement; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +public class JsfSelectBooleanCheckbox extends VpeAbstractTemplate { + + private static final String TRUE = "true"; //$NON-NLS-1$ + + @Override + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + Element sourceElement = (Element) sourceNode; + nsIDOMElement input = visualDocument.createElement(HTML.TAG_INPUT); + input.setAttribute(HTML.ATTR_TYPE, HTML.VALUE_TYPE_CHECKBOX); + + if (sourceElement.hasAttribute(HTML.ATTR_DISABLED)) { + String disabled = sourceElement.getAttribute(HTML.ATTR_DISABLED); + if (TRUE.equalsIgnoreCase(disabled)) { + input.setAttribute(HTML.ATTR_DISABLED, disabled); + } + } + if (sourceElement.hasAttribute(HTML.ATTR_BORDER)) { + input.setAttribute(HTML.ATTR_BORDER, sourceElement.getAttribute(HTML.ATTR_BORDER)); + } + if (sourceElement.hasAttribute(HTML.ATTR_VALUE)) { + input.setAttribute(HTML.ATTR_CHECKED, sourceElement.getAttribute(HTML.ATTR_VALUE)); + } + if (sourceElement.hasAttribute(JSF.ATTR_STYLE)) { + input.setAttribute(JSF.ATTR_STYLE, sourceElement.getAttribute(JSF.ATTR_STYLE)); + } + if (sourceElement.hasAttribute(JSF.ATTR_STYLE_CLASS)) { + input.setAttribute(JSF.ATTR_STYLE_CLASS, sourceElement.getAttribute(JSF.ATTR_STYLE_CLASS)); + } + /* + * https://issues.jboss.org/browse/JBIDE-3225 + * Components should render usual text inside + */ + VpeCreationData creationData = VisualDomUtil.createTemplateWithTextContainer( + sourceElement, input, HTML.TAG_DIV, visualDocument); + + return creationData; + } + +} Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2012-08-16 09:00:22 UTC (rev 43069) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2012-08-16 10:04:38 UTC (rev 43070) @@ -118,7 +118,10 @@ </vpe:tag> <vpe:tag name="h:inputHidden" case-sensitive="yes"> - <vpe:template children="no" modify="no"> + <vpe:template children="yes" modify="no"> + <div> + <input id="{@id}" type="hidden" name="{@id}" value="{@value}" /> + </div> <vpe:dnd> <vpe:drag start-enable="yes" /> <vpe:drop container="yes"> @@ -391,10 +394,8 @@ </vpe:tag> <vpe:tag name="h:selectBooleanCheckbox" case-sensitive="yes"> - <vpe:if test="@disabled='on'"> - <vpe:template children="no" modify="no"> - <input type="checkbox" disabled="on" checked="{@value}" class="{@styleClass}" - style="{@style}" border="{@border}" title="{tagstring()}" /> + <vpe:template children="yes" modify="no" + class="org.jboss.tools.jsf.vpe.jsf.template.JsfSelectBooleanCheckbox"> <vpe:dnd> <vpe:drag start-enable="yes" /> <vpe:drop container="yes"> @@ -402,11 +403,6 @@ <vpe:container-child tag-name="selectItems" /> </vpe:drop> </vpe:dnd> - </vpe:template> - </vpe:if> - <vpe:template children="no" modify="no"> - <input type="checkbox" checked="{@value}" class="{@styleClass}" - style="{@style}" border="{@border}" title="{tagstring()}" /> </vpe:template> </vpe:tag> @@ -912,10 +908,8 @@ </vpe:tag> <vpe:tag name="h:messages"> - <vpe:template children="no" modify="no"> - <ul class="{@styleClass}" style="{@style}"> - <li>Error Messages</li> - </ul> + <vpe:template children="yes" modify="no" + class="org.jboss.tools.jsf.vpe.jsf.template.JsfMessages"> <vpe:dnd> <vpe:drag start-enable="yes" /> <vpe:drop container="no" /> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml 2012-08-16 09:00:22 UTC (rev 43069) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml 2012-08-16 10:04:38 UTC (rev 43070) @@ -11,7 +11,7 @@ <ui:define name="body"> <h:form id="test_el"> <f:loadBundle basename="demo.resources" var="msg" /> - <h:messages globalOnly="true" styleClass="message"/> + <h:messages globalOnly="true" styleClass="message" style="color: green;"/> <rich:panel style="#{test.color} ">123456789 #{test.scope} #{test.scope} #{test.scope} <div style="width : 109px; height : 106px; background-color:green;"></div> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml 2012-08-16 09:00:22 UTC (rev 43069) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/test.xhtml.xml 2012-08-16 10:04:38 UTC (rev 43070) @@ -1,7 +1,7 @@ <tests> <test id="test_el"> <FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> - <UL CLASS="message" STYLE="-moz-user-modify: read-only;"> + <UL CLASS="message" STYLE="color: green;"> <LI> Error Messages </LI> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputHidden.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputHidden.jsp 2012-08-16 09:00:22 UTC (rev 43069) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputHidden.jsp 2012-08-16 10:04:38 UTC (rev 43070) @@ -7,10 +7,7 @@ <body> <f:view> - <h1><h:outputText value="inputHidden" /></h1> - - <h:inputHidden value="inputHidden" id="inputHidden"/> - + <h:inputHidden value="inputHiddenValue" id="inputHiddenID"/> </f:view> </body> </html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputHidden.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputHidden.jsp.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputHidden.jsp.xml 2012-08-16 10:04:38 UTC (rev 43070) @@ -0,0 +1,9 @@ +<tests> + <test id="inputHiddenID"> + <DIV STYLE="-moz-user-modify: read-only;"> + <INPUT TYPE="hidden" ID="inputHiddenID" NAME="inputHiddenID" + VALUE="inputHiddenValue" /> + <BR VPE:PSEUDO-ELEMENT="yes" STYLE="-moz-user-modify: read-only;" /> + </DIV> + </test> +</tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp 2012-08-16 09:00:22 UTC (rev 43069) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp 2012-08-16 10:04:38 UTC (rev 43070) @@ -7,10 +7,7 @@ <body> <f:view> - <h1><h:outputText value="inputTextArea" /></h1> - - <h:inputTextarea value="inputTextArea" id="inputTextArea" /> - + <h:inputTextarea value="inputTextAreaValue" id="inputTextAreaID" /> </f:view> </body> </html> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp.xml 2012-08-16 09:00:22 UTC (rev 43069) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/inputTextArea.jsp.xml 2012-08-16 10:04:38 UTC (rev 43070) @@ -1,5 +1,5 @@ <tests> - <test id="inputTextArea"> - <TEXTAREA> inputTextArea </TEXTAREA> + <test id="inputTextAreaID"> + <TEXTAREA> inputTextAreaValue </TEXTAREA> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java 2012-08-16 09:00:22 UTC (rev 43069) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java 2012-08-16 10:04:38 UTC (rev 43070) @@ -46,8 +46,7 @@ } public void testInputHidden() throws Throwable { - performInvisibleTagTest( - "components/inputHidden.jsp", "inputHidden"); //$NON-NLS-1$ //$NON-NLS-2$ + performContentTest("components/inputHidden.jsp"); //$NON-NLS-1$ } public void testInputSecret() throws Throwable {

12 years, 5 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 August 2012