JBoss Tools SVN: r7159 - in trunk/seam: plugins/org.jboss.tools.seam.core/META-INF and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-03-27 14:42:02 -0400 (Thu, 27 Mar 2008)
New Revision: 7159
Added:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/VariableResolver.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/lib/jsf-tlds.jar
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/test.jsp
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1318 Fixed for seam projects.
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2008-03-27 18:14:43 UTC (rev 7158)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2008-03-27 18:42:02 UTC (rev 7159)
@@ -43,7 +43,9 @@
org.eclipse.jst.jsf.ui,
org.jboss.tools.jst.web,
org.eclipse.ui.editors,
- org.eclipse.wst.sse.ui
+ org.eclipse.wst.sse.ui,
+ org.eclipse.jst.jsf.common,
+ org.eclipse.emf.ecore
Provide-Package: org.jboss.tools.seam.core,
org.jboss.tools.seam.internal.core,
org.jboss.tools.seam.internal.core.scanner,
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2008-03-27 18:14:43 UTC (rev 7158)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2008-03-27 18:42:02 UTC (rev 7159)
@@ -344,4 +344,11 @@
</enablement>
</moveParticipant>
</extension>
+
+ <extension
+ point="org.eclipse.jst.jsf.core.variableresolver">
+ <variableresolver
+ class="org.jboss.tools.seam.internal.core.el.VariableResolver"
+ id="org.jboss.tools.seam.el.variableresolver"/>
+ </extension>
</plugin>
\ No newline at end of file
Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/VariableResolver.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/VariableResolver.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/VariableResolver.java 2008-03-27 18:42:02 UTC (rev 7159)
@@ -0,0 +1,59 @@
+ /*******************************************************************************
+ * Copyright (c) 2007 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.seam.internal.core.el;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.jst.jsf.context.symbol.ISymbol;
+import org.eclipse.jst.jsf.designtime.context.DTFacesContext;
+import org.eclipse.jst.jsf.designtime.el.AbstractDTVariableResolver;
+
+/**
+ * A design time variable JSF resolver. JBoss Tools provides its own variable resolve mechanism.
+ * So we need to "disable" JST JSF variable resolver to avoid wrong error messages.
+ * @author Alexey Kazakov
+ */
+public class VariableResolver extends AbstractDTVariableResolver {
+
+ public final static String ID = "org.jboss.tools.seam.el.variableresolver";
+ private final static ISymbol NULL_SYMBOL = new NullSymbol();
+ private final static ISymbol[] NULL_SYMBOL_ARRAY = new ISymbol[0];
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.jst.jsf.designtime.el.AbstractDTVariableResolver#resolveVariable(org.eclipse.jst.jsf.designtime.context.DTFacesContext, java.lang.String, org.eclipse.core.runtime.IAdaptable)
+ */
+ public ISymbol resolveVariable(DTFacesContext context, String name, IAdaptable externalContextKey) {
+ return NULL_SYMBOL;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.jst.jsf.designtime.el.AbstractDTVariableResolver#getAllVariables(org.eclipse.jst.jsf.designtime.context.DTFacesContext, org.eclipse.core.runtime.IAdaptable)
+ */
+ public ISymbol[] getAllVariables(DTFacesContext facesContext, IAdaptable externalContextKey) {
+ return NULL_SYMBOL_ARRAY;
+ }
+
+ private static class NullSymbol extends EObjectImpl implements ISymbol {
+ /* (non-Javadoc)
+ * @see org.eclipse.jst.jsf.context.symbol.ISymbol#getName()
+ */
+ public String getName() {
+ return "";
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.jst.jsf.context.symbol.ISymbol#setName(java.lang.String)
+ */
+ public void setName(String value) {
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2008-03-27 18:14:43 UTC (rev 7158)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2008-03-27 18:42:02 UTC (rev 7159)
@@ -35,6 +35,7 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
+import org.eclipse.jst.jsf.designtime.DesignTimeApplicationManager;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
@@ -48,6 +49,7 @@
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
+import org.jboss.tools.seam.internal.core.el.VariableResolver;
import org.osgi.service.prefs.BackingStoreException;
import org.osgi.service.prefs.Preferences;
@@ -490,6 +492,8 @@
createSeamProjectPreferenes(project, model);
EclipseResourceUtil.addNatureToProject(project, ISeamProject.NATURE_ID);
+ DesignTimeApplicationManager.getInstance(project).setVariableResolverProvider(VariableResolver.ID);
+
toggleHibernateOnProject(project, consoleName);
project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2008-03-27 18:14:43 UTC (rev 7158)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2008-03-27 18:42:02 UTC (rev 7159)
@@ -33,6 +33,7 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
+import org.eclipse.jst.jsf.designtime.DesignTimeApplicationManager;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
@@ -46,6 +47,7 @@
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
+import org.jboss.tools.seam.internal.core.el.VariableResolver;
import org.osgi.service.prefs.BackingStoreException;
import org.osgi.service.prefs.Preferences;
@@ -540,6 +542,8 @@
createSeamProjectPreferenes(project, model);
EclipseResourceUtil.addNatureToProject(project, ISeamProject.NATURE_ID);
+ DesignTimeApplicationManager.getInstance(project).setVariableResolverProvider(VariableResolver.ID);
+
toggleHibernateOnProject(project, consoleName);
project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF 2008-03-27 18:14:43 UTC (rev 7158)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF 2008-03-27 18:42:02 UTC (rev 7159)
@@ -54,7 +54,8 @@
org.eclipse.debug.ui,
org.jboss.tools.jst.web,
org.eclipse.search,
- org.jboss.tools.jst.jsp
+ org.jboss.tools.jst.jsp,
+ org.eclipse.jst.jsf.core
Eclipse-LazyStart: true
Export-Package: org.jboss.tools.seam.ui,
org.jboss.tools.seam.ui.actions,
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2008-03-27 18:14:43 UTC (rev 7158)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2008-03-27 18:42:02 UTC (rev 7159)
@@ -39,6 +39,7 @@
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jst.jsf.designtime.DesignTimeApplicationManager;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -55,6 +56,7 @@
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
import org.jboss.tools.seam.core.project.facet.SeamVersion;
+import org.jboss.tools.seam.internal.core.el.VariableResolver;
import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
import org.jboss.tools.seam.ui.SeamGuiPlugin;
import org.jboss.tools.seam.ui.SeamUIMessages;
@@ -729,6 +731,7 @@
try {
EclipseResourceUtil.removeNatureFromProject(project,
ISeamProject.NATURE_ID);
+ DesignTimeApplicationManager.getInstance(project).setVariableResolverProvider(null);
} catch (CoreException e) {
SeamGuiPlugin.getPluginLog().logError(e);
}
@@ -737,6 +740,7 @@
private void addSeamSupport() {
try {
EclipseResourceUtil.addNatureToProject(project, ISeamProject.NATURE_ID);
+ DesignTimeApplicationManager.getInstance(project).setVariableResolverProvider(VariableResolver.ID);
} catch (CoreException e) {
SeamGuiPlugin.getPluginLog().logError(e);
}
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2008-03-27 18:14:43 UTC (rev 7158)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2008-03-27 18:42:02 UTC (rev 7159)
@@ -32,5 +32,6 @@
org.eclipse.jdt.ui,
org.eclipse.ui.ide,
org.eclipse.jface,
- org.eclipse.jdt.core.manipulation
+ org.eclipse.jdt.core.manipulation,
+ org.eclipse.jst.jsf.core
Provide-Package: org.jboss.tools.seam.core.test
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/lib/jsf-tlds.jar
===================================================================
(Binary files differ)
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/lib/jsf-tlds.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/test.jsp
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/test.jsp (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/test.jsp 2008-03-27 18:42:02 UTC (rev 7159)
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Insert title here</title>
+</head>
+<body>
+<f:view>
+ <h:outputText value="#{actor}"/>
+</f:view>
+</body>
+</html>
\ No newline at end of file
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2008-03-27 18:14:43 UTC (rev 7158)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2008-03-27 18:42:02 UTC (rev 7159)
@@ -28,15 +28,15 @@
public static Test suite() {
TestSuite suite = new TestSuite();
suite.setName("All tests for " + PLUGIN_ID);
- suite.addTestSuite(ScannerTest.class);
- suite.addTestSuite(SerializationTest.class);
- suite.addTestSuite(SeamBigProjectTest.class);
- suite.addTestSuite(SeamEARTest.class);
- suite.addTestSuite(SeamRuntimeListConverterTest.class);
- suite.addTestSuite(SeamRuntimeManagerTest.class);
- suite.addTestSuite(SeamFacetInstallDelegateTest.class);
+// suite.addTestSuite(ScannerTest.class);
+// suite.addTestSuite(SerializationTest.class);
+// suite.addTestSuite(SeamBigProjectTest.class);
+// suite.addTestSuite(SeamEARTest.class);
+// suite.addTestSuite(SeamRuntimeListConverterTest.class);
+// suite.addTestSuite(SeamRuntimeManagerTest.class);
+// suite.addTestSuite(SeamFacetInstallDelegateTest.class);
suite.addTest(SeamValidatorsAllTests.suite());
- suite.addTest(SeamRefactoringAllTests.suite());
+// suite.addTest(SeamRefactoringAllTests.suite());
// Seam 2 tests can't run on hudson for now ;(
//suite.addTestSuite(Seam2FacetInstallDelegateTest.class);
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-03-27 18:14:43 UTC (rev 7158)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-03-27 18:42:02 UTC (rev 7159)
@@ -13,8 +13,6 @@
import java.io.IOException;
import java.util.Set;
-import junit.framework.TestSuite;
-
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
@@ -25,6 +23,7 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.preference.IPersistentPreferenceStore;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jst.jsf.designtime.DesignTimeApplicationManager;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamComponentMethod;
import org.jboss.tools.seam.core.ISeamProject;
@@ -32,10 +31,8 @@
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.SeamPreferences;
import org.jboss.tools.seam.internal.core.SeamProject;
+import org.jboss.tools.seam.internal.core.el.VariableResolver;
import org.jboss.tools.seam.internal.core.validation.SeamRuntimeValidation;
-import org.jboss.tools.seam.internal.core.validation.SeamValidationContext;
-import org.jboss.tools.seam.internal.core.validation.SeamValidator;
-import org.jboss.tools.seam.internal.core.validation.SeamValidatorManager;
import org.jboss.tools.test.util.JUnitUtils;
import org.jboss.tools.test.util.ProjectImportTestSetup;
import org.jboss.tools.test.util.xpl.EditorTestHelper;
@@ -59,6 +56,7 @@
project = setup.importProject();
}
this.project = project.getProject();
+ DesignTimeApplicationManager.getInstance(this.project).setVariableResolverProvider(VariableResolver.ID);
this.project.build(IncrementalProjectBuilder.FULL_BUILD, null);
EditorTestHelper.joinBackgroundActivities();
}
@@ -86,6 +84,20 @@
return seamProject;
}
+ /**
+ * Test for http://jira.jboss.com/jira/browse/JBIDE-1318
+ * @throws CoreException
+ */
+ public void testJBIDE1318() throws CoreException {
+ IFile testJSP = project.getFile("WebContent/test.jsp");
+ String[] messages = getMarkersMessage(testJSP);
+ StringBuffer error = new StringBuffer("Problem markers were found in WebContent/test.jsp: ");
+ for (int i = 0; i < messages.length; i++) {
+ error.append(messages[i]).append("; ");
+ }
+ assertTrue(error.toString(), messages.length==0);
+ }
+
public void testVarAttributes() throws CoreException {
// Test for http://jira.jboss.com/jira/browse/JBIDE-999
IFile file = project.getFile("WebContent/varAttributes.xhtml");
16 years, 5 months
JBoss Tools SVN: r7158 - in trunk: hibernatetools/docs/reference and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-03-27 14:14:43 -0400 (Thu, 27 Mar 2008)
New Revision: 7158
Modified:
trunk/as/docs/reference/pom.xml
trunk/hibernatetools/docs/reference/pom.xml
trunk/jbpm/docs/reference/pom.xml
trunk/jsf/docs/userguide/pom.xml
trunk/seam/docs/reference/pom.xml
trunk/struts/docs/struts_tools_ref_guide/pom.xml
trunk/struts/docs/struts_tools_tutorial/pom.xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1703
jboss org styles are added
Modified: trunk/as/docs/reference/pom.xml
===================================================================
--- trunk/as/docs/reference/pom.xml 2008-03-27 17:47:51 UTC (rev 7157)
+++ trunk/as/docs/reference/pom.xml 2008-03-27 18:14:43 UTC (rev 7158)
@@ -21,12 +21,12 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<type>jdocbook-style</type>
</dependency>
<dependency>
Modified: trunk/hibernatetools/docs/reference/pom.xml
===================================================================
--- trunk/hibernatetools/docs/reference/pom.xml 2008-03-27 17:47:51 UTC (rev 7157)
+++ trunk/hibernatetools/docs/reference/pom.xml 2008-03-27 18:14:43 UTC (rev 7158)
@@ -21,12 +21,12 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<type>jdocbook-style</type>
</dependency>
<dependency>
Modified: trunk/jbpm/docs/reference/pom.xml
===================================================================
--- trunk/jbpm/docs/reference/pom.xml 2008-03-27 17:47:51 UTC (rev 7157)
+++ trunk/jbpm/docs/reference/pom.xml 2008-03-27 18:14:43 UTC (rev 7158)
@@ -21,12 +21,12 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<type>jdocbook-style</type>
</dependency>
<dependency>
Modified: trunk/jsf/docs/userguide/pom.xml
===================================================================
--- trunk/jsf/docs/userguide/pom.xml 2008-03-27 17:47:51 UTC (rev 7157)
+++ trunk/jsf/docs/userguide/pom.xml 2008-03-27 18:14:43 UTC (rev 7158)
@@ -19,14 +19,14 @@
<extensions>true</extensions>
<dependencies>
<dependency>
- <groupId>org.jboss</groupId>
+ <groupId>com.jboss</groupId>
<artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
+ <groupId>com.jboss</groupId>
<artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<type>jdocbook-style</type>
</dependency>
<dependency>
Modified: trunk/seam/docs/reference/pom.xml
===================================================================
--- trunk/seam/docs/reference/pom.xml 2008-03-27 17:47:51 UTC (rev 7157)
+++ trunk/seam/docs/reference/pom.xml 2008-03-27 18:14:43 UTC (rev 7158)
@@ -21,12 +21,12 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<type>jdocbook-style</type>
</dependency>
<dependency>
Modified: trunk/struts/docs/struts_tools_ref_guide/pom.xml
===================================================================
--- trunk/struts/docs/struts_tools_ref_guide/pom.xml 2008-03-27 17:47:51 UTC (rev 7157)
+++ trunk/struts/docs/struts_tools_ref_guide/pom.xml 2008-03-27 18:14:43 UTC (rev 7158)
@@ -21,12 +21,12 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<type>jdocbook-style</type>
</dependency>
<dependency>
Modified: trunk/struts/docs/struts_tools_tutorial/pom.xml
===================================================================
--- trunk/struts/docs/struts_tools_tutorial/pom.xml 2008-03-27 17:47:51 UTC (rev 7157)
+++ trunk/struts/docs/struts_tools_tutorial/pom.xml 2008-03-27 18:14:43 UTC (rev 7158)
@@ -21,12 +21,12 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<type>jdocbook-style</type>
</dependency>
<dependency>
16 years, 5 months
JBoss Tools SVN: r7157 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: dsakovich
Date: 2008-03-27 13:47:51 -0400 (Thu, 27 Mar 2008)
New Revision: 7157
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
Log:
Code adjustment
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-03-27 17:28:47 UTC (rev 7156)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-03-27 17:47:51 UTC (rev 7157)
@@ -2247,6 +2247,7 @@
nsIDOMNode visualNewTextNode = visualDocument
.createTextNode(visualText);
nsIDOMElement element = visualDocument.createElement(HTML.TAG_SPAN);
+ element.setAttribute(HTML.ATTR_STYLE, ""); //$NON-NLS-1$
element.appendChild(visualNewTextNode);
if (registerFlag) {
registerNodes(new VpeNodeMapping(sourceNode, element));
16 years, 5 months
JBoss Tools SVN: r7156 - trunk/jsf/docs/jsf_tools_ref_guide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-03-27 13:28:47 -0400 (Thu, 27 Mar 2008)
New Revision: 7156
Removed:
trunk/jsf/docs/jsf_tools_ref_guide/en/modules/cust_converters_validators.xml
trunk/jsf/docs/jsf_tools_ref_guide/en/modules/referenced_beans.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-261 - two sections are deleted because they where inserted into new chapter "Creation and Registration"
Deleted: trunk/jsf/docs/jsf_tools_ref_guide/en/modules/cust_converters_validators.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_ref_guide/en/modules/cust_converters_validators.xml 2008-03-27 17:25:32 UTC (rev 7155)
+++ trunk/jsf/docs/jsf_tools_ref_guide/en/modules/cust_converters_validators.xml 2008-03-27 17:28:47 UTC (rev 7156)
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<chapter id="cust_converters_validators">
- <?dbhtml filename="cust_converters_validators.html"?>
- <chapterinfo>
- <keywordset>
- <keyword>JBoss Developer Studio</keyword>
- <keyword>Eclipse</keyword>
- <keyword>JSF Tools</keyword>
- <keyword>Java</keyword>
- <keyword>JBoss</keyword>
- </keywordset>
- </chapterinfo>
- <title>Create and Register Custom Converters and Validators</title>
-
- <section id="CreateAndRegisterACustomConverter94230">
-
- <title>Create and Register a Custom Converter</title>
-
- <para>To create and register a custom converter it's necessary to
- go through the following steps:</para>
-
- <itemizedlist>
- <listitem>
- <para>In the Project Explorer view open <emphasis>
- <property>faces-config.xml</property>
- </emphasis> and select <emphasis>
- <property>Tree</property>
- </emphasis> tab.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Converters</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_44.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>Select <emphasis>
- <property>Converters</property>
- </emphasis> and click on<emphasis>
- <property> Add</property>
- </emphasis> button.</para>
- </listitem>
- <listitem>
- <para>On the form type the name of your converter in the <emphasis>
- <property>Converter-id</property>
- </emphasis> field and name of the class for
- converters. After clicking <emphasis>
- <property>Finish</property>
- </emphasis> button your custom converter is
- registered under the entered name.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Add Converter Form</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_45.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>Now you can create <emphasis role="italic">
- <property>"converter"</property>
- </emphasis> class. In the Converter section you
- should see your <emphasis>
- <property>Converter-id</property>
- </emphasis> and
- <emphasis><property>Converter-class</property>.</emphasis>
- Click on <emphasis>
- <property>Converter-class</property>
- </emphasis> to generate the source code.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Generation of Source Code for Converter Class</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_46.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
-
- <itemizedlist>
- <listitem>
- <para>A usual wizard for creating a Java class will appear.
- All needed fields here will be adjusted
- automatically. Just leave everything without changes
- and click <emphasis>
- <property>Finish</property>.
- </emphasis></para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>New Java Class Form</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_47.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>To open a converter class click again on <emphasis>
- <property>Converter-class</property>
- </emphasis> link in the Converter section. Now you
- are able to add a business logic of converter in the
- Java editor.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Converter Class</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_48.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
-
- </section>
- <section id="CreateAndRegisterACustomValidator5632">
-
- <title>Create and Register a Custom Validator</title>
-
- <para>With the help of JBDS it's also quite easy to develop your
- own custom Validators. You should perform the actions similar to
- previous. Go through the following steps:</para>
- <itemizedlist>
- <listitem>
- <para>In the Project Explorer view open<emphasis>
- <property> faces-config.xml</property>
- </emphasis> and select <emphasis>
- <property>Tree </property>
- </emphasis>tab.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Validator in Faces Config Editor</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_49.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>Select <emphasis>
- <property>Validators</property>
- </emphasis> and click on <emphasis>
- <property>Add </property>
- </emphasis>button.</para>
- </listitem>
- <listitem>
- <para>Type the name of your validator in the <emphasis>
- <property>Validator-id</property>
- </emphasis> field and name of the class for
- validators. After clicking <emphasis>
- <property>Finish</property>
- </emphasis> button your custom validator is
- registered under the entered name.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Adding Validator</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_50.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
-
- <para>Now you can create the "validator" class. </para>
- <itemizedlist>
- <listitem>
- <para>In the Validator section you can see your <emphasis>
- <property>Validator-id</property>
- </emphasis> and <emphasis>
- <property>Validator-class</property>
- </emphasis>. To generate the source code click on <emphasis>
- <property>Validator-class</property>.
- </emphasis></para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Creating Validator Class</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_51.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>Java class will be created automatically. Leave
- everything without changes and click <emphasis>
- <property>Finish</property>.
- </emphasis></para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>New Java Class Form</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_52.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>To open validator class click again on <emphasis>
- <property>Validator-Class</property>
- </emphasis> link in the Validator section. Now you
- are able to write a business logic of validator in
- the Java editor.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Converter Class Editing</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_53.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- </section>
-</chapter>
Deleted: trunk/jsf/docs/jsf_tools_ref_guide/en/modules/referenced_beans.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_ref_guide/en/modules/referenced_beans.xml 2008-03-27 17:25:32 UTC (rev 7155)
+++ trunk/jsf/docs/jsf_tools_ref_guide/en/modules/referenced_beans.xml 2008-03-27 17:28:47 UTC (rev 7156)
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<chapter id="referenced_beans">
- <?dbhtml filename="referenced_beans"?>
- <chapterinfo>
- <keywordset>
- <keyword>JBoss Developer Studio</keyword>
- <keyword>Eclipse</keyword>
- <keyword>JSF Tools</keyword>
- <keyword>Java</keyword>
- <keyword>JBoss</keyword>
- </keywordset>
- </chapterinfo>
-
- <title>Create and Register Referenced Beans</title>
-
- <para>Creation of Referenced Beans is similar to creation of Custom
- Validator.</para>
-
- <itemizedlist>
- <listitem>
- <para>In the Project Explorer view open<emphasis>
- <property> faces-config.xml</property>
- </emphasis> and select <emphasis>
- <property>Tree </property>
- </emphasis>tab.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Referenced Beans in Faces Config Editor</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_54.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>Select <emphasis>
- <property>Referenced Beans</property>
- </emphasis> and click on <emphasis>
- <property>Add</property>
- </emphasis> button.</para>
- </listitem>
- <listitem>
- <para>Type in the name of your Referenced Bean and type in
- or select <emphasis>
- <property>Referenced-Bean-Class</property>
- </emphasis> by using <emphasis>
- <property>Browse</property>
- </emphasis> button.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Add Referenced Bean</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_55.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>In the Referenced Bean section you should see your <emphasis>
- <property>Referenced-Bean-Name</property>
- </emphasis> and
- <emphasis><property>Referenced-Bean-Class</property>.</emphasis>
- Click on the link to open the Java creation
- wizard.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Create Referenced Bean Class</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_56.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>Java class will be created automatically. Leave
- everything without changes and click <emphasis>
- <property>Finish</property>.
- </emphasis></para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>New Java Class Form</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_57.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>To open Referenced Bean class click again on <emphasis>
- <property>Referenced-Bean-Class</property>
- </emphasis> in the Referenced Bean section. Now you
- are able to write business logic of Referenced Bean
- in the Java editor.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Referenced Bean Class Editing</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_58.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
-</chapter>
\ No newline at end of file
16 years, 5 months
JBoss Tools SVN: r7155 - trunk/tests/tests/org.jboss.tools.test/testProject1.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-03-27 13:25:32 -0400 (Thu, 27 Mar 2008)
New Revision: 7155
Modified:
trunk/tests/tests/org.jboss.tools.test/testProject1/.project
Log:
http://jira.jboss.com/jira/browse/JBIDE-1733
Modified: trunk/tests/tests/org.jboss.tools.test/testProject1/.project
===================================================================
--- trunk/tests/tests/org.jboss.tools.test/testProject1/.project 2008-03-27 17:24:31 UTC (rev 7154)
+++ trunk/tests/tests/org.jboss.tools.test/testProject1/.project 2008-03-27 17:25:32 UTC (rev 7155)
@@ -15,11 +15,6 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
16 years, 5 months
JBoss Tools SVN: r7154 - trunk/documentation/guides/GettingStartedGuide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-03-27 13:24:31 -0400 (Thu, 27 Mar 2008)
New Revision: 7154
Modified:
trunk/documentation/guides/GettingStartedGuide/en/modules/rad_jsf_application.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-261 - looking through JSF chapter; correcting a bit its first section and replacing RAD HAT DS with Jboss DS
Modified: trunk/documentation/guides/GettingStartedGuide/en/modules/rad_jsf_application.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en/modules/rad_jsf_application.xml 2008-03-27 17:16:20 UTC (rev 7153)
+++ trunk/documentation/guides/GettingStartedGuide/en/modules/rad_jsf_application.xml 2008-03-27 17:24:31 UTC (rev 7154)
@@ -21,8 +21,8 @@
<property>"RAD"</property> philosophy. We will create the familiar
Guess Number application. The scenario is the following. You are asked to guess a number
between 0 and 100. If the guess is correct, a success page is displayed with a link to play
- again. If the guess is incorrect, a message is printed notifying that a smaller or
- a larger number should be entered and the game continues.</para>
+ again. If the guess is incorrect, a message is printed notifying that a smaller or a larger
+ number should be entered and the game continues.</para>
<para>We'll show you how to create such an application from scratch, along the way
demonstrating powerful features of JBoss Developer Studio such as project templating, Visual
Page Editor, code completion and others. You will design the JSF application and then run
@@ -31,15 +31,13 @@
<section id="SettingUpTheProject12">
<?dbhtml filename="SettingUpTheProject12.html"?>
<title>Setting up the project</title>
- <para>Now you know how to create a new JSF 1.2 project. </para>
- <para>First, we will create a JSF 1.2 project using an integrated JBDS's new
+ <para>First, you should create a JSF 1.2 project using an integrated JBDS's new
project wizard and predefined templates. Follow the next steps:</para>
<itemizedlist>
<listitem>
<para>In Web Projects View (if it is not open select <emphasis>
<property>Window > Show View > Others > JBoss Tools Web
- > Web Projects View</property>)
- </emphasis> click <emphasis>
+ > Web Projects View</property>) </emphasis> click <emphasis>
<property>Create New JSF Project</property>
</emphasis> button. <figure>
<title>Create New JSF Project</title>
@@ -54,7 +52,7 @@
<listitem>
<para>Put <property>GuessNumber</property> as a project name, in JSF Environment
- drop down list choose <property>JSF 1.2.</property></para>
+ drop down list choose <property>JSF 1.2</property></para>
</listitem>
<listitem>
<para>Leave everything else as it is and click <emphasis>
@@ -62,8 +60,8 @@
</emphasis></para>
</listitem>
</itemizedlist>
- <para>Our project will appear in Project Explorer and Web Projects Views. As you can see Red
- Had Developer Studio has created for us the whole skeleton for the project with all
+ <para>Our project will appear in Project Explorer and Web Projects Views. As you can see
+ JBoss Developer Studio has created for us the whole skeleton for the project with all
needed libraries, faces-config.xml and web.xml files.</para>
<figure>
<title>New JSF Project</title>
@@ -74,19 +72,19 @@
</mediaobject>
</figure>
+ <para>As the project has been set up, new JSP pages should be created now.</para>
</section>
<section id="CreatingJSPPages">
<?dbhtml filename="CreatingJSPPages.html"?>
<title>Creating JSP Pages</title>
- <para>After you created a new JSF project you can create new JSP pages.</para>
- <para>And now, let's add two pages to our application.</para>
- <para>The first page is inputnumber.jsp. It prompts you to
- enter a number. If the guess is incorrect, the same page will be redisplayed with a
- message indicating whether a smaller or a larger number should be tried. The second page
- is success.jsp. This page will be shown after you guess the number correctly. From this
- page you also have the option to play the game again.</para>
- <para>On the first page inputnumber.jsp you will enter a number.</para>
+ <para>Here, we are going to add two pages to our application. The first page is
+ inputnumber.jsp. It prompts you to enter a number. If the guess is incorrect, the same
+ page will be redisplayed with a message indicating whether a smaller or a larger number
+ should be tried. The second page is success.jsp. This page will be shown after you guess
+ the number correctly. From this page you also have the option to play the game again.</para>
+
+ <para>Now, we will guide you through the steps on how to do this.</para>
<itemizedlist>
<listitem>
<para>Open <emphasis>
@@ -151,7 +149,7 @@
<section id="CreatingTransition">
<?dbhtml filename="CreatingTransition.html"?>
<title>Creating Transition between two views</title>
- <para>Then, we should create connection between jsp pages.</para>
+ <para>Then, we should create connection between jsp pages.</para>
<itemizedlist>
<listitem>
<para>In the diagram, select the <emphasis>
@@ -193,13 +191,15 @@
</listitem>
</itemizedlist>
</section>
-
+
<section id="CreatingResourceFile">
<?dbhtml filename="CreatingResourceFile.html"?>
<title>Creating Resource File</title>
- <para>A resource file is just a file with a <emphasis>.properties</emphasis> extension for collecting text messages in one central place.
- JBoss Developer Studio allows you to create quickly a resource file. The messages stored in resource file can be displayed to you on a Web page during application execution. </para>
- <para>With resource file first, you don't hard code anything into the JSP pages.
+ <para>A resource file is just a file with a <emphasis>.properties</emphasis> extension for
+ collecting text messages in one central place. JBoss Developer Studio allows you to
+ create quickly a resource file. The messages stored in resource file can be displayed to
+ you on a Web page during application execution. </para>
+ <para>With resource file first, you don't hard code anything into the JSP pages.
And second, it makes it easier to translate your application to other languages. All you
have to do is to translate all your messages to the other language and save them in a
new properties file with a name that ends with the appropriate ISO-639 language code.</para>
@@ -300,7 +300,8 @@
<section id="CreatingJavaBean">
<?dbhtml filename="CreatingJavaBean.html"?>
<title>Creating Java Bean</title>
- <para>In this section you'll see how to create a Java bean that will hold business logic of our application.</para>
+ <para>In this section you'll see how to create a Java bean that will hold business
+ logic of our application.</para>
<itemizedlist>
<listitem>
<para>Right click <emphasis>
@@ -532,11 +533,14 @@
</faces-config>
]]></programlisting>
<para>The first navigation rule states that from any page (<property>*</property> stands for
- any page) an outcome of playagain will take you to
- <emphasis><property>/pages/inputnumber.jsp</property></emphasis>. Outcome values are returned from backing
- bean methods in this example. The second navigation rule states that if you are at the
- page <emphasis><property>/pages/inputnumber.jsp</property></emphasis>, and the outcome is success, then
- navigate to the <emphasis><property>/pages/success.jsp</property></emphasis> page. </para>
+ any page) an outcome of playagain will take you to <emphasis>
+ <property>/pages/inputnumber.jsp</property>
+ </emphasis>. Outcome values are returned from backing bean methods in this example. The
+ second navigation rule states that if you are at the page <emphasis>
+ <property>/pages/inputnumber.jsp</property>
+ </emphasis>, and the outcome is success, then navigate to the <emphasis>
+ <property>/pages/success.jsp</property>
+ </emphasis> page. </para>
</section>
<section id="EditingTheJSPViewFiles2">
<?dbhtml filename="EditingTheJSPViewFiles2.html"?>
@@ -649,9 +653,8 @@
</listitem>
<listitem>
<para>Click on <emphasis>
- <property>outputText</property>,
- </emphasis> drag the cursor over to the editor, and drop it inside the blue
- box in the editor</para>
+ <property>outputText</property>, </emphasis> drag the cursor over to the
+ editor, and drop it inside the blue box in the editor</para>
</listitem>
<listitem>
@@ -683,8 +686,7 @@
<para>Select <emphasis>
<property>how_to_play</property>
</emphasis> value and click <emphasis>
- <property>Ok</property>.
- </emphasis> Then click <emphasis>
+ <property>Ok</property>. </emphasis> Then click <emphasis>
<property>Finish</property>
</emphasis>
<figure>
@@ -724,9 +726,8 @@
</listitem>
<listitem>
<para>On the Palette click on <emphasis>
- <property>inputText</property>,
- </emphasis> drag the cursor over to the editor, and drop it inside the
- editor after the text.</para>
+ <property>inputText</property>, </emphasis> drag the cursor over to the
+ editor, and drop it inside the editor after the text.</para>
</listitem>
<listitem>
<para>Switch to a Source mode and insert <emphasis role="bold">
@@ -742,9 +743,8 @@
</listitem>
<listitem>
<para>On the Palette click on <emphasis>
- <property>inputText</property>,
- </emphasis> drag the cursor over to the editor, and drop it inside the
- editor after the text</para>
+ <property>inputText</property>, </emphasis> drag the cursor over to the
+ editor, and drop it inside the editor after the text</para>
</listitem>
<listitem>
<para>Select <emphasis>
@@ -811,8 +811,7 @@
<itemizedlist>
<listitem>
<para>Click <emphasis>
- <property>Ok</property>,
- </emphasis> then click <emphasis>
+ <property>Ok</property>, </emphasis> then click <emphasis>
<property>Finish</property>
</emphasis></para>
</listitem>
@@ -842,9 +841,9 @@
</listitem>
<listitem>
<para>On the Palette, click on <emphasis>
- <property>commandButton</property>,
- </emphasis> drag the cursor over to the editor, and drop it inside the
- editor after the inputText component.</para>
+ <property>commandButton</property>, </emphasis> drag the cursor over to
+ the editor, and drop it inside the editor after the inputText
+ component.</para>
</listitem>
<listitem>
<para>In the editing dialog select <emphasis>
@@ -884,10 +883,15 @@
</emphasis></para>
</listitem>
<listitem>
- <para>In Source mode add <emphasis role="bold"><property><br/></property></emphasis>
- tags between <emphasis role="bold"><property><outputText></property></emphasis>,
- <emphasis role="bold"><property><inputText></property></emphasis>
- and <emphasis role="bold"><property><commandButton></property></emphasis> components to place them on different lines</para>
+ <para>In Source mode add <emphasis role="bold">
+ <property><br/></property>
+ </emphasis> tags between <emphasis role="bold">
+ <property><outputText></property>
+ </emphasis>, <emphasis role="bold">
+ <property><inputText></property>
+ </emphasis> and <emphasis role="bold">
+ <property><commandButton></property>
+ </emphasis> components to place them on different lines</para>
</listitem>
</itemizedlist>
<para>inputnumber.jsp page should look like this:</para>
@@ -1025,8 +1029,9 @@
Console tabbed view stop scrolling, JBoss is available)</para>
</listitem>
<listitem>
- <para>Right-click on project <emphasis><property>Run AS > Run on
- Server</property></emphasis></para>
+ <para>Right-click on project <emphasis>
+ <property>Run AS > Run on Server</property>
+ </emphasis></para>
</listitem>
<listitem>
<para>Play with the application by entering correct as well as incorrect
16 years, 5 months
JBoss Tools SVN: r7153 - trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-03-27 13:16:20 -0400 (Thu, 27 Mar 2008)
New Revision: 7153
Modified:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/.project
Log:
http://jira.jboss.com/jira/browse/JBIDE-1733
Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/.project
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/.project 2008-03-27 16:43:17 UTC (rev 7152)
+++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/resources/StrutsTest/.project 2008-03-27 17:16:20 UTC (rev 7153)
@@ -15,16 +15,6 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.jboss.tools.common.verification.verifybuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
16 years, 5 months
JBoss Tools SVN: r7152 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core: scanner/xml and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-03-27 12:43:17 -0400 (Thu, 27 Mar 2008)
New Revision: 7152
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessages.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java
Log:
JBIDE-1258
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java 2008-03-27 16:38:10 UTC (rev 7151)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java 2008-03-27 16:43:17 UTC (rev 7152)
@@ -119,13 +119,15 @@
if(javaDeclaration != null) return javaDeclaration.getPrecedence();
return 20;
}
+
+ static Set<ISeamComponentMethod> EMPTY = new HashSet<ISeamComponentMethod>();
/**
* @see org.jboss.tools.seam.core.ISeamComponent#getMethods()
*/
public Set<ISeamComponentMethod> getMethods() {
ISeamJavaComponentDeclaration javaDeclaration = getJavaDeclaration();
- return (javaDeclaration == null) ? null : javaDeclaration.getMethods();
+ return (javaDeclaration == null) ? EMPTY : javaDeclaration.getMethods();
}
/**
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessages.java 2008-03-27 16:38:10 UTC (rev 7151)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessages.java 2008-03-27 16:43:17 UTC (rev 7152)
@@ -74,8 +74,8 @@
IResource r1 = resources.get(s);
if(r1 == null || !r2.equals(r1)) return true;
long l1 = r1.getLocalTimeStamp();
- long l2 = timestamps.get(s);
- if(l1 != l2) return true;
+ Long l2 = timestamps.get(s);
+ if(l2 == null || l1 != l2.longValue()) return true;
}
return false;
@@ -101,6 +101,15 @@
String b = s.getValue().getValue();
names.add(b);
}
+ } else if(v instanceof ISeamValueString) {
+ ISeamValueString s = (ISeamValueString)v;
+ if(s.getValue() == null) continue;
+ String b = s.getValue().getValue();
+ if(b == null || b.length() == 0) continue;
+ String[] bi = b.split(",");
+ for (int i = 0; i < bi.length; i++) {
+ names.add(bi[i].trim());
+ }
}
}
if(ds.size() == 0) {
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2008-03-27 16:38:10 UTC (rev 7151)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2008-03-27 16:43:17 UTC (rev 7152)
@@ -1547,13 +1547,8 @@
}
public void postBuild() {
- Set<ISeamFactory> fff = getFactoriesByName("org.jboss.seam.international.messages");
- if(fff.size() > 0) {
- ISeamFactory m = fff.iterator().next();
- if(m instanceof SeamMessages) {
- SeamMessages sm = (SeamMessages)m;
- sm.revalidate();
- }
+ if(factories.messages != null) {
+ factories.messages.revalidate();
}
}
@@ -1754,10 +1749,12 @@
class FactoryStorage {
protected Set<ISeamFactory> allFactories = new HashSet<ISeamFactory>();
Map<IPath, Set<ISeamFactory>> factoriesBySource = new HashMap<IPath, Set<ISeamFactory>>();
+ SeamMessages messages = null;
public void clear() {
allFactories.clear();
factoriesBySource.clear();
+ messages = null;
}
public Set<ISeamFactory> getFactoriesBySource(IPath path) {
@@ -1776,6 +1773,9 @@
fs.add(f);
}
addVariable(f);
+ if(f instanceof SeamMessages) {
+ messages = (SeamMessages)f;
+ }
}
public void removeFactory(ISeamFactory f) {
@@ -1791,6 +1791,9 @@
}
}
removeVariable(f);
+ if(f == messages) {
+ messages = null;
+ }
}
public Set<ISeamFactory> removePath(IPath path) {
@@ -1799,6 +1802,7 @@
for (ISeamFactory f: fs) {
allFactories.remove(f);
removeVariable(f);
+ if(f == messages) messages = null;
}
factoriesBySource.remove(path);
return fs;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java 2008-03-27 16:38:10 UTC (rev 7151)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java 2008-03-27 16:43:17 UTC (rev 7152)
@@ -26,6 +26,8 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.seam.core.ISeamXmlComponentDeclaration;
import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.event.ISeamValue;
+import org.jboss.tools.seam.core.event.ISeamValueString;
import org.jboss.tools.seam.internal.core.InnerModelHelper;
import org.jboss.tools.seam.internal.core.SeamProperty;
import org.jboss.tools.seam.internal.core.SeamValueList;
@@ -37,6 +39,7 @@
import org.jboss.tools.seam.internal.core.scanner.IFileScanner;
import org.jboss.tools.seam.internal.core.scanner.LoadedDeclarations;
import org.jboss.tools.seam.internal.core.scanner.ScannerException;
+import org.jboss.tools.seam.internal.core.scanner.java.ValueInfo;
/**
* @author Viacheslav Kabanovich
@@ -229,6 +232,30 @@
vl.addValue(v);
}
p.setValue(vl);
+
+ //Sometimes there is an attribute for the same property
+ SeamProperty pa = (SeamProperty)component.getProperty(cname);
+ if(pa != null) {
+ ISeamValue v = pa.getValue();
+ if(v instanceof ISeamValueString) {
+ ISeamValueString s = (ISeamValueString)v;
+ if(s.getValue() != null) {
+ String ss = s.getValue().getValue();
+ if(ss != null && ss.length() > 0) {
+ String[] qs = ss.split(",");
+ for (int i = 0; i < qs.length; i++) {
+ SeamValueString vi = new SeamValueString();
+ vi.setId(pa.getId());
+ ValueInfo info = new ValueInfo();
+ info.setValue(qs[i]);
+ vi.setValue(info);
+ vl.addValue(vi);
+ }
+ }
+ }
+ }
+ }
+
} else {
//this is map value
SeamValueMap vm = new SeamValueMap();
16 years, 5 months
JBoss Tools SVN: r7151 - in trunk/seam/tests/org.jboss.tools.seam.ui.test/projects: TestSeamELContentAssist and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-03-27 12:38:10 -0400 (Thu, 27 Mar 2008)
New Revision: 7151
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/.project
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/.project
Log:
http://jira.jboss.com/jira/browse/JBIDE-1733
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/.project
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/.project 2008-03-27 16:36:28 UTC (rev 7150)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/.project 2008-03-27 16:38:10 UTC (rev 7151)
@@ -16,16 +16,6 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.jboss.tools.common.verification.verifybuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.jboss.tools.seam.core.seambuilder</name>
<arguments>
</arguments>
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/.project
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/.project 2008-03-27 16:36:28 UTC (rev 7150)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestSeamELContentAssist/.project 2008-03-27 16:38:10 UTC (rev 7151)
@@ -16,16 +16,6 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.jboss.tools.common.verification.verifybuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.jboss.tools.seam.core.seambuilder</name>
<arguments>
</arguments>
16 years, 5 months
JBoss Tools SVN: r7150 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: dsakovich
Date: 2008-03-27 12:36:28 -0400 (Thu, 27 Mar 2008)
New Revision: 7150
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToolBarTemplate.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1953
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToolBarTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToolBarTemplate.java 2008-03-27 15:54:22 UTC (rev 7149)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToolBarTemplate.java 2008-03-27 16:36:28 UTC (rev 7150)
@@ -448,11 +448,13 @@
}
if (isItemSeparatorExists() && !isLeftItemsExists()) {
+ if (rightToolBarItems.size() > 0)
rightToolBarItems.remove(0);
}
if (isItemSeparatorExists() && !isRightItemsExists()) {
- leftToolBarItems.remove(leftToolBarItems.size()-1);
+ if (leftToolBarItems.size() > 0)
+ leftToolBarItems.remove(leftToolBarItems.size()-1);
}
}
16 years, 5 months