JBoss Tools SVN: r15317 - trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-05-15 13:52:33 -0400 (Fri, 15 May 2009)
New Revision: 15317
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4322 - npe fix
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2009-05-15 17:30:14 UTC (rev 15316)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2009-05-15 17:52:33 UTC (rev 15317)
@@ -698,21 +698,29 @@
if (cu == null) {
return;
}
- if (cu.types() != null && cu.types().size() > 0 ) {
- Object tmp = cu.types().get(0);
- if (!(tmp instanceof TypeDeclaration)) {
- // ignore EnumDeclaration & AnnotationTypeDeclaration
- return;
- }
+ if (cu.types() == null || cu.types().size() == 0 ) {
+ return;
}
- String fullyQualifiedName = cu.getTypeRoot().findPrimaryType().getFullyQualifiedName();
+ Object tmp = cu.types().get(0);
+ if (!(tmp instanceof TypeDeclaration)) {
+ // ignore EnumDeclaration & AnnotationTypeDeclaration
+ return;
+ }
+ String fullyQualifiedName = null;
+ //TODO: should inspect all types in cu? so next method to get fullyQualifiedName:
+ //((TypeDeclaration)tmp).resolveBinding().getBinaryName()
+ if (cu.getTypeRoot() == null || cu.getTypeRoot().findPrimaryType() == null) {
+ //fullyQualifiedName = ((TypeDeclaration)tmp).resolveBinding().getBinaryName();
+ return;
+ } else {
+ fullyQualifiedName = cu.getTypeRoot().findPrimaryType().getFullyQualifiedName();
+ }
if (mapCUs_Info.containsKey(fullyQualifiedName)) {
return;
}
CollectEntityInfo finder = new CollectEntityInfo();
cu.accept(finder);
EntityInfo result = finder.getEntityInfo();
-
if (result != null) {
result.adjustParameters();
mapCUs_Info.put(fullyQualifiedName, result);
15 years, 4 months
JBoss Tools SVN: r15316 - in trunk/seam/tests/org.jboss.tools.seam.core.test: src/org/jboss/tools/seam/core/test/refactoring and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-05-15 13:30:14 -0400 (Fri, 15 May 2009)
New Revision: 15316
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/test.xhtml
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java
Log:
Test for https://jira.jboss.org/jira/browse/JBIDE-1077
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/test.xhtml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/test.xhtml (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/test.xhtml 2009-05-15 17:30:14 UTC (rev 15316)
@@ -0,0 +1,45 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich"
+ template="layout/template.xhtml">
+
+<ui:define name="body">
+
+ <h:messages styleClass="message"/>
+
+ <h:form id="login">
+
+ <rich:panel>
+ <f:facet name="header">Login</f:facet>
+
+ <p>Please login using any username and password</p>
+
+ <div class="dialog">
+ <h:panelGrid columns="2" rowClasses="prop" columnClasses="name,value">
+ <h:outputLabel for="username">Username</h:outputLabel>
+ <h:inputText id="username"
+ value="#{test.value}"/>
+ <h:outputLabel for="password">Password</h:outputLabel>
+ <h:inputSecret id="password"
+ value="#{identity.password}"/>
+ <h:outputLabel for="rememberMe">Remember me</h:outputLabel>
+ <h:selectBooleanCheckbox id="rememberMe"
+ value="#{identity.rememberMe}"/>
+ </h:panelGrid>
+ </div>
+
+ </rich:panel>
+
+ <div class="actionButtons">
+ <h:commandButton value="Login" action="#{identity.login}"/>
+ </div>
+
+ </h:form>
+
+ </ui:define>
+</ui:composition>
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/test.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2009-05-15 17:03:07 UTC (rev 15315)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2009-05-15 17:30:14 UTC (rev 15316)
@@ -95,6 +95,10 @@
0, 4, "best");
list.add(structure);
+ structure = new TestChangeStructure(warProject, "/WebContent/test.xhtml",
+ 1088, 4, "best");
+ list.add(structure);
+
structure = new TestChangeStructure(warProject, "/WebContent/test.jsp",
227, 4, "best");
list.add(structure);
@@ -103,18 +107,16 @@
29, 4, "best");
list.add(structure);
- structure = new TestChangeStructure(earProject, "/EarContent/test.jsp",
- 227, 4, "best");
- list.add(structure);
+// structure = new TestChangeStructure(earProject, "/EarContent/test.jsp",
+// 227, 4, "best");
+// list.add(structure);
+//
+// structure = new TestChangeStructure(earProject, "/EarContent/test.properties",
+// 29, 4, "best");
+// list.add(structure);
- structure = new TestChangeStructure(earProject, "/EarContent/test.properties",
- 29, 4, "best");
- list.add(structure);
+ /*
- /*
- structure = new TestChangeStructure("/WebContent/login.xhtml",
- 1033, 4, "best");
- list.add(structure);
*/
renameComponent(seamEjbProject, "test", "best", list);
}
15 years, 4 months
JBoss Tools SVN: r15315 - trunk/jsf/docs/userguide/en/images/visual_page.
by jbosstools-commits＠lists.jboss.org
Author: chukhutsina
Date: 2009-05-15 13:03:07 -0400 (Fri, 15 May 2009)
New Revision: 15315
Added:
trunk/jsf/docs/userguide/en/images/visual_page/source_bottom.png
trunk/jsf/docs/userguide/en/images/visual_page/source_left.png
trunk/jsf/docs/userguide/en/images/visual_page/source_right.png
trunk/jsf/docs/userguide/en/images/visual_page/source_top.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_24.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_25.png
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-720 - Vertical Spliting view is added to Visual/Source Editor. All the new functionality was described and all the screens with Visual/Source Editor were updated.</p>
</body></html>
Added: trunk/jsf/docs/userguide/en/images/visual_page/source_bottom.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/source_bottom.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/visual_page/source_left.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/source_left.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/visual_page/source_right.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/source_right.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/visual_page/source_top.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/source_top.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_24.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_24.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_25.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_25.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 4 months
JBoss Tools SVN: r15314 - trunk/jsf/docs/userguide/en/images/visual_page.
by jbosstools-commits＠lists.jboss.org
Author: chukhutsina
Date: 2009-05-15 13:01:51 -0400 (Fri, 15 May 2009)
New Revision: 15314
Modified:
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_1.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_12.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_14.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_15.png
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-720 - Vertical Spliting view is added to Visual/Source Editor. All the new functionality was described and all the screens with Visual/Source Editor were updated.</p>
</body></html>
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_1.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_12.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_14.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_15.png
===================================================================
(Binary files differ)
15 years, 4 months
JBoss Tools SVN: r15313 - in trunk/jsf/docs/userguide/en: modules and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: chukhutsina
Date: 2009-05-15 13:01:08 -0400 (Fri, 15 May 2009)
New Revision: 15313
Modified:
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_2.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_23a.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_23b.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_3.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4a.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4b.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4c.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_5.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_7a.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_8.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_9.png
trunk/jsf/docs/userguide/en/modules/editors.xml
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-720 - Vertical Spliting view is added to Visual/Source Editor. All the new functionality was described and all the screens with Visual/Source Editor were updated.</p>
</body></html>
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_2.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_23a.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_23b.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_3.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4a.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4b.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4c.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_5.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_7a.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_8.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_9.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/modules/editors.xml
===================================================================
--- trunk/jsf/docs/userguide/en/modules/editors.xml 2009-05-15 16:58:11 UTC (rev 15312)
+++ trunk/jsf/docs/userguide/en/modules/editors.xml 2009-05-15 17:01:08 UTC (rev 15313)
@@ -1238,9 +1238,9 @@
<section id="AdvancedSettings954">
<title>Advanced Settings</title>
-
- <para>In the left vertical pane of the Visual part there are three buttons: <emphasis>
- <property>Preferences</property></emphasis>
+
+ <para>In the left vertical pane of the Visual part there are four buttons: <emphasis>
+ <property>Preferences</property></emphasis>
(
<inlinemediaobject>
<imageobject>
@@ -1262,16 +1262,45 @@
</imageobject>
</inlinemediaobject>
)
- and <emphasis>
+ ,<emphasis>
<property>Page Design Options</property> </emphasis>(
- <inlinemediaobject>
- <imageobject>
- <imagedata fileref="images/visual_page/icon_3.png"/>
- </imageobject>
- </inlinemediaobject>
- )
-
- .</para>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/icon_3.png"/>
+ </imageobject>
+ </inlinemediaobject>
+ )
+ and some of the next buttons:
+ <emphasis>
+ <property>Vertical Source on top</property> </emphasis>(
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/source_top.png"/>
+ </imageobject>
+ </inlinemediaobject>),
+ <emphasis>
+ <property>Vertical Visual on top</property> </emphasis>(
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/source_bottom.png"/>
+ </imageobject>
+ </inlinemediaobject>),
+ <emphasis>
+ <property>Horizontal Source to the left</property> </emphasis>(
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/source_left.png"/>
+ </imageobject>
+ </inlinemediaobject>),
+ <emphasis>
+ <property>Horizontal Visual to the left</property> </emphasis>(
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/source_right.png"/>
+ </imageobject>
+ </inlinemediaobject>),
+ depending on the current Visual/Source layout
+ .</para>
<figure>
<title>Buttons on the Visual Part of VPE</title>
@@ -1519,7 +1548,57 @@
</mediaobject>
</figure>
</listitem>
-
+ <listitem id="splitting_buttons">
+ <para><emphasis>
+ <property>Visual/Source Editors splitting buttons</property></emphasis>
+ provide the possibility to choose one of the four possible layouts for the Visual/Source Editor.
+ </para>
+
+
+ <para>The available layouts and corresponding buttons are as follows:</para>
+ <itemizedlist>
+ <listitem><para>Vertical Source on top(<inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/source_top.png"/>
+ </imageobject>
+ </inlinemediaobject>)</para></listitem>
+ <listitem><para>Vertical Visual on top ( <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/source_bottom.png"/>
+ </imageobject>
+ </inlinemediaobject>)</para></listitem>
+ <listitem><para>Horizontal Source to the left ( <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/source_left.png"/>
+ </imageobject>
+ </inlinemediaobject>)</para></listitem>
+ <listitem><para>Horizontal Visual to the left ( <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/source_right.png"/>
+ </imageobject>
+ </inlinemediaobject>)</para></listitem>
+
+ </itemizedlist>
+ <figure>
+ <title>Visual Page Editor Before Layout Changing </title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/visual_page_24.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ Note, at the current view there is only <emphasis>
+ <property> one</property></emphasis> button, that proposes the possibility to change it in order the Source and the View are moved <emphasis>
+ <property>in a clockwise direction</property></emphasis>.
+ <figure>
+ <title>Visual Page Editor After Layout Changing </title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/visual_page_25.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </listitem>
</itemizedlist>
<para>You can find useful one more functionality provided by VPE. At the bottom of the
15 years, 4 months
JBoss Tools SVN: r15312 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-05-15 12:58:11 -0400 (Fri, 15 May 2009)
New Revision: 15312
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4263
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java 2009-05-15 16:57:12 UTC (rev 15311)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java 2009-05-15 16:58:11 UTC (rev 15312)
@@ -168,7 +168,7 @@
declarationFile = (IFile)javaDecl.getResource();
if(declarationFile != null && !coreHelper.isJar(javaDecl)){
ITextSourceReference location = ((SeamComponentDeclaration)javaDecl).getLocationFor(ISeamXmlComponentDeclaration.NAME);
- if(location != null){
+ if(location != null && !isBadLocation(location)){
TextFileChange change = getChange(declarationFile);
TextEdit edit = new ReplaceEdit(location.getStartPosition(), location.getLength(), "\""+newName+"\""); //$NON-NLS-1$ //$NON-NLS-2$
change.addEdit(edit);
15 years, 4 months
JBoss Tools SVN: r15311 - trunk/documentation/guides/GettingStartedGuide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2009-05-15 12:57:12 -0400 (Fri, 15 May 2009)
New Revision: 15311
Modified:
trunk/documentation/guides/GettingStartedGuide/en/modules/jsp_application.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-722 - necessary details about the Finger Touch button are added.
Modified: trunk/documentation/guides/GettingStartedGuide/en/modules/jsp_application.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en/modules/jsp_application.xml 2009-05-15 16:56:28 UTC (rev 15310)
+++ trunk/documentation/guides/GettingStartedGuide/en/modules/jsp_application.xml 2009-05-15 16:57:12 UTC (rev 15311)
@@ -333,7 +333,20 @@
feature of auto-redeploy. It means that you don't need to restart
<property>JBoss Server</property>. Any changes made in the application in
exploded format will trigger a redeployment on the server.</para>
+
+ <para>You can also use the "Finger touch" button for a quick restart of the project without restarting the server:</para>
+ <figure>
+ <title>Finger Touch button</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsp_application/jsp_application_19_finger_touch.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>The "Finger" touches descriptors dependent on project (i.e. web.xml for WAR, application.xml for EAR, jboss-esb.xml in ESB projects).</para>
+
</section>
+
</section>
<section id="Previewtab">
15 years, 4 months
JBoss Tools SVN: r15310 - trunk/documentation/guides/GettingStartedGuide/en/images/jsp_application.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2009-05-15 12:56:28 -0400 (Fri, 15 May 2009)
New Revision: 15310
Added:
trunk/documentation/guides/GettingStartedGuide/en/images/jsp_application/jsp_application_19_finger_touch.png
Log:
https://jira.jboss.org/jira/browse/JBDS-722 - necessary screenshot added to show the Finger Touch button.
Added: trunk/documentation/guides/GettingStartedGuide/en/images/jsp_application/jsp_application_19_finger_touch.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/guides/GettingStartedGuide/en/images/jsp_application/jsp_application_19_finger_touch.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 4 months
JBoss Tools SVN: r15309 - trunk/as/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2009-05-15 12:52:17 -0400 (Fri, 15 May 2009)
New Revision: 15309
Modified:
trunk/as/docs/reference/en/modules/modules.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-722 - the required details are relocated to make the whole story more logical.
Modified: trunk/as/docs/reference/en/modules/modules.xml
===================================================================
--- trunk/as/docs/reference/en/modules/modules.xml 2009-05-15 16:39:14 UTC (rev 15308)
+++ trunk/as/docs/reference/en/modules/modules.xml 2009-05-15 16:52:17 UTC (rev 15309)
@@ -58,16 +58,6 @@
the <link linkend="Project_archivesView">Project Archives view</link> and customize
packaging yourself.</para>
- <para>You can also use the "Finger touch" for a quick restart of the project without restarting the server:</para>
- <figure>
- <title>Finger Touch button</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/modules/modules_8_finger_touch.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>The "Finger" touches descriptors dependent on project (i.e. web.xml for WAR, application.xml for EAR, jboss-esb.xml in ESB projects).</para>
</section>
@@ -189,6 +179,19 @@
</emphasis> file, is to enable the builder for that project. This is done by either
changing the global preferences for the <property>Archives View</property>, or by
enabling project-specific preferences and ensuring the builder is on.</para>
+
+ <para>You can also use the "Finger touch" button for a quick restart of the project without restarting the server:</para>
+ <figure>
+ <title>Finger Touch button</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/modules/modules_8_finger_touch.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>The "Finger" touches descriptors dependent on project (i.e. web.xml for WAR, application.xml for EAR, jboss-esb.xml in ESB projects).</para>
+
+
<para>The last chapter covers a variety of methods on how you can deploy needed modules onto a
server.</para>
</section>
15 years, 4 months
JBoss Tools SVN: r15308 - in trunk/seam/tests/org.jboss.tools.seam.core.test: projects/Test1-ear/EarContent and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-05-15 12:39:14 -0400 (Fri, 15 May 2009)
New Revision: 15308
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/test.jsp
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/test.properties
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestComponent.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestSeamComponent.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/test.jsp
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/test.properties
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/seam.properties
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamRefactoringAllTests.java
Log:
Tests for https://jira.jboss.org/jira/browse/JBIDE-1077
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/test.jsp
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/test.jsp (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/test.jsp 2009-05-15 16:39:14 UTC (rev 15308)
@@ -0,0 +1,12 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<html>
+ <head>
+ <title></title>
+ </head>
+ <body>
+ <f:view>
+ <h:outputText value="Test value is #{test.value}!" />
+ </f:view>
+ </body>
+</html>
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/test.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/test.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/test.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/test.properties 2009-05-15 16:39:14 UTC (rev 15308)
@@ -0,0 +1 @@
+TEST_VALUE = This value is #{test.value}!
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1/WebContent/test.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/test.jsp
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/test.jsp (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/test.jsp 2009-05-15 16:39:14 UTC (rev 15308)
@@ -0,0 +1,12 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<html>
+ <head>
+ <title></title>
+ </head>
+ <body>
+ <f:view>
+ <h:outputText value="Test value is #{test.value}!" />
+ </f:view>
+ </body>
+</html>
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/test.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/test.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/test.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/test.properties 2009-05-15 16:39:14 UTC (rev 15308)
@@ -0,0 +1 @@
+TEST_VALUE = This value is #{test.value}!
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ear/EarContent/test.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestComponent.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestComponent.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestComponent.java 2009-05-15 16:39:14 UTC (rev 15308)
@@ -0,0 +1,22 @@
+package org.domain.Test1.session;
+
+import org.jboss.seam.annotations.*;
+
+@Name(value="test")
+public class TestComponent {
+
+ String password;
+
+ public Object getPart(){
+ return null;
+ }
+
+ public boolean operate(){
+ return true;
+ }
+
+ public String value(){
+ return "Default Value";
+ }
+
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestComponent.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestSeamComponent.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestSeamComponent.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestSeamComponent.java 2009-05-15 16:39:14 UTC (rev 15308)
@@ -0,0 +1,41 @@
+package org.domain.Test1.session;
+
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Logger;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Factory;
+import org.jboss.seam.log.Log;
+import org.jboss.seam.security.Identity;
+
+
+@Name("component")
+public class TestSeamComponent
+{
+ @Logger Log log;
+
+ @In Identity identity;
+
+ @In String test;
+
+ @In("test") boolean flag;
+
+ @Factory("test")
+ int getVar(){
+ return 2;
+ };
+
+ @Factory
+ String getTest(){
+ return "Test value is #{test.value}!";
+ };
+
+ public boolean authenticate()
+ {
+ log.info("authenticating #0", identity.getUsername());
+ //write your authentication logic here,
+ //return true if the authentication was
+ //successful, false otherwise
+ identity.addRole("admin");
+ return true;
+ }
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/org/domain/Test1/session/TestSeamComponent.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/seam.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/seam.properties 2009-05-15 16:38:06 UTC (rev 15307)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/ejbModule/seam.properties 2009-05-15 16:39:14 UTC (rev 15308)
@@ -0,0 +1 @@
+test.operate = Test Component Operation
\ No newline at end of file
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2009-05-15 16:38:06 UTC (rev 15307)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2009-05-15 16:39:14 UTC (rev 15308)
@@ -19,9 +19,14 @@
import junit.framework.TestCase;
public class SeamComponentRefactoringTest extends TestCase {
- static String warProjectName = "SeamWebWarTestProject";
+ static String warProjectName = "Test1";
+ static String earProjectName = "Test1-ear";
+ static String ejbProjectName = "Test1-ejb";
static IProject warProject;
+ static IProject earProject;
+ static IProject ejbProject;
static ISeamProject seamWarProject;
+ static ISeamProject seamEjbProject;
public SeamComponentRefactoringTest(){
super("Seam Component Refactoring Test");
@@ -34,62 +39,84 @@
if(seamWarProject==null) {
seamWarProject = loadSeamProject(warProject);
}
+
+ if(earProject==null) {
+ earProject = ProjectImportTestSetup.loadProject(earProjectName);
+ }
+
+ if(ejbProject==null) {
+ ejbProject = ProjectImportTestSetup.loadProject(ejbProjectName);
+ }
+ if(seamEjbProject==null) {
+ seamEjbProject = loadSeamProject(ejbProject);
+ }
}
private ISeamProject loadSeamProject(IProject project) throws CoreException {
+ JobUtils.waitForIdle();
+ System.out.println("Project - "+project);
ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true);
assertNotNull("Seam project for " + project.getName() + " is null", seamProject);
- JobUtils.waitForIdle();
+
return seamProject;
}
public void testSeamComponentRename() throws CoreException {
ArrayList<TestChangeStructure> list = new ArrayList<TestChangeStructure>();
- TestChangeStructure structure = new TestChangeStructure("/src/action/org/domain/SeamWebWarTestProject/session/TestComponent.java",
- 113, 6, "\"best\"");
+ TestChangeStructure structure = new TestChangeStructure(ejbProject.getProject(), "/ejbModule/org/domain/"+warProjectName+"/session/TestComponent.java",
+ 89, 6, "\"best\"");
list.add(structure);
-
+ /*
structure = new TestChangeStructure("/WebContent/WEB-INF/components.xml",
2660, 6, "best");
list.add(structure);
structure = new TestChangeStructure("/WebContent/WEB-INF/components.xml",
2756, 4, "best");
list.add(structure);
-
- structure = new TestChangeStructure("/src/action/org/domain/SeamWebWarTestProject/session/TestSeamComponent.java",
- 413, 0, "(\"best\")");
+ */
+ structure = new TestChangeStructure(ejbProject, "/ejbModule/org/domain/"+warProjectName+"/session/TestSeamComponent.java",
+ 420, 11, "@In(\"best\")");
list.add(structure);
- structure = new TestChangeStructure("/src/action/org/domain/SeamWebWarTestProject/session/TestSeamComponent.java",
- 436, 11, "@In(\"best\")");
+ structure = new TestChangeStructure(ejbProject, "/ejbModule/org/domain/"+warProjectName+"/session/TestSeamComponent.java",
+ 389, 8, "(\"best\")");
list.add(structure);
- structure = new TestChangeStructure("/src/action/org/domain/SeamWebWarTestProject/session/TestSeamComponent.java",
- 471, 16, "@Factory(\"best\")");
+ structure = new TestChangeStructure(ejbProject, "/ejbModule/org/domain/"+warProjectName+"/session/TestSeamComponent.java",
+ 455, 16, "@Factory(\"best\")");
list.add(structure);
- structure = new TestChangeStructure("/src/action/org/domain/SeamWebWarTestProject/session/TestSeamComponent.java",
- 545, 0, "(\"best\")");
+ structure = new TestChangeStructure(ejbProject, "/ejbModule/org/domain/"+warProjectName+"/session/TestSeamComponent.java",
+ 529, 8, "(\"best\")");
list.add(structure);
- structure = new TestChangeStructure("/src/action/org/domain/SeamWebWarTestProject/session/TestSeamComponent.java",
- 597, 4, "best");
+ structure = new TestChangeStructure(ejbProject, "/ejbModule/org/domain/"+warProjectName+"/session/TestSeamComponent.java",
+ 589, 4, "best");
list.add(structure);
- structure = new TestChangeStructure("/src/seam.properties",
+ structure = new TestChangeStructure(ejbProject, "/ejbModule/seam.properties",
0, 4, "best");
list.add(structure);
- structure = new TestChangeStructure("/WebContent/login.xhtml",
- 1033, 4, "best");
+ structure = new TestChangeStructure(warProject, "/WebContent/test.jsp",
+ 227, 4, "best");
list.add(structure);
- structure = new TestChangeStructure("/WebContent/refactoring_test.jsp",
+ structure = new TestChangeStructure(warProject, "/WebContent/test.properties",
+ 29, 4, "best");
+ list.add(structure);
+
+ structure = new TestChangeStructure(earProject, "/EarContent/test.jsp",
227, 4, "best");
list.add(structure);
- structure = new TestChangeStructure("/WebContent/test.properties",
+ structure = new TestChangeStructure(earProject, "/EarContent/test.properties",
29, 4, "best");
list.add(structure);
- renameComponent(seamWarProject, "test", "best", list);
+ /*
+ structure = new TestChangeStructure("/WebContent/login.xhtml",
+ 1033, 4, "best");
+ list.add(structure);
+ */
+ renameComponent(seamEjbProject, "test", "best", list);
}
private void renameComponent(ISeamProject seamProject, String componentName, String newName, List<TestChangeStructure> changeList) throws CoreException{
@@ -99,7 +126,7 @@
assertNotNull(component);
assertNull(seamProject.getComponent(newName));
for(TestChangeStructure changeStructure : changeList){
- IFile file = seamProject.getProject().getFile(changeStructure.getFileName());
+ IFile file = changeStructure.getProject().getFile(changeStructure.getFileName());
String content = null;
content = FileUtil.readStream(file.getContents());
assertNotSame(changeStructure.getText(), content.substring(changeStructure.getOffset(), changeStructure.getOffset()+changeStructure.getLength()));
@@ -116,26 +143,33 @@
assertNull(seamProject.getComponent(componentName));
assertNotNull(seamProject.getComponent(newName));
for(TestChangeStructure changeStructure : changeList){
- IFile file = seamProject.getProject().getFile(changeStructure.getFileName());
+ IFile file = changeStructure.getProject().getFile(changeStructure.getFileName());
String content = null;
content = FileUtil.readStream(file.getContents());
+ System.out.println("File - "+file.getName()+" offset - "+changeStructure.getOffset()+" expected - ["+changeStructure.getText()+"] actual - ["+content.substring(changeStructure.getOffset(), changeStructure.getOffset()+changeStructure.getLength())+"]");
assertEquals(changeStructure.getText(), content.substring(changeStructure.getOffset(), changeStructure.getOffset()+changeStructure.getLength()));
}
}
class TestChangeStructure{
+ private IProject project;
private String fileName;
private int offset;
private int length;
private String text;
- public TestChangeStructure(String fileName, int offset, int length, String text){
+ public TestChangeStructure(IProject project, String fileName, int offset, int length, String text){
+ this.project = project;
this.fileName = fileName;
this.offset = offset;
this.length = length;
this.text = text;
}
+ public IProject getProject(){
+ return project;
+ }
+
public String getFileName(){
return fileName;
}
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamRefactoringAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamRefactoringAllTests.java 2009-05-15 16:38:06 UTC (rev 15307)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamRefactoringAllTests.java 2009-05-15 16:39:14 UTC (rev 15308)
@@ -28,8 +28,8 @@
new String[]{"RefactoringTestProject-war", "RefactoringTestProject-ejb", "RefactoringTestProject-test"}));
suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamComponentRefactoringTest.class),
"org.jboss.tools.seam.core.test",
- new String[]{"projects/SeamWebWarTestProject"},
- new String[]{"SeamWebWarTestProject"}));
+ new String[]{"projects/Test1","projects/Test1-ear","projects/Test1-ejb"},
+ new String[]{"Test1","Test1-ear","Test1-ejb"}));
return suite;
}
}
\ No newline at end of file
15 years, 4 months