JBoss Tools SVN: r36357 - in trunk/jsf/tests/org.jboss.tools.jsf.verification.test: projects/Test/WebContent/WEB-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-11-15 19:17:49 -0500 (Tue, 15 Nov 2011)
New Revision: 36357
Added:
trunk/jsf/tests/org.jboss.tools.jsf.verification.test/.settings/
trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/pages/404.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/pages/405.jsp
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/web.xml
trunk/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/WebVerificationTest.java
Log:
JBIDE-10177
https://issues.jboss.org/browse/JBIDE-10177
Test added for verification of error page with .xhtml extension, when default suffix is not specified.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/web.xml 2011-11-15 23:10:49 UTC (rev 36356)
+++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/WEB-INF/web.xml 2011-11-16 00:17:49 UTC (rev 36357)
@@ -43,4 +43,16 @@
<exception-type>java.lang.Exception</exception-type>
<location>/error2</location>
</error-page>
+ <error-page>
+ <error-code>404</error-code>
+ <location>pages/404.jsf</location>
+ </error-page>
+ <error-page>
+ <error-code>405</error-code>
+ <location>pages/405.jsf</location>
+ </error-page>
+ <error-page>
+ <error-code>400</error-code>
+ <location>pages/400.jsf</location>
+ </error-page>
</web-app>
Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/pages/404.xhtml
===================================================================
Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/WebContent/pages/405.jsp
===================================================================
Modified: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/WebVerificationTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/WebVerificationTest.java 2011-11-15 23:10:49 UTC (rev 36356)
+++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/WebVerificationTest.java 2011-11-16 00:17:49 UTC (rev 36357)
@@ -54,6 +54,10 @@
AbstractResourceMarkerTest.assertMarkerIsNotCreated(web, MARKER_TYPE, "error: Attribute location references to /error that does not exist in web content", 40);
AbstractResourceMarkerTest.assertMarkerIsCreated(web, MARKER_TYPE, "error: Attribute location references to /error2 that does not exist in web content", 44);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(web, MARKER_TYPE, "error: Attribute location references to .* that does not exist in web content", 48);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(web, MARKER_TYPE, "error: Attribute location references to .* that does not exist in web content", 52);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(web, MARKER_TYPE, "error: Attribute location references to pages/400.* that does not exist in web content", 56);
+
IMarker[] markers = web.findMarkers(null, true, IResource.DEPTH_INFINITE);
for (IMarker marker: markers) {
int line = marker.getAttribute(IMarker.LINE_NUMBER, -1);
14 years, 5 months
JBoss Tools SVN: r36354 - in workspace/fred/repositories/snapshot/org/jboss/spec/archetypes: jboss-javaee6-html5-mobile-archetype and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-11-15 14:46:09 -0500 (Tue, 15 Nov 2011)
New Revision: 36354
Added:
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/_maven.repositories
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT-sources.jar
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT.jar
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT.pom
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/maven-metadata-local.xml
workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/maven-metadata-local.xml
Log:
Add renamed html5 archetype
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/_maven.repositories
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/_maven.repositories (rev 0)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/_maven.repositories 2011-11-15 19:46:09 UTC (rev 36354)
@@ -0,0 +1,5 @@
+#NOTE: This is an internal implementation file, its format can be changed without prior notice.
+#Tue Nov 15 20:44:34 CET 2011
+jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT-sources.jar>=
+jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT.jar>=
+jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT.pom>=
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT-sources.jar
===================================================================
(Binary files differ)
Property changes on: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT-sources.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT.pom
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT.pom (rev 0)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/jboss-javaee6-html5-mobile-archetype-7.0.2-SNAPSHOT.pom 2011-11-15 19:46:09 UTC (rev 36354)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>6-beta-2</version>
+ </parent>
+
+ <groupId>org.jboss.spec.archetypes</groupId>
+ <artifactId>jboss-javaee6-html5-mobile-archetype</artifactId>
+ <version>7.0.2-SNAPSHOT</version>
+ <packaging>maven-archetype</packaging>
+
+ <name>Java EE 6 HTML5 Mobile Web Application</name>
+
+ <description>An archetype that generates a Java EE 6 application using HTML5, and JAX-RS to support both desktop and mobile web browsers</description>
+
+ <url>http://jboss.org/jbossas</url>
+
+ <developers>
+ <developer>
+ <name>Steven Boscarine</name>
+ <email>stevenboscarine(a)gmail.com</email>
+ </developer>
+ <developer>
+ <id>fbricon</id>
+ <name>Fred Bricon</name>
+ <email>fbricon(a)gmail.com</email>
+ <organization>Red Hat, Inc.</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://community.jboss.org/people/fbricon</url>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <name>Dan Allen</name>
+ <email>dan.j.allen(a)gmail.com</email>
+ <organization>JBoss, by Red Hat</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://community.jboss.org/people/dan.j.allen</url>
+ </developer>
+ <developer>
+ <name>Pete Muir</name>
+ <email>pete.muir(a)jboss.org</email>
+ <organization>Red Hat, Inc.</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://in.relation.to/Bloggers/Pete</url>
+ </developer>
+ <developer>
+ <name>Jay Balunas</name>
+ <email>jbalunas(a)jboss.org</email>
+ <organization>Red Hat, Inc.</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://in.relation.to/Bloggers/Jay</url>
+ </developer>
+ </developers>
+
+ <repositories>
+ <repository>
+ <id>jboss-public-repository</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public</url>
+ <!-- These optional flags are designed to speed up your builds by
+ reducing remote server calls -->
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.1</version>
+ </extension>
+ </extensions>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.1</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+</project>
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/maven-metadata-local.xml
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/maven-metadata-local.xml (rev 0)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/7.0.2-SNAPSHOT/maven-metadata-local.xml 2011-11-15 19:46:09 UTC (rev 36354)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata modelVersion="1.1.0">
+ <groupId>org.jboss.spec.archetypes</groupId>
+ <artifactId>jboss-javaee6-html5-mobile-archetype</artifactId>
+ <version>7.0.2-SNAPSHOT</version>
+ <versioning>
+ <snapshot>
+ <localCopy>true</localCopy>
+ </snapshot>
+ <lastUpdated>20111115194434</lastUpdated>
+ <snapshotVersions>
+ <snapshotVersion>
+ <classifier>sources</classifier>
+ <extension>jar</extension>
+ <value>7.0.2-SNAPSHOT</value>
+ <updated>20111115194434</updated>
+ </snapshotVersion>
+ <snapshotVersion>
+ <extension>jar</extension>
+ <value>7.0.2-SNAPSHOT</value>
+ <updated>20111115194434</updated>
+ </snapshotVersion>
+ <snapshotVersion>
+ <extension>pom</extension>
+ <value>7.0.2-SNAPSHOT</value>
+ <updated>20111115194434</updated>
+ </snapshotVersion>
+ </snapshotVersions>
+ </versioning>
+</metadata>
Added: workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/maven-metadata-local.xml
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/maven-metadata-local.xml (rev 0)
+++ workspace/fred/repositories/snapshot/org/jboss/spec/archetypes/jboss-javaee6-html5-mobile-archetype/maven-metadata-local.xml 2011-11-15 19:46:09 UTC (rev 36354)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.jboss.spec.archetypes</groupId>
+ <artifactId>jboss-javaee6-html5-mobile-archetype</artifactId>
+ <versioning>
+ <versions>
+ <version>7.0.2-SNAPSHOT</version>
+ </versions>
+ <lastUpdated>20111115194434</lastUpdated>
+ </versioning>
+</metadata>
14 years, 5 months
JBoss Tools SVN: r36353 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-11-15 13:41:58 -0500 (Tue, 15 Nov 2011)
New Revision: 36353
Modified:
trunk/build/parent/pom.xml
Log:
added ant-optional to fix jbossas-riftsaw requirement
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-11-15 18:40:05 UTC (rev 36352)
+++ trunk/build/parent/pom.xml 2011-11-15 18:41:58 UTC (rev 36353)
@@ -668,6 +668,17 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-optional</artifactId>
+ <version>1.5.3-1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven.antrun.plugin.version}</version>
14 years, 5 months
JBoss Tools SVN: r36352 - trunk/requirements/jboss-riftsaw.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-11-15 13:40:05 -0500 (Tue, 15 Nov 2011)
New Revision: 36352
Modified:
trunk/requirements/jboss-riftsaw/buildRequirement.xml
Log:
fixed path to downloaded requirements
Modified: trunk/requirements/jboss-riftsaw/buildRequirement.xml
===================================================================
--- trunk/requirements/jboss-riftsaw/buildRequirement.xml 2011-11-15 18:33:07 UTC (rev 36351)
+++ trunk/requirements/jboss-riftsaw/buildRequirement.xml 2011-11-15 18:40:05 UTC (rev 36352)
@@ -29,7 +29,7 @@
</target>
<target name="install-jbossas" >
<property file="../jbossas/build.properties" />
- <unzip src="${requirement.build.root}/jbossas/${jboss51.build.archive}" dest="${unzip.dest}" >
+ <unzip src="${requirement.build.root}/../download/jbossas/${jboss51.build.archive}" dest="${unzip.dest}" >
<mapper type="glob" from="${jboss51.build.name}/*" to="${jboss51.build.name}-riftsaw/*"/>
</unzip>
</target>
14 years, 5 months
JBoss Tools SVN: r36351 - in trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test: ca and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-11-15 13:33:07 -0500 (Tue, 15 Nov 2011)
New Revision: 36351
Added:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/CASeamAddInfoInELMessagesTest.java
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
Log:
JBIDE-9910 Proposal info for message bundles in code completion for EL
JUnit test for Seam EL Resource Bundle Messages resolver is added
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2011-11-15 17:53:50 UTC (rev 36350)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2011-11-15 18:33:07 UTC (rev 36351)
@@ -22,6 +22,7 @@
import org.eclipse.wst.validation.internal.operations.ValidatorManager;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.ui.test.ca.CASeamAddInfoInELMessagesTest;
import org.jboss.tools.seam.ui.test.ca.SeamELContentAssistJbide1645Test;
import org.jboss.tools.seam.ui.test.ca.SeamELContentAssistJbide1676Test;
import org.jboss.tools.seam.ui.test.ca.SeamELContentAssistTest;
@@ -96,6 +97,11 @@
JobUtils.waitForIdle();
}
} );
+
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(
+ CASeamAddInfoInELMessagesTest.class), "org.jboss.tools.seam.ui.test", //$NON-NLS-1$
+ new String[] { "projects/TestSeamELContentAssist", }, //$NON-NLS-1$
+ new String[] { "TestSeamELContentAssist" })); //$NON-NLS-1$
return suite;
}
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/CASeamAddInfoInELMessagesTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/CASeamAddInfoInELMessagesTest.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/CASeamAddInfoInELMessagesTest.java 2011-11-15 18:33:07 UTC (rev 36351)
@@ -0,0 +1,134 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.ui.test.ca;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.jboss.tools.common.base.test.contentassist.CATestUtil;
+import org.jboss.tools.jst.jsp.contentassist.AutoELContentAssistantProposal;
+import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+
+/**
+ * The JUnit test case for JBIDE-9910 issue
+ *
+ * @author Victor V. Rubezhny
+ *
+ */
+public class CASeamAddInfoInELMessagesTest extends ContentAssistantTestCase {
+ private static final String PROJECT_NAME = "TestSeamELContentAssist";
+ private static final String PAGE_NAME = "/WebContent/messages.xhtml";
+
+
+
+ private static final String INSERT_AFTER[] = new String[] {"#{messages."};
+ private static final String INSERTIONS[] = new String[] {"Text1"};
+ private static final String PREFIXES[] = new String[] {"#{messages.Text1"};
+ private static final String ADD_INFOS[] = new String[] {
+ "<html><body text=\"#000000\" bgcolor=\"#ffffe1\"><b>Property:</b> Text1<br><br><b>Resource Bundle:</b> /TestSeamELContentAssist/src/action/messages.properties<br><b>Value:</b> sss</body></html>"
+ };
+
+ public void setUp() throws Exception {
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
+ project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+ }
+
+ public static Test suite() {
+ return new TestSuite(CASeamAddInfoInELMessagesTest.class);
+ }
+
+ public void testCASeamAddInfoInELMessages () {
+ for (int i = 0; i < PREFIXES.length; i++) {
+ AutoELContentAssistantProposal jstProposals[] = getJSTProposals(INSERT_AFTER[i], INSERTIONS[i], PREFIXES[i]);
+ assertFalse ("No EL Proposals found in Web page: " + PAGE_NAME, (jstProposals == null || jstProposals.length == 0));
+ assertEquals ("Content Assist in returned more than 1 proposal for Web page: " + PAGE_NAME +
+ ". Test project and/or data should be verfied/updated.", 1, jstProposals.length);
+
+ for (AutoELContentAssistantProposal proposal : jstProposals) {
+ String addInfo = proposal.getAdditionalProposalInfo();
+
+ String addInfoValue = html2Text(addInfo);
+ String compareValue = html2Text(ADD_INFOS[i]);
+ assertTrue("Additional Info exists but its value is not expected:\nAdd. Info: [" + addInfoValue + "]\nExpected Value: [" + compareValue + "]", compareValue.equalsIgnoreCase(addInfoValue));
+ }
+ }
+ }
+
+ String html2Text(String html) {
+ StringBuilder sb = new StringBuilder();
+ int state = 0;
+ for (char ch : html.toCharArray()) {
+ switch (state) {
+ case (int)'<':
+ // Read to null until '>'-char is read
+ if (ch != '>')
+ continue;
+ state = 0;
+ break;
+ default:
+ if (ch == '<') {
+ state = '<';
+ continue;
+ }
+ sb.append(ch);
+ break;
+ }
+ }
+ return sb.toString();
+ }
+
+ AutoELContentAssistantProposal[] getJSTProposals(String insertAfter, String insertion, String prefix) {
+ openEditor(PAGE_NAME);
+ try {
+ String documentContent = document.get();
+
+ int insertionStart = (documentContent == null ? -1 : documentContent.indexOf(insertAfter));
+ assertFalse("Required insertion node '" + prefix + "' not found in document", (insertionStart == -1));
+ int offsetToInsert = insertionStart + insertAfter.length();
+
+ documentContent = documentContent.substring(0, offsetToInsert) +
+ insertion + documentContent.substring(offsetToInsert);
+
+ document.set(documentContent);
+ JobUtils.waitForIdle();
+
+ documentContent = document.get();
+ int start = (documentContent == null ? -1 : documentContent.indexOf(prefix));
+ assertFalse("Required node '" + prefix + "' not found in document", (start == -1));
+ int offsetToTest = start + prefix.length();
+
+
+ List<ICompletionProposal> res = CATestUtil.collectProposals(contentAssistant, viewer, offsetToTest);
+
+ assertTrue("Content Assistant returned no proposals", (res != null && res.size() > 0));
+
+ Set<AutoELContentAssistantProposal> jstProposals = new HashSet<AutoELContentAssistantProposal>();
+ for (ICompletionProposal p : res) {
+ if (p instanceof AutoELContentAssistantProposal) {
+ jstProposals.add((AutoELContentAssistantProposal)p);
+ }
+ }
+
+ return jstProposals.toArray(new AutoELContentAssistantProposal[0]);
+ } finally {
+ closeEditor();
+ }
+ }
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/CASeamAddInfoInELMessagesTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 5 months
JBoss Tools SVN: r36350 - in branches: dead and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-11-15 12:53:50 -0500 (Tue, 15 Nov 2011)
New Revision: 36350
Added:
branches/hibernatetools-multiversion2/
Removed:
branches/dead/hibernatetools-multiversion2/
Log:
hibernate multiversion branch moved to branches from branches/dead
14 years, 5 months
JBoss Tools SVN: r36349 - in trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf: ui/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-11-15 12:03:04 -0500 (Tue, 15 Nov 2011)
New Revision: 36349
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfAddInfoInELMessagesTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
Log:
JBIDE-9910 Proposal info for message bundles in code completion for EL
JUnit test for JSF EL Resource Bundle Messages resolver is added
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfAddInfoInELMessagesTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfAddInfoInELMessagesTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfAddInfoInELMessagesTest.java 2011-11-15 17:03:04 UTC (rev 36349)
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.jsp.ca.test;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.jboss.tools.common.base.test.contentassist.CATestUtil;
+import org.jboss.tools.jst.jsp.contentassist.AutoELContentAssistantProposal;
+import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+
+/**
+ * The JUnit test case for JBIDE-9910 issue
+ *
+ * @author Victor V. Rubezhny
+ *
+ */
+public class CAJsfAddInfoInELMessagesTest extends ContentAssistantTestCase {
+ private static final String PROJECT_NAME = "JSF2KickStartWithoutLibs";
+ private static final String PAGE_NAME = "WebContent/pages/inputname.xhtml";
+ private static final String PREFIXES[] = new String[] {"${ms" , "${msgs.pr"};
+ private static final String ADD_INFOS[] = new String[] {
+ "<html><body text=\"#000000\" bgcolor=\"#ffffe1\"><b>Base Name:</b> resources<br><br><b>Resource Bundle:</b> /JSF2KickStartWithoutLibs/JavaSource/resources.properties</body></html>",
+ "<html><body text=\"#ffffff\" bgcolor=\"#000000\"><b>Property:</b> prompt<br><b>Base Name:</b> resources<br><br><b>Resource Bundle:</b> /JSF2KickStartWithoutLibs/JavaSource/resources.properties<br><b>Value:</b> Your Name:</body></html>"
+ };
+
+ public void setUp() throws Exception {
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
+ project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+ }
+
+ public static Test suite() {
+ return new TestSuite(CAForELJavaAndJSTCompareTest.class);
+ }
+
+ public void testCAJsfAddInfoInELMessages () {
+ for (int i = 0; i < PREFIXES.length; i++) {
+ AutoELContentAssistantProposal jstProposals[] = getJSTProposals(PREFIXES[i]);
+ assertFalse ("No EL Proposals found in Web page: " + PAGE_NAME, (jstProposals == null || jstProposals.length == 0));
+ assertEquals ("Content Assist in returned more than 1 proposal for Web page: " + PAGE_NAME +
+ ". Test project and/or data should be verfied/updated.", 1, jstProposals.length);
+
+ for (AutoELContentAssistantProposal proposal : jstProposals) {
+ String addInfo = proposal.getAdditionalProposalInfo();
+
+ String addInfoValue = html2Text(addInfo);
+ String compareValue = html2Text(ADD_INFOS[i]);
+ assertTrue("Additional Info exists but its value is not expected:\nAdd. Info: [" + addInfoValue + "]\nExpected Value: [" + compareValue + "]", compareValue.equalsIgnoreCase(addInfoValue));
+ }
+ }
+ }
+
+ String html2Text(String html) {
+ StringBuilder sb = new StringBuilder();
+ int state = 0;
+ for (char ch : html.toCharArray()) {
+ switch (state) {
+ case (int)'<':
+ // Read to null until '>'-char is read
+ if (ch != '>')
+ continue;
+ state = 0;
+ break;
+ default:
+ if (ch == '<') {
+ state = '<';
+ continue;
+ }
+ sb.append(ch);
+ break;
+ }
+ }
+ return sb.toString();
+ }
+
+ AutoELContentAssistantProposal[] getJSTProposals(String prefix) {
+ openEditor(PAGE_NAME);
+ try {
+ String documentContent = document.get();
+ int start = (documentContent == null ? -1 : documentContent.indexOf(prefix));
+ assertFalse("Required node '" + prefix + "' not found in document", (start == -1));
+ int offsetToTest = start + prefix.length();
+
+ JobUtils.waitForIdle();
+
+ List<ICompletionProposal> res = CATestUtil.collectProposals(contentAssistant, viewer, offsetToTest);
+
+ assertTrue("Content Assistant returned no proposals", (res != null && res.size() > 0));
+
+ Set<AutoELContentAssistantProposal> jstProposals = new HashSet<AutoELContentAssistantProposal>();
+ for (ICompletionProposal p : res) {
+ if (p instanceof AutoELContentAssistantProposal) {
+ jstProposals.add((AutoELContentAssistantProposal)p);
+ }
+ }
+
+ return jstProposals.toArray(new AutoELContentAssistantProposal[0]);
+ } finally {
+ closeEditor();
+ }
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAJsfAddInfoInELMessagesTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-11-15 15:26:55 UTC (rev 36348)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-11-15 17:03:04 UTC (rev 36349)
@@ -26,6 +26,7 @@
import org.jboss.tools.jsf.jsp.ca.test.CAForJSF2BeansInJavaTest;
import org.jboss.tools.jsf.jsp.ca.test.CAForJSF2BeansTest;
import org.jboss.tools.jsf.jsp.ca.test.CAForUnclosedELTest;
+import org.jboss.tools.jsf.jsp.ca.test.CAJsfAddInfoInELMessagesTest;
import org.jboss.tools.jsf.jsp.ca.test.CAJsfMessagesProposalsFilteringTest;
import org.jboss.tools.jsf.jsp.ca.test.CAJsfMessagesProposalsTest;
import org.jboss.tools.jsf.jsp.ca.test.CANotEmptyWhenThereIsNoSpaceBetweenInvertedCommandsInAttributeJBIDE1759Test;
@@ -151,6 +152,11 @@
new String[] { "projects/Jbide3845Test", }, //$NON-NLS-1$
new String[] { "Jbide3845Test" })); //$NON-NLS-1$
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(
+ CAJsfAddInfoInELMessagesTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$
+ new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$
+ new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$
+
// return new TestWizardsProject(suite);
return suite;
}
14 years, 5 months
JBoss Tools SVN: r36347 - in workspace/yradtsevich/browsersim/swt-webkit-browsersim: org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/util and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-11-15 09:24:53 -0500 (Tue, 15 Nov 2011)
New Revision: 36347
Modified:
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/util/BrowserSimLauncher.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/PlatformUtil.java
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java
Log:
https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps
- added detection of used platform
Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java 2011-11-15 13:07:09 UTC (rev 36346)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/BrowserSim.java 2011-11-15 14:24:53 UTC (rev 36347)
@@ -66,6 +66,10 @@
private DevicesManager devicesManager;
public static void main(String[] args) {
+
+
+
+
String initialUrl;
if (args.length > 0) {
String lastArg = args[args.length - 1];
Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/util/BrowserSimLauncher.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/util/BrowserSimLauncher.java 2011-11-15 13:07:09 UTC (rev 36346)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.eclipse/src/org/jboss/tools/browsersim/eclipse/util/BrowserSimLauncher.java 2011-11-15 14:24:53 UTC (rev 36347)
@@ -13,7 +13,6 @@
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
@@ -41,11 +40,7 @@
commandElements.add("-d32");
}
}
- commandElements.add("-Dosgi.os=" + Platform.getOS());
- commandElements.add("-Dosgi.arch=" + Platform.getOSArch());
- if (Platform.getWS() != null) {
- commandElements.add("-Dosgi.ws=" + Platform.getWS());
- }
+
commandElements.add("-cp");
commandElements.add(classPath);
commandElements.add("org.jboss.tools.browsersim.BrowserSim");
Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/PlatformUtil.java
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/PlatformUtil.java 2011-11-15 13:07:09 UTC (rev 36346)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/PlatformUtil.java 2011-11-15 14:24:53 UTC (rev 36347)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.browsersim.webkit;
+import org.eclipse.swt.SWT;
+
/**
* @author "Yahor Radtsevich (yradtsevich)"
*/
@@ -17,13 +19,41 @@
public static final String CURRENT_PLATFORM;
static {
- String ws = System.getProperty("osgi.ws");
- ws = (ws == null) ? "" : ws;
- String os = System.getProperty("osgi.os");
- os = (os == null) ? "" : os;
- String arch = System.getProperty("osgi.arch");
- arch = (arch == null) ? "" : arch;
-
+ String os = getOs();
+ String ws = getWs();
+ String arch = getArch();
+
CURRENT_PLATFORM = ws + '.' + os + ("macosx".equals(os) ? "" : '.' + arch);
}
+
+
+ /*
+ * Copy of org.eclipse.swt.internal.Library.arch()
+ */
+ private static String getArch() {
+ String osArch = System.getProperty("os.arch"); //$NON-NLS-1$
+ if (osArch.equals ("i386") || osArch.equals ("i686")) return "x86"; //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$
+ if (osArch.equals ("amd64")) return "x86_64"; //$NON-NLS-1$ $NON-NLS-2$
+ if (osArch.equals ("IA64N")) return "ia64_32"; //$NON-NLS-1$ $NON-NLS-2$
+ if (osArch.equals ("IA64W")) return "ia64"; //$NON-NLS-1$ $NON-NLS-2$
+ return osArch;
+ }
+
+ /*
+ * Copy of org.eclipse.swt.internal.Library.os()
+ */
+ private static String getOs() {
+ String osName = System.getProperty("os.name"); //$NON-NLS-1$
+ if (osName.equals ("Linux")) return "linux"; //$NON-NLS-1$ $NON-NLS-2$
+ if (osName.equals ("AIX")) return "aix"; //$NON-NLS-1$ $NON-NLS-2$
+ if (osName.equals ("Solaris") || osName.equals ("SunOS")) return "solaris"; //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$
+ if (osName.equals ("HP-UX")) return "hpux"; //$NON-NLS-1$ $NON-NLS-2$
+ if (osName.equals ("Mac OS X")) return "macosx"; //$NON-NLS-1$ $NON-NLS-2$
+ if (osName.startsWith ("Win")) return "win32"; //$NON-NLS-1$ $NON-NLS-2$
+ return osName;
+ }
+
+ private static String getWs() {
+ return SWT.getPlatform();
+ }
}
14 years, 5 months
JBoss Tools SVN: r36346 - trunk/central/plugins/org.jboss.tools.central.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-11-15 08:07:09 -0500 (Tue, 15 Nov 2011)
New Revision: 36346
Modified:
trunk/central/plugins/org.jboss.tools.central/plugin.xml
Log:
JBIDE-9774 : add new archetypes to JBoss central (HTML5, Spring MVC, Richfaces)
Modified: trunk/central/plugins/org.jboss.tools.central/plugin.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/plugin.xml 2011-11-15 12:55:51 UTC (rev 36345)
+++ trunk/central/plugins/org.jboss.tools.central/plugin.xml 2011-11-15 13:07:09 UTC (rev 36346)
@@ -203,7 +203,7 @@
point="org.jboss.tools.central.tutorials">
<category
id="org.jboss.tools.central.javaee6.quickstart"
- name="Java EE 6 Quickstarts"
+ name="Java EE 6 Template Projects"
priority="1" />
<category
id="org.jboss.tools.central.jbossas.quickstart"
@@ -251,7 +251,7 @@
<tutorial
id="org.jboss.tools.central.jbossas.quickstart.jbossJavaee6Webapp"
categoryId="org.jboss.tools.central.javaee6.quickstart"
- name="Java EE 6 Web Application"
+ name="Java EE 6 WAR"
type="projectExample"
priority="1"
icon="icons/jbossas7.png"
@@ -260,13 +260,40 @@
<tutorial
id="org.jboss.tools.central.jbossas.quickstart.jbossJavaee6Ear"
categoryId="org.jboss.tools.central.javaee6.quickstart"
- name="Java EE 6 Enterprise Application"
+ name="Java EE 6 EAR"
type="projectExample"
priority="2"
icon="icons/jbossas7.png"
reference="Java EE 6 Quickstarts::multi-javaee6-archetype"/>
+
+ <tutorial
+ id="org.jboss.tools.central.jbossas.quickstart.jbossJavaee6Poh5"
+ categoryId="org.jboss.tools.central.javaee6.quickstart"
+ name="HTML5 Project"
+ type="projectExample"
+ priority="3"
+ icon="icons/jbossas7.png"
+ reference="Java EE 6 Quickstarts::jboss-javaee6-poh5-archetype"/>
+
+ <tutorial
+ id="org.jboss.tools.central.jbossas.quickstart.jbossJavaee6SpringMvc"
+ categoryId="org.jboss.tools.central.javaee6.quickstart"
+ name="Spring MVC"
+ type="projectExample"
+ priority="4"
+ icon="icons/jbossas7.png"
+ reference="Java EE 6 Quickstarts::spring-mvc-webapp"/>
<tutorial
+ id="org.jboss.tools.central.jbossas.quickstart.jbossJavaee6Richfaces"
+ categoryId="org.jboss.tools.central.javaee6.quickstart"
+ name="Richfaces Project"
+ type="projectExample"
+ priority="5"
+ icon="icons/jbossas7.png"
+ reference="Java EE 6 Quickstarts::richfaces-archetype-simpleapp"/>
+
+ <tutorial
id="org.jboss.tools.central.Seam.registration2"
categoryId="org.jboss.tools.central.seam2"
name="Registration Example"
14 years, 5 months