JBoss Tools SVN: r6009 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-01-29 07:32:17 -0500 (Tue, 29 Jan 2008)
New Revision: 6009
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddPageTemplateSupport.java
Log:
JBIDE-1700
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddPageTemplateSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddPageTemplateSupport.java 2008-01-29 12:25:19 UTC (rev 6008)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddPageTemplateSupport.java 2008-01-29 12:32:17 UTC (rev 6009)
@@ -13,6 +13,7 @@
import java.util.Map;
import java.util.Properties;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.Path;
import org.eclipse.osgi.util.NLS;
@@ -126,9 +127,15 @@
if(pagePath.equals(this.pagePath)) return selectedFile;
this.pagePath = pagePath;
try {
- selectedFile = ModelPlugin.getWorkspace().getRoot().getFile(new Path(pagePath));
+ IResource r = ModelPlugin.getWorkspace().getRoot().findMember(new Path(pagePath));
+ if(r instanceof IFile) {
+ selectedFile = (IFile)r;
+ } else {
+ selectedFile = null;
+ }
} catch (Exception e) {
WebModelPlugin.getPluginLog().logError(e);
+ selectedFile = null;
}
return selectedFile;
}
16 years, 3 months
JBoss Tools SVN: r6008 - in trunk/seam/plugins: org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-01-29 07:25:19 -0500 (Tue, 29 Jan 2008)
New Revision: 6008
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencePage.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1698 fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java 2008-01-29 09:37:30 UTC (rev 6007)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java 2008-01-29 12:25:19 UTC (rev 6008)
@@ -244,7 +244,7 @@
* @param project
* @return
*/
- public static SeamRuntime getDefaultRuntimeForProject1(IProject project) {
+ public static SeamRuntime getDefaultRuntimeForProject(IProject project) {
if(project==null) {
throw new IllegalArgumentException("Project must not be null.");
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencePage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencePage.java 2008-01-29 09:37:30 UTC (rev 6007)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencePage.java 2008-01-29 12:25:19 UTC (rev 6008)
@@ -40,6 +40,11 @@
*/
public class SeamPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
+ public SeamPreferencePage() {
+ super();
+ noDefaultAndApplyButton();
+ }
+
/**
* Seam Preferences page ID
*/
16 years, 3 months
JBoss Tools SVN: r6007 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-29 04:37:30 -0500 (Tue, 29 Jan 2008)
New Revision: 6007
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
Log:
fix seam.ui compilation error :(
[java] [javac] 48. ERROR in /home/hudson/jbosstools-build/eclipse/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java (at line 109)
[java] [javac] SeamRuntime rs = SeamRuntimeManager.getDefaultRuntimeForProject(project);
[java] [javac] ^^^^^^^^^^^^^^^^^^^^^^^^^^^
[java] [javac] The method getDefaultRuntimeForProject(IProject) is undefined for the type SeamRuntimeManager
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-01-29 09:35:30 UTC (rev 6006)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2008-01-29 09:37:30 UTC (rev 6007)
@@ -106,7 +106,7 @@
SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT, SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT, false);
seamEnablement.setValue(hasSeamSupport());
- SeamRuntime rs = SeamRuntimeManager.getDefaultRuntimeForProject(project);
+ SeamRuntime rs = SeamRuntimeManager.getInstance().getRuntimeForProject(project);
List<String> namesAsList = getNameList();
16 years, 3 months
JBoss Tools SVN: r6006 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-29 04:35:30 -0500 (Tue, 29 Jan 2008)
New Revision: 6006
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java
Log:
fix seam.ui compilation error :(
javac] 215. ERROR in /home/hudson/jbosstools-build/eclipse/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java (at line 313)
[java] [javac] SeamRuntime seamRt = SeamRuntimeManager.getDefaultRuntimeForProject(project);
[java] [javac] ^^^^^^^^^^^^^^^^^^^^^^^^^^^
[java] [javac] The method getDefaultRuntimeForProject(IProject) is undefined for the type SeamRuntimeManager
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2008-01-29 08:39:00 UTC (rev 6005)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2008-01-29 09:35:30 UTC (rev 6006)
@@ -310,7 +310,7 @@
if(project==null) {
return null;
}
- SeamRuntime seamRt = SeamRuntimeManager.getDefaultRuntimeForProject(project);
+ SeamRuntime seamRt = SeamRuntimeManager.getInstance().getRuntimeForProject(project);
String runtimeName = SeamCorePlugin.getSeamPreferences(project)
.get(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,""); //$NON-NLS-1$
16 years, 3 months
JBoss Tools SVN: r6005 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam: internal/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-29 03:39:00 -0500 (Tue, 29 Jan 2008)
New Revision: 6005
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
Log:
fix test errors
java.lang.NullPointerException
at org.jboss.tools.seam.core.project.facet.SeamRuntimeManager.getDefaultRuntimeForProject(SeamRuntimeManager.java:256)
at org.jboss.tools.seam.internal.core.SeamProject.getRuntime(SeamProject.java:171)
at org.jboss.tools.seam.internal.core.SeamProject.getRuntimeName(SeamProject.java:152)
at org.jboss.tools.seam.internal.core.validation.SeamRuntimeValidation.validate(SeamRuntimeValidation.java:36)
there is no concept 'deaultSeamRuntime' for seam project
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java 2008-01-29 08:38:52 UTC (rev 6004)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java 2008-01-29 08:39:00 UTC (rev 6005)
@@ -244,7 +244,7 @@
* @param project
* @return
*/
- public static SeamRuntime getDefaultRuntimeForProject(IProject project) {
+ public static SeamRuntime getDefaultRuntimeForProject1(IProject project) {
if(project==null) {
throw new IllegalArgumentException("Project must not be null.");
}
@@ -253,6 +253,7 @@
IFacetedProject facetedProject = ProjectFacetsManager.create(project);
if(facetedProject!=null) {
IProjectFacetVersion facetVersion = facetedProject.getInstalledVersion(facet);
+ if(facetVersion==null) return null;
SeamVersion seamVersion = SeamVersion.parseFromString(facetVersion.getVersionString());
return getInstance().getDefaultRuntime(seamVersion);
}
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-01-29 08:38:52 UTC (rev 6004)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2008-01-29 08:39:00 UTC (rev 6005)
@@ -167,9 +167,6 @@
ISeamProject sp = SeamCorePlugin.getSeamProject(p, false);
return sp == null ? null : sp.getRuntime();
}
- if(runtimeName == null) {
- return SeamRuntimeManager.getDefaultRuntimeForProject(project);
- }
return runtimeName == null ? null : SeamRuntimeManager.getInstance().findRuntimeByName(runtimeName);
}
@@ -181,7 +178,7 @@
public void setRuntimeName(String runtimeName) {
if(this.runtimeName == runtimeName) return;
if(this.runtimeName != null && this.runtimeName.equals(runtimeName)) return;
- SeamRuntime d = SeamRuntimeManager.getDefaultRuntimeForProject(project);
+ SeamRuntime d = SeamRuntimeManager.getInstance().getRuntimeForProject(project);
boolean useDefaultRuntime = d != null && d.getName().equals(runtimeName);
if(useDefaultRuntime) {
16 years, 3 months
JBoss Tools SVN: r6004 - in trunk/seam/tests/org.jboss.tools.seam.core.test/projects: Test1/.settings and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-29 03:38:52 -0500 (Tue, 29 Jan 2008)
New Revision: 6004
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.wst.common.component
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.jboss.tools.jst.web.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/.settings/org.jboss.tools.jst.web.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/web.xml
Log:
fix test errors
java.lang.NullPointerException
at org.jboss.tools.seam.core.project.facet.SeamRuntimeManager.getDefaultRuntimeForProject(SeamRuntimeManager.java:256)
at org.jboss.tools.seam.internal.core.SeamProject.getRuntime(SeamProject.java:171)
at org.jboss.tools.seam.internal.core.SeamProject.getRuntimeName(SeamProject.java:152)
at org.jboss.tools.seam.internal.core.validation.SeamRuntimeValidation.validate(SeamRuntimeValidation.java:36)
there is no concept 'deaultSeamRuntime' for seam project
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.wst.common.component 2008-01-28 21:53:54 UTC (rev 6003)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.settings/org.eclipse.wst.common.component 2008-01-29 08:38:52 UTC (rev 6004)
@@ -3,7 +3,6 @@
<wb-module deploy-name="SeamWebWarTestProject">
<wb-resource deploy-path="/" source-path="/WebContent"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/action"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/model"/>
<property name="context-root" value="SeamWebWarTestProject"/>
<property name="java-output-path" value="build/classes"/>
</wb-module>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.jboss.tools.jst.web.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.jboss.tools.jst.web.xml 2008-01-28 21:53:54 UTC (rev 6003)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/.settings/org.jboss.tools.jst.web.xml 2008-01-29 08:38:52 UTC (rev 6004)
@@ -1,52 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
-<file-systems application-name="Test1" model-entity="FileSystems"
- VERSION="2.0.0" WORKSPACE_HOME="./WebContent/WEB-INF">
- <file-system model-entity="FileSystemFolder" location="%workspace.home%" NAME="WEB-INF"/>
- <file-system model-entity="FileSystemFolder" INFO="Content-Type=Web"
- location="%workspace.home%/.." NAME="WEB-ROOT"/>
- <file-system model-entity="FileSystemFolder"
- location="%workspace.home%/../../src" NAME="src"/>
- <file-system model-entity="FileSystemFolder" location="%workspace.home%/lib" NAME="lib"/>
- <file-system model-entity="FileSystemFolder"
- location="%workspace.home%/classes" NAME="classes"/>
- <file-system model-entity="FileSystemJar"
- location="C:\Program Files\Java\jre1.5.0_06\lib\ext\dnsns.jar" NAME="lib-dnsns.jar"/>
- <file-system model-entity="FileSystemJar"
- location="C:\Program Files\Java\jre1.5.0_06\lib\ext\localedata.jar" NAME="lib-localedata.jar"/>
- <file-system model-entity="FileSystemJar"
- location="C:\Program Files\Java\jre1.5.0_06\lib\ext\sunjce_provider.jar" NAME="lib-sunjce_provider.jar"/>
- <file-system model-entity="FileSystemJar"
- location="C:\Program Files\Java\jre1.5.0_06\lib\ext\sunpkcs11.jar" NAME="lib-sunpkcs11.jar"/>
- <file-system model-entity="FileSystemJar"
- location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\ajax4jsf-1.1.1-SNAPSHOT.jar" NAME="lib-ajax4jsf-1.1.1-SNAPSHOT.jar"/>
- <file-system model-entity="FileSystemJar"
- location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\commons-beanutils-1.7.0.jar" NAME="lib-commons-beanutils-1.7.0.jar"/>
- <file-system model-entity="FileSystemJar"
- location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\commons-collections-3.1.jar" NAME="lib-commons-collections-3.1.jar"/>
- <file-system model-entity="FileSystemJar"
- location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\commons-digester-1.6.jar" NAME="lib-commons-digester-1.6.jar"/>
- <file-system model-entity="FileSystemJar"
- location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-debug.jar" NAME="lib-jboss-seam-debug.jar"/>
- <file-system model-entity="FileSystemJar"
- location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-ioc.jar" NAME="lib-jboss-seam-ioc.jar"/>
- <file-system model-entity="FileSystemJar"
- location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-mail.jar" NAME="lib-jboss-seam-mail.jar"/>
- <file-system model-entity="FileSystemJar"
- location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-pdf.jar" NAME="lib-jboss-seam-pdf.jar"/>
- <file-system model-entity="FileSystemJar"
- location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-remoting.jar" NAME="lib-jboss-seam-remoting.jar"/>
- <file-system model-entity="FileSystemJar"
- location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-ui.jar" NAME="lib-jboss-seam-ui.jar"/>
- <file-system model-entity="FileSystemJar"
- location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jsf-facelets.jar" NAME="lib-jsf-facelets.jar"/>
- <file-system model-entity="FileSystemJar"
- location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\oscache-2.3.2.jar" NAME="lib-oscache-2.3.2.jar"/>
- <file-system model-entity="FileSystemJar"
- location="C:\Documents and Settings\glory\RedHat-3.3\org.jboss.tools.seam.core.test\projects\Test1-ear\EarContent\jboss-seam.jar" NAME="lib-jboss-seam.jar"/>
- <file-system model-entity="FileSystemJar"
- location="%workspace.home%/lib/ajax4jsf-1.1.1-snapshot.jar" NAME="lib-ajax4jsf-1.1.1-snapshot.jar"/>
- <WEB model-entity="JstWeb" MODEL_PATH="/web.xml" SERVLET_VERSION="2.4">
- <MODULE model-entity="WebJSFModule" MODEL_PATH="/faces-config.xml"
- ROOT="WEB-ROOT" SRC="src" URI="/WEB-INF/faces-config.xml"/>
- </WEB>
+<file-systems VERSION="2.0.0" application-name="Test1"
+ model-entity="FileSystems" workspace-home="./WebContent/WEB-INF">
+ <file-system NAME="WEB-INF" location="%workspace.home%" model-entity="FileSystemFolder"/>
+ <file-system NAME="WEB-ROOT" info="Content-Type=Web"
+ location="%workspace.home%/.." model-entity="FileSystemFolder"/>
+ <file-system NAME="src" location="%workspace.home%/../../src" model-entity="FileSystemFolder"/>
+ <file-system NAME="lib" location="%workspace.home%/lib" model-entity="FileSystemFolder"/>
+ <file-system NAME="classes" location="%workspace.home%/classes" model-entity="FileSystemFolder"/>
+ <file-system NAME="lib-ajax4jsf-1.1.1-SNAPSHOT.jar"
+ location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\ajax4jsf-1.1.1-SNAPSHOT.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-commons-beanutils-1.7.0.jar"
+ location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\commons-beanutils-1.7.0.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-commons-collections-3.1.jar"
+ location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\commons-collections-3.1.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-commons-digester-1.6.jar"
+ location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\commons-digester-1.6.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-jboss-seam-debug.jar"
+ location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-debug.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-jboss-seam-ioc.jar"
+ location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-ioc.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-jboss-seam-mail.jar"
+ location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-mail.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-jboss-seam-pdf.jar"
+ location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-pdf.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-jboss-seam-remoting.jar"
+ location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-remoting.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-jboss-seam-ui.jar"
+ location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jboss-seam-ui.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-jsf-facelets.jar"
+ location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\jsf-facelets.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-oscache-2.3.2.jar"
+ location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1\WebContent\WEB-INF\lib\oscache-2.3.2.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-jboss-seam.jar"
+ location="C:\exadel-projects\rhds\tests\org.jboss.tools.seam.core.test\projects\Test1-ear\EarContent\jboss-seam.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-ajax4jsf-1.1.1-snapshot.jar"
+ location="%workspace.home%/lib/ajax4jsf-1.1.1-snapshot.jar" model-entity="FileSystemJar"/>
+ <web SERVLET_VERSION="2.4" model-entity="JstWeb" model-path="/web.xml">
+ <module URI="/WEB-INF/faces-config.xml" model-entity="WebJSFModule"
+ model-path="/faces-config.xml" src="src" web-root="WEB-ROOT"/>
+ </web>
</file-systems>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-01-28 21:53:54 UTC (rev 6003)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-01-29 08:38:52 UTC (rev 6004)
@@ -5,7 +5,7 @@
<fixed facet="jst.seam"/>
<fixed facet="jst.java"/>
<installed facet="jst.java" version="5.0"/>
- <installed facet="jst.web" version="2.4"/>
+ <installed facet="jst.web" version="2.5"/>
<installed facet="jst.jsf" version="1.2"/>
<installed facet="jst.seam" version="1.2"/>
</faceted-project>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/.settings/org.jboss.tools.jst.web.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/.settings/org.jboss.tools.jst.web.xml 2008-01-28 21:53:54 UTC (rev 6003)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/.settings/org.jboss.tools.jst.web.xml 2008-01-29 08:38:52 UTC (rev 6004)
@@ -1,39 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
-<file-systems application-name="TestScanner" model-entity="FileSystems"
- VERSION="2.0.0" WORKSPACE_HOME="./WebContent/WEB-INF">
- <file-system model-entity="FileSystemFolder" location="%redhat.workspace%" NAME="WEB-INF"/>
- <file-system model-entity="FileSystemFolder" INFO="Content-Type=Web"
- location="%redhat.workspace%/.." NAME="WEB-ROOT"/>
- <file-system model-entity="FileSystemFolder"
- location="%redhat.workspace%/../../JavaSource" NAME="src"/>
- <file-system model-entity="FileSystemFolder" location="%redhat.workspace%/lib" NAME="lib"/>
- <file-system model-entity="FileSystemFolder"
- location="%redhat.workspace%/classes" NAME="classes"/>
- <file-system model-entity="FileSystemFolder"
- location="%redhat.workspace%/../../ant" NAME="build"/>
- <file-system model-entity="FileSystemJar" INFO="hidden=yes"
- location="%redhat.workspace%/lib/common-annotations.jar" NAME="lib-common-annotations.jar"/>
- <file-system model-entity="FileSystemJar" INFO="hidden=yes"
- location="%redhat.workspace%/lib/commons-beanutils.jar" NAME="lib-commons-beanutils.jar"/>
- <file-system model-entity="FileSystemJar" INFO="hidden=yes"
- location="%redhat.workspace%/lib/commons-collections.jar" NAME="lib-commons-collections.jar"/>
- <file-system model-entity="FileSystemJar" INFO="hidden=yes"
- location="%redhat.workspace%/lib/commons-digester.jar" NAME="lib-commons-digester.jar"/>
- <file-system model-entity="FileSystemJar" INFO="hidden=yes"
- location="%redhat.workspace%/lib/commons-logging.jar" NAME="lib-commons-logging.jar"/>
- <file-system model-entity="FileSystemJar" INFO="hidden=yes"
- location="%redhat.workspace%/lib/jsf-api.jar" NAME="lib-jsf-api.jar"/>
- <file-system model-entity="FileSystemJar" INFO="hidden=yes"
- location="%redhat.workspace%/lib/jsf-impl.jar" NAME="lib-jsf-impl.jar"/>
- <file-system model-entity="FileSystemJar" INFO="hidden=yes"
- location="%redhat.workspace%/lib/jstl.jar" NAME="lib-jstl.jar"/>
- <file-system model-entity="FileSystemJar" INFO="hidden=yes"
- location="%redhat.workspace%/lib/standard.jar" NAME="lib-standard.jar"/>
- <file-system model-entity="FileSystemFolder" location="%eclipse.project%" NAME="TestScanner"/>
- <file-system model-entity="FileSystemJar"
- location="%redhat.workspace%/lib/jboss-seam.jar" NAME="lib-jboss-seam.jar"/>
- <WEB model-entity="JstWeb" MODEL_PATH="/web.xml" SERVLET_VERSION="2.4">
- <MODULE model-entity="WebJSFModule" MODEL_PATH="/faces-config.xml"
- ROOT="WEB-ROOT" SRC="src" URI="/WEB-INF/faces-config.xml"/>
- </WEB>
+<file-systems VERSION="2.0.0" application-name="TestScanner"
+ model-entity="FileSystems" workspace-home="./WebContent/WEB-INF">
+ <file-system NAME="WEB-INF" location="%workspace.home%" model-entity="FileSystemFolder"/>
+ <file-system NAME="WEB-ROOT" info="Content-Type=Web"
+ location="%workspace.home%/.." model-entity="FileSystemFolder"/>
+ <file-system NAME="src" location="%workspace.home%/../../JavaSource" model-entity="FileSystemFolder"/>
+ <file-system NAME="lib" location="%workspace.home%/lib" model-entity="FileSystemFolder"/>
+ <file-system NAME="classes" location="%workspace.home%/classes" model-entity="FileSystemFolder"/>
+ <file-system NAME="build" location="%workspace.home%/../../ant" model-entity="FileSystemFolder"/>
+ <file-system NAME="lib-common-annotations.jar" info="hidden=yes"
+ location="%workspace.home%/lib/common-annotations.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-commons-beanutils.jar" info="hidden=yes"
+ location="%workspace.home%/lib/commons-beanutils.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-commons-collections.jar" info="hidden=yes"
+ location="%workspace.home%/lib/commons-collections.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-commons-digester.jar" info="hidden=yes"
+ location="%workspace.home%/lib/commons-digester.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-commons-logging.jar" info="hidden=yes"
+ location="%workspace.home%/lib/commons-logging.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-jsf-api.jar" info="hidden=yes"
+ location="%workspace.home%/lib/jsf-api.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-jsf-impl.jar" info="hidden=yes"
+ location="%workspace.home%/lib/jsf-impl.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-jstl.jar" info="hidden=yes"
+ location="%workspace.home%/lib/jstl.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-standard.jar" info="hidden=yes"
+ location="%workspace.home%/lib/standard.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="TestScanner" location="%eclipse.project%" model-entity="FileSystemFolder"/>
+ <file-system NAME="lib-jboss-seam.jar"
+ location="%workspace.home%/lib/jboss-seam.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-ejb3-persistence.jar"
+ location="%workspace.home%/lib/ejb3-persistence.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-jboss-ejb3x.jar"
+ location="%workspace.home%/lib/jboss-ejb3x.jar" model-entity="FileSystemJar"/>
+ <web SERVLET_VERSION="2.4" model-entity="JstWeb" model-path="/web.xml">
+ <module URI="/WEB-INF/faces-config.xml" model-entity="WebJSFModule"
+ model-path="/faces-config.xml" src="src" web-root="WEB-ROOT"/>
+ </web>
</file-systems>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/web.xml 2008-01-28 21:53:54 UTC (rev 6003)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/web.xml 2008-01-29 08:38:52 UTC (rev 6004)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<display-name>TestScanner</display-name>
<context-param>
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
16 years, 3 months
JBoss Tools SVN: r6003 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-28 16:53:54 -0500 (Mon, 28 Jan 2008)
New Revision: 6003
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
Log:
fix test errors
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-01-28 21:50:48 UTC (rev 6002)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-01-28 21:53:54 UTC (rev 6003)
@@ -292,8 +292,8 @@
assertTrue("Wrong number of problem markers", lineNumbers.length == messages.length && messages.length == 2);
- assertTrue("Problem marker has wrong line number", lineNumbers[0] == 34);
- assertTrue("Problem marker has wrong line number", lineNumbers[1] == 39);
+ assertTrue("Problem marker has wrong line number", lineNumbers[0] == 32);
+ assertTrue("Problem marker has wrong line number", lineNumbers[1] == 38);
// Duplicate @Create method
@@ -910,5 +910,7 @@
public static void waitForJob() {
EditorTestHelper.joinJobs(1000,10000,500);
+ // wait for Workspace runnable
+ EditorTestHelper.runEventQueue(2000);
}
}
\ No newline at end of file
16 years, 3 months
JBoss Tools SVN: r6002 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-28 16:50:48 -0500 (Mon, 28 Jan 2008)
New Revision: 6002
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
Log:
fix for test errors. error line numebrs updated to real ones.
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-01-28 21:49:34 UTC (rev 6001)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-01-28 21:50:48 UTC (rev 6002)
@@ -292,14 +292,9 @@
assertTrue("Wrong number of problem markers", lineNumbers.length == messages.length && messages.length == 2);
- if(messages[1].indexOf("destroyMethod2") >= 0){
- assertTrue("Problem marker has wrong line number", lineNumbers[0] == 32);
- assertTrue("Problem marker has wrong line number", lineNumbers[1] == 38);
- }else{
- assertTrue("Problem marker has wrong line number", lineNumbers[0] == 38);
- assertTrue("Problem marker has wrong line number", lineNumbers[1] == 32);
-
- }
+ assertTrue("Problem marker has wrong line number", lineNumbers[0] == 34);
+ assertTrue("Problem marker has wrong line number", lineNumbers[1] == 39);
+
// Duplicate @Create method
System.out.println("Test - Duplicate @Create method");
@@ -915,7 +910,5 @@
public static void waitForJob() {
EditorTestHelper.joinJobs(1000,10000,500);
- //then wait for a while to Workspace runnable is finished
- EditorTestHelper.joinJobs(2000, 2000, 500);
}
}
\ No newline at end of file
16 years, 3 months
JBoss Tools SVN: r6001 - trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/demo.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-28 16:49:34 -0500 (Mon, 28 Jan 2008)
New Revision: 6001
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/demo/User.java
Log:
fix for test errors
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/demo/User.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/demo/User.java 2008-01-28 16:43:55 UTC (rev 6000)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/demo/User.java 2008-01-28 21:49:34 UTC (rev 6001)
@@ -70,7 +70,8 @@
}
@Unwrap
- public void unwrapMethod() {
+ public User unwrapMethod() {
+ return new User();
}
@Create @Destroy
@@ -78,8 +79,8 @@
}
@Factory(value="myFactory", scope=ScopeType.SESSION)
- public void testFactory() {
-
+ public User testFactory() {
+ return new User();
}
}
16 years, 3 months
JBoss Tools SVN: r5999 - trunk/as/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-01-28 11:10:47 -0500 (Mon, 28 Jan 2008)
New Revision: 5999
Modified:
trunk/as/docs/reference/en/modules/modules.xml
trunk/as/docs/reference/en/modules/perspective.xml
trunk/as/docs/reference/en/modules/runtimes_servers.xml
trunk/as/docs/reference/en/modules/webtools.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-199 - rearranging chapters according to the task
Modified: trunk/as/docs/reference/en/modules/modules.xml
===================================================================
--- trunk/as/docs/reference/en/modules/modules.xml 2008-01-28 16:08:02 UTC (rev 5998)
+++ trunk/as/docs/reference/en/modules/modules.xml 2008-01-28 16:10:47 UTC (rev 5999)
@@ -6,13 +6,16 @@
<para> First of all it is necessary to say that deploying to a server is mostly painless. There
are several ways to do it provided by WTP, and some additional methods provided by JBoss
Tools. These methods are described further in this chapter.</para>
+
<section>
+ <title>Deploying on the Package Explorer</title>
+ <section>
<title>Deploying with Run On Server wizard</title>
<para> The first WTP method is to right-click on a project, such as a Dynamic Web project,
EJB project, or EAR project and then select <emphasis>
<property>Run As > Run on Server</property>
</emphasis>. The resulting dialog allows you to select which supporting server the
- project can be published to. </para>
+ project can be published to.</para>
<figure>
<title>Define a New Server</title>
<mediaobject>
@@ -44,7 +47,29 @@
linkend="Project_archivesView">Project Archives view</link> and customize packaging
yourself.</para>
</section>
+
+ <section id="single_file_deployment">
+ <?dbhtml filename="DeployToServer.html"?>
+ <title>Deploying single files</title>
+ <para>In the context menu of files there is a <property>Deploy To Server</property> option
+ that allows a single file deployment. To deploy these non-WTP files/projects right click
+ on the file (-ds.xml, .ear, .jar etc.) and select <emphasis>
+ <property>Deploy To server</property>
+ </emphasis> and it will be automatically deployed.</para>
+ <figure>
+ <title>Deploy to Sever</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/perspective/perspective_16.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>The deployed files are listed side-by-side with other modules that are deployed to the
+ server.</para>
+
+ </section>
+ </section>
<section>
<title>Deploying with JBoss Server View</title>
<para>As it has been already mentioned <emphasis>
Modified: trunk/as/docs/reference/en/modules/perspective.xml
===================================================================
--- trunk/as/docs/reference/en/modules/perspective.xml 2008-01-28 16:08:02 UTC (rev 5998)
+++ trunk/as/docs/reference/en/modules/perspective.xml 2008-01-28 16:10:47 UTC (rev 5999)
@@ -27,7 +27,7 @@
<title>The JBoss Server View</title>
<para>Let's have a look at the <property>JBoss Server View</property> and inspect
- in details all parts it consist of. </para>
+ in details all parts it consists of. </para>
<para>The <property>JBoss Server View</property> is based on the WTP view, Server View. The
top part of the <property>JBoss Servers View</property> essentially embeds the original
@@ -67,7 +67,7 @@
<para>Now, let's get to know with both of the <property>JBoss Server
View</property> parts.</para>
<section>
- <title>Top Part of JBoss Server View</title>
+ <title>Top Part of the JBoss Server View</title>
<para>In the top part of the <property>JBoss Server View</property> all declared servers
are represented as well as their current states, that is, whether they are started
or stopped. </para>
@@ -287,7 +287,7 @@
</section>
<section>
- <title>Bottom Part of JBoss Server View</title>
+ <title>Bottom Part of the JBoss Server View</title>
<para>Here, we dwell on the bottom part of the <property>JBoss Server View</property>.</para>
<para>First, we should say that the bottom part is meant to provide additional
@@ -372,11 +372,11 @@
<property>XML Configuration</property>
</emphasis> category allows you to quickly browse to descriptor files in your
server's deploy directory and check or change the values. Its use requires the
- <property>Properties view</property>. Basically, <emphasis>
+ <property>Properties view</property>. Basically, <emphasis>
<property>XML Configuration</property>
</emphasis> includes XML XPaths where a xpath is a path used to access some specific
part of an xml document. </para>
-
+
<figure>
<title>XML Configuration and Properties View</title>
<mediaobject>
@@ -386,6 +386,9 @@
</mediaobject>
</figure>
+ <note><para>You are assumed to be familiar with XPath. If not, we highly suggested that you
+ look through an appropriate manual or tutorial on the topic.</para></note>
+
<para>The <emphasis>
<property>XML Configuration</property>
</emphasis> category itself contains only a list of categories. <emphasis>
@@ -436,59 +439,59 @@
</mediaobject>
</figure>
- <!--para>As you can see on the figure above, when you type the fields autocomplete to help
- you locate exactly what xpath you're looking for. </para-->
-
<para>The goal here is to get an end result where the XPath matches up with a necessary
property. With that in mind, let's look how it works. If the property you
- want to reach is the text of an element, for example, number 35 for
- <emphasis><port>35</port></emphasis> element, than
- your <emphasis>
+ want to reach is the value of the <emphasis>name</emphasis> attribute in the element
+ <emphasis><mbean></emphasis>, then your <emphasis>
<property>XPath Patten</property>
- </emphasis> should end with <emphasis> port </emphasis> and <emphasis>
+ </emphasis>should end with <emphasis>mbean</emphasis> and your <emphasis>
<property>Attribute Name</property>
- </emphasis> field should be left blank. If, on the other hand, your desired field is
- the value of the port attribute in the element <emphasis><fieldName
- port="35"></emphasis>, then your <emphasis>
- <property>XPath Patten</property>
- </emphasis> will end with <emphasis>
- <property>fieldName</property>
- </emphasis> and your <emphasis>
- <property>Attribute Name</property>
- </emphasis> should be <emphasis> port</emphasis>.</para>
+ </emphasis> should be <emphasis>name</emphasis> like on the next figure.</para>
- <para>Thus, in our case let's reach the text of
- <emphasis>description</emphasis> element on the patton bellow.</para>
- <para>
- <programlisting role="XML"><![CDATA[...
+ <programlisting role="XML"><![CDATA[...
<server>
...
-<mbean code="org.jboss.ejb.EJBDeployer" name="jboss.ejb:service=EJBDeployer" xmbean-dd="">
+ <mbean code="org.jboss.ejb.EJBDeployer" name="jboss.ejb:service=EJBDeployer" xmbean-dd="">
- <!-- Inline XMBean Descriptor BEGIN -->
- <xmbean>
- <description>The EJBDeployer responsible for ejb jar deployment</description>
-...
-]]></programlisting></para>
-
-
- <para>So, in the <emphasis>
- <property>XPath Patten</property>
- </emphasis> field you should put the xpath like on the figure below.</para>
+ <!-- Inline XMBean Descriptor BEGIN -->
+ <xmbean>
+ <description>The EJBDeployer responsible for ejb jar deployment</description>
+ ...
+ </xmbean>
+ </mbean>
+</server>
+]]></programlisting>
<figure>
<title>XPath Preview</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/perspective/perspective_11.png"/>
+ <imagedata fileref="images/perspective/perspective_11a.png"/>
</imageobject>
</mediaobject>
</figure>
-
- <para>When finished, click <emphasis>
+
+ <para>Notice, when you type the fields autocomplete to help you locate exactly what
+ xpath you're looking for. </para>
+
+ <para>Then, on the other hand, if your desired field is the text of an element
+ <emphasis><description></emphasis>, your <emphasis>
+ <property>XPath Patten</property>
+ </emphasis> should end with <emphasis>description</emphasis> and <emphasis>
+ <property>Attribute Name</property>
+ </emphasis> field should be left blank. When finished, click <emphasis>
<property>Preview</property>
</emphasis> to see how many matches you have for that particular XPath.</para>
-
+
+ <figure>
+ <title>XPath Preview</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/perspective/perspective_11b.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
<para>As part of the <property>JBoss Server View</property> there is a <emphasis>
<property>JMX Console</property>
</emphasis> section which allows you to browse and use the JMX exposed beans on the
@@ -503,6 +506,7 @@
</figure>
</section>
+ <para/>
</section>
<section id="Project_archivesView">
@@ -510,30 +514,52 @@
<para>Every application, whether Plain Old Java, J2EE, or some other language altogether,
needs to be packaged in some way. In Java-related projects, many people use ANT. JBoss
Tools comes with our own Archives tool with a bit easier and less-verbose XML and a
- handy user interface.</para>
- <para>The Project Archives plugin consists primarily of a view, that is <property>Project
- Archives View</property>, to set up each packaging configuration. Each project can
- enable or disable its own builder, or depend on the global setting.</para>
- <para>The packaging configuration for each project is stored in that project's root folder,
- and is in a file named <emphasis>
- <property>.packages</property>
- </emphasis>, which has a fairly simple XML structure. Modifying the file by hand is
- neither required nor recommended, and using the UI is the official way of modifying your
- packaging structure.</para>
- <para>Aside from the builder, the other preferences for the plugin are mostly cosmetic,
- allowing you to show full or truncated paths, show the project at the root, etc. None of
- these has any effect on the functionality of the packaging plugin.</para>
-
- <para>Further, let's look through all the possibilities that the <property>Project
+ handy user interface. The Project Archives plugin consists primarily of a view, that is
+ <property>Project Archives View</property>, to set up each packaging configuration.</para>
+ <para>So far, let's look through all functionality that the <property>Project
Archives View</property> provides.</para>
+ <section id="archives_overview">
+ <title>Overview</title>
+
+ <para>The packaging configuration for each project is stored in the project's root
+ folder, and is in a file named <emphasis>
+ <property>.packages</property>
+ </emphasis>, which has a fairly simple XML structure. Modifying the file by hand is
+ neither required nor recommended, and using the UI is the official way of modifying
+ your packaging structure.</para>
+
+ <figure>
+ <title>Archives View</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/perspective/perspective_12_a.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>A project's configuration contains archives. On the image above there is
+ only one archive, but a project can contain many. Inside the archive folders
+ (testFolder), filesets, or other internal archives can be located. Internal archives
+ and filesets may be directly inside of an archive, or in some sub-folder of that
+ archive.</para>
+
+ <para>In the upper right corner of the view you can see an icon which, when clicked,
+ will build the selected top-level archive. Additionally, you can select <emphasis>
+ <property>Project > Build Packages</property>
+ </emphasis> when a project is selected in the <property>Packages View</property> to
+ build all declared packages in that project's <emphasis>
+ <property>.packages</property>
+ </emphasis> file. This will execute a full build on all declared archives.</para>
+ </section>
+
<section id="Creating an archive">
<title>Creating an Archive</title>
<para>When creating a new archive, you have some different options at your disposal. If
the project has no <emphasis>
<property>.packages</property>
- </emphasis> file, your options will be presented to you all at once to choose from
- (as above). Otherwise you will right-click inside the view and select <emphasis>
+ </emphasis> file, your options will be presented to you all at once to choose from.
+ Otherwise you will right-click inside the view and select <emphasis>
<property>New Archive</property>
</emphasis> to see your archive type options.</para>
<figure>
@@ -544,17 +570,17 @@
</imageobject>
</mediaobject>
</figure>
- <para>JAR is the standard archive type, and does very little configuration, leaving most
- of the work up to you. You can customize the name, add folders, filesets, and inner
- jars to it.</para>
+ <para><property>JAR</property> is the standard archive type, and does very little
+ configuration, leaving most of the work up to you. You can customize the name, add
+ folders, filesets, and inner jars to it.</para>
<para>The other types, for the most part, simply start off with a default setting,
usually the jar with some specific children based on an expected structure of the
- project. For example, if the project is a dynamic web project, and you create a WAR
- archive, the archive will be created with a few filesets relevant to the known
- structure of the project.</para>
+ project. For example, if the project is a Dynamic Web Project, and you create a
+ <property>WAR</property> archive, the archive will be created with a few
+ filesets relevant to the known structure of the project.</para>
<para>Because the first page of all new archive wizards are the same, and it is also the
- only page in the New Jar Wizard, that page is shown below.</para>
+ only page in the <property>New Jar Wizard</property>, that page is shown below.</para>
<figure>
<title>New JAR Wizard</title>
<mediaobject>
@@ -585,18 +611,27 @@
<title>Creating a FileSet</title>
<para>To create a new fileset, you click on an available target location such as an
archive, a nested archive, or a folder within an archive, and select <emphasis>
- <property>New Fileset</property>
- </emphasis>. The <property>New Fileset Wizard</property> requires a destination
- (where the files will go), and a root directory (or where the files are coming
- from). The source can be anywhere in the workspace or from the filesystem at
- large.</para>
+ <property>New Fileset</property></emphasis>.</para>
+
+ <figure>
+ <title>Adding a New FileSet</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/perspective/perspective_13_a.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>The <property>New Fileset Wizard</property> requires a destination (where the
+ files will go), and a root directory (or where the files are coming from). The
+ source can be anywhere in the workspace or from the filesystem at large.</para>
<para>Below that, the fileset requires only an includes pattern and an excludes
pattern. As you type in either of these fields, the preview viewer should update
itself with which files are matched.</para>
</section>
</section>
<section id="View Actions">
- <title>View Actions</title>
+ <title>Archive Actions</title>
<figure>
<title>Context Menu on the Item</title>
<mediaobject>
@@ -676,13 +711,15 @@
</tbody>
</tgroup>
</table>
+ </section>
-
-
-
- </section>
<section id="PublishToServer">
<title>Publishing to Server</title>
+ <para>Finally, you'll need to publish your application to a server. Here, we
+ show you how to do it with the help of <emphasis>
+ <property>Archives View</property>
+ </emphasis>.</para>
+
<figure>
<title>Context Menu on the Item</title>
<mediaobject>
@@ -708,25 +745,4 @@
</section>
- <!--section id="Deploy to Server">
- <?dbhtml filename="DeployToServer.html"?>
- <title>Deploy to Server</title>
- <para>In the context menu of files there is a <property>Deploy To Server</property> option
- that allows a single file deployment. To deploy these non-WTP files/projects right click
- on the file (-ds.xml, .ear, .jar etc.) and select <emphasis>
- <property>Deploy To server</property>
- </emphasis> and it will be automatically deployed.</para>
- <figure>
- <title>Deploy to Sever</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/perspective/perspective_16.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>The deployed files are listed side-by-side with other modules that are deployed to the
- server.</para>
-
- </section-->
-
</chapter>
Modified: trunk/as/docs/reference/en/modules/runtimes_servers.xml
===================================================================
--- trunk/as/docs/reference/en/modules/runtimes_servers.xml 2008-01-28 16:08:02 UTC (rev 5998)
+++ trunk/as/docs/reference/en/modules/runtimes_servers.xml 2008-01-28 16:10:47 UTC (rev 5999)
@@ -15,9 +15,9 @@
<para>In this chapter we will discuss how to install runtimes and servers.</para>
<para>The JBoss AS plugin makes use of WTP. This includes starting and stopping servers in run or
- debug mode. It also includes targeting WTP projects, such as dynamic web projects, to certain
+ debug mode. It also includes targeting WTP projects, such as Dynamic Web Projects, to certain
server runtimes in order to ensure that the proper jars from a specific server are added to the
- project's classpath properly.</para>
+ project's classpath properly.</para>
<para>In order to get started creating, running, and debugging J2EE applications, we must start
with creating our <property>runtime</property> and <property>server</property> instances.</para>
@@ -31,7 +31,7 @@
<para>it provides classpath additions to WTP projects that require them.</para>
</listitem>
<listitem>
- <para>For JBoss server at least, it provides information necessary for the starting and
+ <para>for <property>JBoss server</property> at least, it provides information necessary for the starting and
stopping of the server, it tells which jars to run and which configuration to use.</para>
</listitem>
</itemizedlist>
@@ -59,9 +59,6 @@
<property>Add</property>
</emphasis> button and choose necessary type of runtime from the appeared dialog. </para>
- <!--para>Most of the runtime options are provided by WTP, but those
- provided by JBoss Tools are the ones we will focus on.</para-->
-
<figure>
<title>Adding a Runtime</title>
<mediaobject>
@@ -71,12 +68,11 @@
</mediaobject>
</figure>
- <para>As seen above, there appear to be two JBoss categories. The first is contributed by WTP,
- and is a generic adapter that is not upkept very well. For this reason, JBoss Tools provides
- updated and supported adapters of our own. There is one for each of JBoss 3.2, 4.0, and 4.2.
- You'll also note a deploy-only runtime type. This type provides no classpath for WTP
- projects. It is used solely by it's server type for the purpose of setting up a deploy
- directory for users who don't wish to make use of starting, stopping, or debugging their
+ <para>As seen above, <property>JBoss Tools</property> provides
+ its own updated and supported adapters such as JBoss 3.2, 4.0, and 4.2.
+ You'll also note a Deploy-Only Runtime type. This type provides no classpath for WTP
+ projects. It is used solely by its server type for the purpose of setting up a deploy
+ directory for users who don't wish to make use of starting, stopping, or debugging their
projects inside eclipse.</para>
<figure id="add_runtime_figure">
@@ -146,9 +142,11 @@
<para>Configuration</para>
</entry>
<entry>
- <para>The lists of configurations that is updated as soon as you browse to a valid
+ <para>The lists of configurations (all, default, minimal) that is updated as soon as you browse to a valid
runtime installation folder. After the runtime is created the configuration
- becomes an unchanging property of that runtime.</para>
+ becomes an unchanging property of that runtime. To
+ compile against a different configuration's jars, you will need to create a new runtime from
+ that configuration.</para>
</entry>
</row>
@@ -156,33 +154,17 @@
</tgroup>
</table>
-
- <!--para>All you need here is to name chosen runtime, browse to
- its install directory and select a Java Runtime Environment. As you browse to a valid
- installation folder, the list of configurations will update allowing you to select the
- configuration of your choice.</para-->
-
-
-
-
- <para>Once the runtime is created, the configuration is an unchanging property of that
+ <!--para>Once the runtime is created, the configuration is an unchanging property of that
runtime. This is because many of the jars necessary to provide for classpaths, such as the
ejb3 jar locations or the servlet jar locations, are located in deploy directories of each
configurations (depending on which version of JBoss is being used). Because of this, to
compile against a different configuration's jars, you will need to create a new runtime from
- that configuration.</para>
+ that configuration.</para-->
- <!--para>Also, because of the open-source nature of JBoss, it is likely that a user may want to
- modify and repackage some of the configuration-specific jboss jars and create their own
- configuration using those modified jars. Rather than forcing the user to copy his entire
- JBoss installation, this structure allows them to create only a new configuration instead.</para-->
-
<para>As a result of having each runtime represent a specific configuration rather than the
- server installation as a whole, it is very likely you'll create several different runtimes
+ server installation as a whole, it is very likely you'll create several different runtimes
to test each of your configurations. It becomes important to ensure your runtimes, and later
- your servers, are given descriptive names that help you remember which is which. It will do
- no good to try to remember if "JBoss-runtime 5" is the 4.0 install with ejb3? Or the 4.2
- install's custom configuration you decided to create.</para>
+ your servers, are given descriptive names that help you remember which is which.</para>
<para>Press <emphasis>
<property>Finish</property>
@@ -226,11 +208,6 @@
the previous section</link>. Here, it becomes possible to edit already existing runtime or
add a new one with necessary configuration.</para>
- <!--para>Because there may be many runtimes of each type declared, the wizard allows you to
- select which runtime you want your server to be backed by. The combo box below the view lets
- you select which declared runtime to use. For example, if there were already multiple JBoss
- 4.2 runtimes declared, the combo box would list all of the 4.2 runtimes available. </para-->
-
<figure>
<title>Installed Server Runtime Environments</title>
<mediaobject>
@@ -257,7 +234,7 @@
</mediaobject>
</figure>
- <para>Now, having JBoss server and runtime installed, we can dwell on all services and tools
+ <para>Now that we've created our runtimes and servers, we can dwell on all services and tools
that JBoss Server Manager provides.</para>
</section>
Modified: trunk/as/docs/reference/en/modules/webtools.xml
===================================================================
--- trunk/as/docs/reference/en/modules/webtools.xml 2008-01-28 16:08:02 UTC (rev 5998)
+++ trunk/as/docs/reference/en/modules/webtools.xml 2008-01-28 16:10:47 UTC (rev 5999)
@@ -2,10 +2,10 @@
<chapter id="webtools">
<title>Projects</title>
<para>The most popular of the projects we deal with are the J2EE projects, such as
- <property>Dynamic Web Project</property>, EJB Project, or EAR project. Web projects of
- JBoss Tools are Stuts, JSF and Seam projects. Thus, in this chapter we are going to tell you
+ Dynamic Web Project, EJB Project, or EAR project. Web projects of
+ JBoss Tools are Struts, JSF and Seam projects. Thus, in this chapter we are going to tell you
about facets the main benefit of which to provide proper structuring and packaging for any
- type of project to deploy on a server afterwards.</para>
+ type of project.</para>
<section>
<title>Description</title>
@@ -22,11 +22,10 @@
another. For example, an EAR project may have a Web Project child, an EJB project child,
or other types.</para>
- <para> The benefit of this is that the structure of your projects is then known, and
- packaging it up *should* be trivial. However, if your project is non-standard, or you
+ <para> However, the benefit of this is that the structure of your projects is then known, and
+ packaging it up *should* be trivial. Apparently, if your project is non-standard, or you
feel too confined by such rigid structural requirements, you can still choose to package
your project <link linkend="Project_archivesView">using the Archives plugin</link>.</para>
-
</section>
16 years, 3 months