August 2010 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r23976 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2010-08-06 13:50:45 -0400 (Fri, 06 Aug 2010) New Revision: 23976 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java Log: https://jira.jboss.org/browse/JBIDE-6787 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2010-08-06 15:26:46 UTC (rev 23975) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2010-08-06 17:50:45 UTC (rev 23976) @@ -965,6 +965,7 @@ * */ public void finishPressed() { + setCodeGenerationProperties(); model.removeListener(validatorDelegate); };

15 years, 5 months

1
0
0 / 0

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

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2010-08-06 11:26:46 -0400 (Fri, 06 Aug 2010) New Revision: 23975 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurations.java Log: https://jira.jboss.org/browse/JBIDE-6763 - fixed Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurations.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurations.java 2010-08-06 15:26:26 UTC (rev 23974) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurations.java 2010-08-06 15:26:46 UTC (rev 23975) @@ -221,7 +221,7 @@ public ConsoleConfiguration[] getConfigurationsSortedByName() { return getConfigurations(new Comparator<ConsoleConfiguration>() { public int compare(ConsoleConfiguration o1, ConsoleConfiguration o2) { - return o1.getName().compareTo(o2.getName()); + return o1.getName().compareToIgnoreCase(o2.getName()); } }); }

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r23974 - trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2010-08-06 11:26:26 -0400 (Fri, 06 Aug 2010) New Revision: 23974 Removed: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/.springBeans Log: https://jira.jboss.org/browse/JBIDE-6711 : Spring templates for VPE - minor: a file committed by a mistake is removed Deleted: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/.springBeans =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/.springBeans 2010-08-06 15:25:22 UTC (rev 23973) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/.springBeans 2010-08-06 15:26:26 UTC (rev 23974) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<beansProjectDescription> - <version>1</version> - <pluginVersion><![CDATA[2.3.1.201003090936-RELEASE]]></pluginVersion> - <configSuffixes> - <configSuffix><![CDATA[xml]]></configSuffix> - </configSuffixes> - <enableImports><![CDATA[true]]></enableImports> - <configs> - <config>src/main/resources/META-INF/spring/integration.xml</config> - <config>src/main/resources/META-INF/spring/security.xml</config> - <config>src/main/resources/META-INF/spring/theorchid/controllers.xml</config> - </configs> - <configSets> - </configSets> -</beansProjectDescription>

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r23973 - trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2010-08-06 11:25:22 -0400 (Fri, 06 Aug 2010) New Revision: 23973 Removed: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/springapp-servlet.xml Log: https://jira.jboss.org/browse/JBIDE-6711 : Spring templates for VPE - minor: a file committed by a mistake is removed Deleted: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/springapp-servlet.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/springapp-servlet.xml 2010-08-06 15:09:47 UTC (rev 23972) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/springapp-servlet.xml 2010-08-06 15:25:22 UTC (rev 23973) @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> - -  - - <bean name="/form.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/checkbox.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/checkboxes.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/radiobutton.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/radiobuttons.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/option.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/options.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/eval.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/errors.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> - <property name="validator" ref="userValidator"/> - </bean> - <bean name="/bind.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> - <property name="validator" ref="userValidator"/> - </bean> - <bean name="/hasBindErrors.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> - <property name="validator" ref="beanValidator"/> - </bean> - <bean name="/nestedPath.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> - <property name="validator" ref="userValidator"/> - </bean> - <bean name="/select.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/escapeBody.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/url.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/authorize.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/authentication.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/accesscontrollist.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - - <bean id="userValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.UserValidator"/> - <bean id="beanValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.BeanValidator"/> - - <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver"> - <property name="prefix" value="/WEB-INF/jsp/"></property> - <property name="suffix" value=".jsp"></property> - </bean> -</beans>

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r23972 - in trunk/vpe: tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2010-08-06 11:09:47 -0400 (Fri, 06 Aug 2010) New Revision: 23972 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/bind.jsp.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/hasBindErrors.jsp.xml Log: https://jira.jboss.org/browse/JBIDE-6711 : Spring templates for VPE - spring:bind tag is changed Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml 2010-08-06 14:53:47 UTC (rev 23971) +++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml 2010-08-06 15:09:47 UTC (rev 23972) @@ -424,13 +424,6 @@ </vpe:tag> <vpe:tag name="spring:bind" case-sensitive="yes"> - <vpe:if test="attrpresent('path')"> - <vpe:template children="yes" modify="yes"> - <span class="vpe-text"> - <vpe:value expr="{@path}<=" /> - </span> - </vpe:template> - </vpe:if> <vpe:template children="yes" modify="yes"> <span class="vpe-text"/> </vpe:template> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/bind.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/bind.jsp.xml 2010-08-06 14:53:47 UTC (rev 23971) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/bind.jsp.xml 2010-08-06 15:09:47 UTC (rev 23972) @@ -2,7 +2,6 @@ <test id="validationBinding"> <div id="validationBinding"> <span class="vpe-text"> - user.lastName<= <font color="red"> <b> <span class="vpe-text"> @@ -16,7 +15,6 @@ <test id="outputBinding"> <div id="outputBinding"> <span class="vpe-text"> - selectedCategory<= <span class="vpe-text"> ${status.value} </span> @@ -26,7 +24,6 @@ <test id="inputBinding"> <div id="inputBinding"> <span class="vpe-text"> - selectedCategory<= <input type="text" value="${status.value}" /> </span> </div> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/hasBindErrors.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/hasBindErrors.jsp.xml 2010-08-06 14:53:47 UTC (rev 23971) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/hasBindErrors.jsp.xml 2010-08-06 15:09:47 UTC (rev 23972) @@ -42,7 +42,6 @@ <DIV CLASS="error"> <UL> <SPAN CLASS="vpe-text"> - formBean.user.*<= <SPAN CLASS="vpe-text"> <LI> <SPAN CLASS="vpe-text">

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r23971 - in trunk/vpe/tests/org.jboss.tools.vpe.spring.test: resources/SpringTest/src/main/webapp and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2010-08-06 10:53:47 -0400 (Fri, 06 Aug 2010) New Revision: 23971 Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/springapp-servlet.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/accesscontrollist.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/accesscontrollist.jsp.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authentication.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authentication.jsp.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authorize.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authorize.jsp.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/root-context.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/security.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/springapp-servlet.xml Removed: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/web.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java Log: https://jira.jboss.org/browse/JBIDE-6711 : Spring templates for VPE - JUnit tests for VPE spring security tags Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/springapp-servlet.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/springapp-servlet.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/springapp-servlet.xml 2010-08-06 14:53:47 UTC (rev 23971) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> + +  + + <bean name="/form.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/checkbox.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/checkboxes.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/radiobutton.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/radiobuttons.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/option.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/options.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/eval.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/errors.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> + <property name="validator" ref="userValidator"/> + </bean> + <bean name="/bind.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> + <property name="validator" ref="userValidator"/> + </bean> + <bean name="/hasBindErrors.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> + <property name="validator" ref="beanValidator"/> + </bean> + <bean name="/nestedPath.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> + <property name="validator" ref="userValidator"/> + </bean> + <bean name="/select.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/escapeBody.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/url.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/authorize.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/authentication.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/accesscontrollist.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + + <bean id="userValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.UserValidator"/> + <bean id="beanValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.BeanValidator"/> + + <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver"> + <property name="prefix" value="/WEB-INF/jsp/"></property> + <property name="suffix" value=".jsp"></property> + </bean> +</beans> Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/accesscontrollist.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/accesscontrollist.jsp (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/accesscontrollist.jsp 2010-08-06 14:53:47 UTC (rev 23971) @@ -0,0 +1,13 @@ +<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> +</head> +<body> + <div id="accesscontrollist1"> + <security:accesscontrollist hasPermission="1,2" domainObject="formBean"> + This will be shown if the user has either of the permissions represented by the values "1" or "2" on the given object. + </security:accesscontrollist> + </div> +</body> +</html> Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/accesscontrollist.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/accesscontrollist.jsp.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/accesscontrollist.jsp.xml 2010-08-06 14:53:47 UTC (rev 23971) @@ -0,0 +1,9 @@ +<tests> + <test id="accesscontrollist1"> + <DIV ID="accesscontrollist1"> + <DIV> + <SPAN CLASS="vpe-text">This will be shown if the user has either of the permissions represented by the values "1" or "2" on the given object.</SPAN> + </DIV> + </DIV> + </test> +</tests> Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authentication.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authentication.jsp (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authentication.jsp 2010-08-06 14:53:47 UTC (rev 23971) @@ -0,0 +1,11 @@ +<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> +</head> +<body> + <div> + Your name is <b id="authentication1"><security:authentication property="principal" /></b>. + </div> +</body> +</html> \ No newline at end of file Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authentication.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authentication.jsp.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authentication.jsp.xml 2010-08-06 14:53:47 UTC (rev 23971) @@ -0,0 +1,7 @@ +<tests> + <test id="authentication1"> + <B ID="authentication1"> + <SPAN CLASS="vpe-text">principal</SPAN> + </B> + </test> +</tests> \ No newline at end of file Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authorize.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authorize.jsp (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authorize.jsp 2010-08-06 14:53:47 UTC (rev 23971) @@ -0,0 +1,18 @@ +<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> +</head> +<body> + <div id="authorize1"> + <security:authorize ifAllGranted="ROLE_USER"> + <a href="#">Logout</a> + </security:authorize> + </div> + <div id="authorize2"> + <security:authorize ifAllGranted="ROLE_ANONYMOUS"> + <a href="#">Login</a> + </security:authorize> + </div> +</body> +</html> \ No newline at end of file Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authorize.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authorize.jsp.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authorize.jsp.xml 2010-08-06 14:53:47 UTC (rev 23971) @@ -0,0 +1,16 @@ +<tests> + <test id="authorize1"> + <DIV ID="authorize1"> + <DIV><A> + <SPAN CLASS="vpe-text">Logout</SPAN></A> + </DIV> + </DIV> + </test> + <test id="authorize2"> + <DIV ID="authorize2"> + <DIV> + <A><SPAN CLASS="vpe-text">Login</SPAN></A> + </DIV> + </DIV> + </test> +</tests> \ No newline at end of file Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/root-context.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/root-context.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/root-context.xml 2010-08-06 14:53:47 UTC (rev 23971) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:context="http://www.springframework.org/schema/context" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> + +  + +  + <import resource="security.xml" /> +</beans> Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/security.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/security.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/security.xml 2010-08-06 14:53:47 UTC (rev 23971) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans:beans xmlns="http://www.springframework.org/schema/security" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:beans="http://www.springframework.org/schema/beans" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd"> + + <http auto-config="true"> +  + <anonymous username="guest" granted-authority="ROLE_ANONYMOUS" /> + <intercept-url pattern="/**" access="ROLE_ANONYMOUS" /> + </http> + +  + <authentication-manager> + <authentication-provider> + <password-encoder hash="md5" /> + <user-service> + <user name="keith" password="417c7382b16c395bc25b5da1398cf076" authorities="ROLE_USER, ROLE_SUPERVISOR" /> + <user name="erwin" password="12430911a8af075c6f41c6976af22b09" authorities="ROLE_USER, ROLE_SUPERVISOR" /> + <user name="jeremy" password="57c6cbff0d421449be820763f03139eb" authorities="ROLE_USER" /> + <user name="scott" password="942f2339bf50796de535a384f0d1af3e" authorities="ROLE_USER" /> + </user-service> + </authentication-provider> + </authentication-manager> +</beans:beans> Copied: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/springapp-servlet.xml (from rev 23970, trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/springapp-servlet.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/springapp-servlet.xml 2010-08-06 14:53:47 UTC (rev 23971) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> + +  + + <bean name="/form.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/checkbox.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/checkboxes.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/radiobutton.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/radiobuttons.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/option.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/options.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/eval.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/errors.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> + <property name="validator" ref="userValidator"/> + <property name="successView" value="errors"/> + </bean> + <bean name="/bind.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> + <property name="validator" ref="userValidator"/> + <property name="successView" value="bind"/> + </bean> + <bean name="/hasBindErrors.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> + <property name="validator" ref="beanValidator"/> + <property name="successView" value="hasBindErrors"/> + </bean> + <bean name="/nestedPath.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> + <property name="validator" ref="userValidator"/> + <property name="successView" value="nestedPath"/> + </bean> + <bean name="/transform.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.DayOfWeekFormController"/> + <bean name="/select.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/escapeBody.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/url.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/htmlEscape.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + + <bean name="/authorize.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/authentication.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/accesscontrollist.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + + <bean id="userValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.UserValidator"/> + <bean id="beanValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.BeanValidator"/> + + <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver"> + <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"></property> + <property name="prefix" value="/WEB-INF/jsp/"></property> + <property name="suffix" value=".jsp"></property> + </bean> +</beans> Deleted: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml 2010-08-06 13:19:19 UTC (rev 23970) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml 2010-08-06 14:53:47 UTC (rev 23971) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> - -  - - <bean name="/form.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/checkbox.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/checkboxes.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/radiobutton.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/radiobuttons.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/option.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/options.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/eval.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/errors.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> - <property name="validator" ref="userValidator"/> - <property name="successView" value="errors"/> - </bean> - <bean name="/bind.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> - <property name="validator" ref="userValidator"/> - <property name="successView" value="bind"/> - </bean> - <bean name="/hasBindErrors.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> - <property name="validator" ref="beanValidator"/> - <property name="successView" value="hasBindErrors"/> - </bean> - <bean name="/nestedPath.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> - <property name="validator" ref="userValidator"/> - <property name="successView" value="nestedPath"/> - </bean> - <bean name="/transform.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.DayOfWeekFormController"/> - <bean name="/select.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/escapeBody.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/url.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/htmlEscape.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean id="userValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.UserValidator"/> - <bean id="beanValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.BeanValidator"/> - - <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver"> - <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"></property> - <property name="prefix" value="/WEB-INF/jsp/"></property> - <property name="suffix" value=".jsp"></property> - </bean> -</beans> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/web.xml 2010-08-06 13:19:19 UTC (rev 23970) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/web.xml 2010-08-06 14:53:47 UTC (rev 23971) @@ -1,26 +1,53 @@ <?xml version="1.0" encoding="UTF-8"?> -<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.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"> + +  + <context-param> + <param-name>contextConfigLocation</param-name> + <param-value>/WEB-INF/spring/root-context.xml</param-value> + </context-param> - <servlet> - <servlet-name>springapp</servlet-name> - <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> + <servlet> + <servlet-name>springapp</servlet-name> + <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> + <init-param> + <param-name>contextConfigLocation</param-name> + <param-value>/WEB-INF/spring/springapp-servlet.xml</param-value> + </init-param> + <load-on-startup>1</load-on-startup> + </servlet> + +  + <listener> + <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> + </listener> - <servlet-mapping> - <servlet-name>springapp</servlet-name> - <url-pattern>*.htm</url-pattern> - </servlet-mapping> + <servlet-mapping> + <servlet-name>springapp</servlet-name> + <url-pattern>*.htm</url-pattern> + </servlet-mapping> - <welcome-file-list> - <welcome-file> +  + <filter> + <filter-name>springSecurity</filter-name> + <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class> + <init-param> + <param-name>targetBeanName</param-name> + <param-value>springSecurityFilterChain</param-value> + </init-param> + </filter> + <filter-mapping> + <filter-name>springSecurity</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <welcome-file-list> + <welcome-file> index.jsp </welcome-file> - </welcome-file-list> - + </welcome-file-list> </web-app> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp 2010-08-06 13:19:19 UTC (rev 23970) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp 2010-08-06 14:53:47 UTC (rev 23971) @@ -28,4 +28,7 @@ <br/> <a href="htmlEscape.htm">htmlEscape.htm</a> <br/> - +<a href="authorize.htm">authorize.htm</a> +<br/> +<a href="authentication.htm">authentication.htm</a> +<br/> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-08-06 13:19:19 UTC (rev 23970) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-08-06 14:53:47 UTC (rev 23971) @@ -116,7 +116,19 @@ public void testUrl() throws Throwable { performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/url.jsp"); //$NON-NLS-1$ } + + public void testAuthorize() throws Throwable { + performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/authorize.jsp"); //$NON-NLS-1$ + } + + public void testAuthentication() throws Throwable { + performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/authentication.jsp"); //$NON-NLS-1$ + } + public void testAccesscontrollist() throws Throwable { + performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/accesscontrollist.jsp"); //$NON-NLS-1$ + } + public void testTransform() throws Throwable { performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/transform.jsp"); //$NON-NLS-1$ }

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r23970 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse: console and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2010-08-06 09:19:19 -0400 (Fri, 06 Aug 2010) New Revision: 23970 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/codegen/ExportAntCodeGenWizardPage.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java Log: https://jira.jboss.org/browse/JBIDE-6750 - fixed Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/codegen/ExportAntCodeGenWizardPage.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/codegen/ExportAntCodeGenWizardPage.java 2010-08-06 13:18:57 UTC (rev 23969) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/codegen/ExportAntCodeGenWizardPage.java 2010-08-06 13:19:19 UTC (rev 23970) @@ -18,6 +18,7 @@ import org.eclipse.jdt.internal.ui.wizards.dialogfields.ComboDialogField; import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField; import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener; +import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -29,6 +30,7 @@ import org.hibernate.eclipse.console.HibernateConsoleMessages; import org.hibernate.eclipse.console.utils.LaunchHelper; import org.hibernate.eclipse.launch.CodeGenXMLFactory; +import org.hibernate.eclipse.launch.ExporterAttributes; /** * @author Vitali Yemialyanchyk @@ -114,10 +116,34 @@ if (consoleConfigurationName.getSelectionIndex() == -1) { setErrorMessage(HibernateConsoleMessages.ExportAntCodeGenWizardPage_empty_hibernate_code_generation_configuration); res = false; + } else { + ILaunchConfiguration lc = getSelectedLaunchConfig(); + if (lc == null) { + setErrorMessage(HibernateConsoleMessages.ExportAntCodeGenWizardPage_cannot_find_selected_hibernate_code_generation_configuration); + res = false; + } else { + String checkMessage = checkCodeGenLaunchConfig(lc); + if (checkMessage != null) { + checkMessage = HibernateConsoleMessages.ExportAntCodeGenWizardPage_error_in_hibernate_code_generation_configuration + + " " + checkMessage; //$NON-NLS-1$ + setMessage(checkMessage, IMessageProvider.WARNING); + } + } } } return res; } + + protected String checkCodeGenLaunchConfig(ILaunchConfiguration lc) { + String checkMessage = null; + try { + ExporterAttributes attributes = new ExporterAttributes(lc); + checkMessage = attributes.checkExporterAttributes(); + } catch (CoreException e) { + checkMessage = e.getMessage(); + } + return checkMessage; + } public ILaunchConfiguration getSelectedLaunchConfig() { ILaunchConfiguration[] launchCfgs; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2010-08-06 13:18:57 UTC (rev 23969) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2010-08-06 13:19:19 UTC (rev 23970) @@ -521,6 +521,8 @@ public static String ExportAntCodeGenWizard_page_name; public static String ExportAntCodeGenWizardPage_hibernate_code_generation_configurations; public static String ExportAntCodeGenWizardPage_empty_hibernate_code_generation_configuration; + public static String ExportAntCodeGenWizardPage_cannot_find_selected_hibernate_code_generation_configuration; + public static String ExportAntCodeGenWizardPage_error_in_hibernate_code_generation_configuration; // static { // initialize resource bundle Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2010-08-06 13:18:57 UTC (rev 23969) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2010-08-06 13:19:19 UTC (rev 23970) @@ -521,3 +521,5 @@ ExportAntCodeGenWizard_page_name=Export Hibernate Code Generation Configuration to Ant Script ExportAntCodeGenWizardPage_hibernate_code_generation_configurations=Hibernate Code Generation Configurations: ExportAntCodeGenWizardPage_empty_hibernate_code_generation_configuration=Hibernate Code Generation Configuration is empty +ExportAntCodeGenWizardPage_cannot_find_selected_hibernate_code_generation_configuration=Can't find selected Hibernate Code Generation Configuration +ExportAntCodeGenWizardPage_error_in_hibernate_code_generation_configuration=Error in Hibernate Code Generation Configuration: Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java 2010-08-06 13:18:57 UTC (rev 23969) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java 2010-08-06 13:19:19 UTC (rev 23970) @@ -113,7 +113,8 @@ // String hibernatePropFile = null; String generateHibernatePropeties = null; - String connProfileName = consoleConfigPrefs.getConnectionProfileName(); + String connProfileName = consoleConfigPrefs == null ? null : + consoleConfigPrefs.getConnectionProfileName(); if (!isEmpty(connProfileName)) { IConnectionProfile profile = ProfileManager.getInstance().getProfileByName(connProfileName); if (profile != null) { @@ -217,12 +218,13 @@ if (attributes.isUseOwnTemplates()) { hibernatetool.addAttribute(CodeGenerationStrings.TEMPLATEPATH, templatePath); } - // - if (StringHelper.isNotEmpty(hibernatePropFile)) { - rootConsoleConfig.addAttribute(ConfigurationXMLStrings.PROPERTYFILE, hibernatePropFile); + if (rootConsoleConfig != null) { + if (StringHelper.isNotEmpty(hibernatePropFile)) { + rootConsoleConfig.addAttribute(ConfigurationXMLStrings.PROPERTYFILE, hibernatePropFile); + } + // add hibernate console configuration + hibernatetool.content().add(rootConsoleConfig); } - // add hibernate console configuration - hibernatetool.content().add(rootConsoleConfig); // // the path there are user classes Element classpath = hibernatetool.addElement(CodeGenerationStrings.CLASSPATH); @@ -311,6 +313,9 @@ public ConsoleConfigurationPreferences getConsoleConfigPreferences(String consoleConfigName) { ConsoleConfiguration consoleConfig = KnownConfigurations.getInstance().find(consoleConfigName); + if (consoleConfig == null) { + return null; + } return consoleConfig.getPreferences(); } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java 2010-08-06 13:18:57 UTC (rev 23969) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java 2010-08-06 13:19:19 UTC (rev 23970) @@ -47,9 +47,11 @@ import java.util.Set; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; +import org.eclipse.jdt.core.JavaConventions; import org.eclipse.osgi.util.NLS; import org.hibernate.console.HibernateConsoleRuntimeException; import org.hibernate.eclipse.console.ExtensionManager; @@ -351,4 +353,38 @@ return autoOneToOneDetection; } + /** + * Check exporter attributes and return message with description what is wrong with attributes. + * + * @return message + */ + public String checkExporterAttributes() { + String msg = null; + boolean notSelected = consoleConfigurationName == null || consoleConfigurationName.length() <= 0; + if (notSelected) { + msg = HibernateConsoleMessages.CodeGenerationSettingsTab_console_cfg_must_be_specified; + } + if (msg == null) { + msg = PathHelper.checkDirectory(outputPath, HibernateConsoleMessages.CodeGenerationSettingsTab_output_directory, true); + } + if (msg == null) { + if (reverseEngineer && packageName.length() > 0) { + IStatus val= JavaConventions.validatePackageName(packageName); + if (val.getSeverity() == IStatus.ERROR || val.getSeverity() == IStatus.WARNING) { + msg = val.getMessage(); + } + } + } + if (msg == null) { + if (reverseEngineer && revengSettings.trim().length() > 0) { + msg = PathHelper.checkFile(revengSettings, HibernateConsoleMessages.CodeGenerationSettingsTab_reveng_xml_3, true); + } + } + if (msg == null) { + if (useOwnTemplates) { + msg = PathHelper.checkDirectory(templatePath, HibernateConsoleMessages.CodeGenerationSettingsTab_template_dir, true); + } + } + return msg; + } }

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r23969 - in trunk/hibernatetools: plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2010-08-06 09:18:57 -0400 (Fri, 06 Aug 2010) New Revision: 23969 Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenNullable_test1.xml trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenNullable_test2.xml Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/PreferencesClassPathUtils.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java Log: https://jira.jboss.org/browse/JBIDE-6750 - fixed Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java 2010-08-06 12:31:01 UTC (rev 23968) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java 2010-08-06 13:18:57 UTC (rev 23969) @@ -41,10 +41,6 @@ this.additional = additional; } - public ConsoleConfigurationPreferences getPreferences() { - return prefs; - } - public Document createXML() { Document res = DocumentFactory.getInstance().createDocument(); Element root = createRoot(); @@ -53,13 +49,12 @@ } public Element createRoot() { + if (prefs == null) { + return null; + } + @SuppressWarnings("unused") Properties properties = prefs.getProperties(); - Element root = createRoot(properties); - return root; - } - - protected Element createRoot(Properties properties) { - String rootName = null; + String rootName = "undef"; //$NON-NLS-1$ Boolean jdbcConfig = Boolean.valueOf(additional.getProperty(ConfigurationXMLStrings.ISREVENG, "false")); //$NON-NLS-1$ if (jdbcConfig) { rootName = ConfigurationXMLStrings.JDBCCONFIGURATION; @@ -69,15 +64,13 @@ rootName = ConfigurationXMLStrings.JPACONFIGURATION; } else if (prefs.getConfigurationMode().equals(ConfigurationMode.CORE)) { rootName = ConfigurationXMLStrings.CONFIGURATION; - } else { - rootName = "undef"; //$NON-NLS-1$ } Element root = DocumentFactory.getInstance().createElement(rootName); - updateAttr(root, file2Str(getPreferences().getConfigXMLFile()), ConfigurationXMLStrings.CONFIGURATIONFILE); - updateAttr(root, file2Str(getPreferences().getPropertyFile()), ConfigurationXMLStrings.PROPERTYFILE); - updateAttr(root, getPreferences().getEntityResolverName(), ConfigurationXMLStrings.ENTITYRESOLVER); - updateAttr(root, getPreferences().getNamingStrategy(), ConfigurationXMLStrings.NAMINGSTRATEGY); - updateAttr(root, getPreferences().getPersistenceUnitName(), ConfigurationXMLStrings.PERSISTENCEUNIT); + updateAttr(root, file2Str(prefs.getConfigXMLFile()), ConfigurationXMLStrings.CONFIGURATIONFILE); + updateAttr(root, file2Str(prefs.getPropertyFile()), ConfigurationXMLStrings.PROPERTYFILE); + updateAttr(root, prefs.getEntityResolverName(), ConfigurationXMLStrings.ENTITYRESOLVER); + updateAttr(root, prefs.getNamingStrategy(), ConfigurationXMLStrings.NAMINGSTRATEGY); + updateAttr(root, prefs.getPersistenceUnitName(), ConfigurationXMLStrings.PERSISTENCEUNIT); updateAttr(root, additional, ConfigurationXMLStrings.DETECTMANYTOMANY); updateAttr(root, additional, ConfigurationXMLStrings.DETECTONTTOONE); updateAttr(root, additional, ConfigurationXMLStrings.DETECTOPTIMISTICLOCK); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/PreferencesClassPathUtils.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/PreferencesClassPathUtils.java 2010-08-06 12:31:01 UTC (rev 23968) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/PreferencesClassPathUtils.java 2010-08-06 13:18:57 UTC (rev 23969) @@ -23,9 +23,11 @@ * get custom classpath URLs */ public static URL[] getCustomClassPathURLs(ConsoleConfigurationPreferences prefs) { - URL[] customClassPathURLsTmp = prefs.getCustomClassPathURLS(); + URL[] customClassPathURLsTmp = prefs == null ? new URL[0] : + prefs.getCustomClassPathURLS(); URL[] customClassPathURLs = null; - String driverURL = ConnectionProfileUtil.getConnectionProfileDriverURL(prefs.getConnectionProfileName()); + String driverURL = prefs == null ? null : + ConnectionProfileUtil.getConnectionProfileDriverURL(prefs.getConnectionProfileName()); URL[] urls = null; if (driverURL != null) { String[] driverURLParts = driverURL.split(";"); //$NON-NLS-1$ Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenNullable_test1.xml =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenNullable_test1.xml (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenNullable_test1.xml 2010-08-06 13:18:57 UTC (rev 23969) @@ -0,0 +1,35 @@ +<project name="CodeGen" default="hibernateAntCodeGeneration"> + <property name="build.dir" location="reslocation/test"/> + <path id="toolslib"/> + <target name="hibernateAntCodeGeneration"> + <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/> + <hibernatetool destdir="${build.dir}"> + <classpath> + <path location="${build.dir}"/> + </classpath> + <hbm2doc> + <property key="ejb3" value="false"/> + <property key="jdk5" value="false"/> + </hbm2doc> + <hbm2cfgxml> + <property key="jdk5" value="false"/> + </hbm2cfgxml> + <hbm2hbmxml> + <property key="ejb3" value="false"/> + <property key="jdk5" value="false"/> + </hbm2hbmxml> + <hbmtemplate> + <property key="ejb3" value="false"/> + <property key="jdk5" value="false"/> + </hbmtemplate> + <hbm2java destdir="outputdir/test"> + <property key="keyXXX" value="valueYYY"/> + </hbm2java> + <hbm2ddl> + <property key="ejb3" value="false"/> + <property key="jdk5" value="false"/> + </hbm2ddl> + <hbm2dao/> + </hibernatetool> + </target> +</project> \ No newline at end of file Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenNullable_test2.xml =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenNullable_test2.xml (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenNullable_test2.xml 2010-08-06 13:18:57 UTC (rev 23969) @@ -0,0 +1,15 @@ +<project name="CodeGen" default="hibernateAntCodeGeneration"> + <property name="build.dir" location="reslocation/test"/> + <path id="toolslib"/> + <target name="hibernateAntCodeGeneration"> + <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/> + <hibernatetool destdir="${build.dir}"> + <classpath> + <path location="${build.dir}"/> + </classpath> + <hbm2java destdir="outputdir/test"> + <property key="keyXXX" value="valueYYY"/> + </hbm2java> + </hibernatetool> + </target> +</project> \ No newline at end of file Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java 2010-08-06 12:31:01 UTC (rev 23968) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java 2010-08-06 13:18:57 UTC (rev 23969) @@ -108,21 +108,27 @@ } } + public enum ETestCase { + simple, + jpa, + nullable, + } + public class CodeGenXMLFactory4Test extends CodeGenXMLFactory { - protected boolean jpa = false; + protected ETestCase testCase = ETestCase.simple; - public CodeGenXMLFactory4Test(ILaunchConfiguration lc, boolean jpa) { + public CodeGenXMLFactory4Test(ILaunchConfiguration lc, ETestCase testCase) { super(lc); - this.jpa = jpa; + this.testCase = testCase; } public ConsoleConfigurationPreferences getConsoleConfigPreferences(String consoleConfigName) { - ConsoleConfigurationPreferences pref; - if (jpa) { + ConsoleConfigurationPreferences pref = null; + if (testCase == ETestCase.simple) { + pref = new TestConsoleConfigPref(); + } else if (testCase == ETestCase.jpa) { pref = new TestConsoleConfigPref2(); - } else { - pref = new TestConsoleConfigPref(); } return pref; } @@ -137,42 +143,56 @@ } public void testCodeGenXMLFactoryRevengAll() { - String codeGen = codeGenXMLFactory(true, true, false); + String codeGen = codeGenXMLFactory(true, true, ETestCase.simple); String specimen = getSample("AntCodeGenReveng_test1.xml"); //$NON-NLS-1$ assertEquals(specimen.trim(), codeGen.replaceAll("\n", "\r\n")); //$NON-NLS-1$ //$NON-NLS-2$ } public void testCodeGenXMLFactoryRevengOne() { - String codeGen = codeGenXMLFactory(true, false, false); + String codeGen = codeGenXMLFactory(true, false, ETestCase.simple); String sample = getSample("AntCodeGenReveng_test2.xml"); //$NON-NLS-1$ assertEquals(sample.trim(), codeGen.replaceAll("\n", "\r\n")); //$NON-NLS-1$ //$NON-NLS-2$ } public void testCodeGenXMLFactoryAll() { - String codeGen = codeGenXMLFactory(false, true, false); + String codeGen = codeGenXMLFactory(false, true, ETestCase.simple); String sample = getSample("AntCodeGen_test1.xml"); //$NON-NLS-1$ assertEquals(sample.trim(), codeGen.replaceAll("\n", "\r\n")); //$NON-NLS-1$ //$NON-NLS-2$ } public void testCodeGenXMLFactoryOne() { - String codeGen = codeGenXMLFactory(false, false, false); + String codeGen = codeGenXMLFactory(false, false, ETestCase.simple); String sample = getSample("AntCodeGen_test2.xml"); //$NON-NLS-1$ assertEquals(sample.trim(), codeGen.replaceAll("\n", "\r\n")); //$NON-NLS-1$ //$NON-NLS-2$ } public void testCodeGenXMLFactoryJpaAll() { - String codeGen = codeGenXMLFactory(false, true, true); + String codeGen = codeGenXMLFactory(false, true, ETestCase.jpa); codeGen = updatePaths(codeGen); String sample = getSample("AntCodeGenJpa_test1.xml"); //$NON-NLS-1$ assertEquals(sample.trim(), codeGen.replaceAll("\n", "\r\n")); //$NON-NLS-1$ //$NON-NLS-2$ } public void testCodeGenXMLFactoryJpaOne() { - String codeGen = codeGenXMLFactory(false, false, true); + String codeGen = codeGenXMLFactory(false, false, ETestCase.jpa); codeGen = updatePaths(codeGen); String sample = getSample("AntCodeGenJpa_test2.xml"); //$NON-NLS-1$ assertEquals(sample.trim(), codeGen.replaceAll("\n", "\r\n")); //$NON-NLS-1$ //$NON-NLS-2$ } + + public void testCodeGenXMLFactoryNullableAll() { + String codeGen = codeGenXMLFactory(false, true, ETestCase.nullable); + codeGen = updatePaths(codeGen); + String sample = getSample("AntCodeGenNullable_test1.xml"); //$NON-NLS-1$ + assertEquals(sample.trim(), codeGen.replaceAll("\n", "\r\n")); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testCodeGenXMLFactoryNullableOne() { + String codeGen = codeGenXMLFactory(false, false, ETestCase.nullable); + codeGen = updatePaths(codeGen); + String sample = getSample("AntCodeGenNullable_test2.xml"); //$NON-NLS-1$ + assertEquals(sample.trim(), codeGen.replaceAll("\n", "\r\n")); //$NON-NLS-1$ //$NON-NLS-2$ + } public String updatePaths(String codeGen) { String repl = ""; //$NON-NLS-1$ @@ -185,14 +205,14 @@ return codeGen.replace(repl + File.separator, ""); //$NON-NLS-1$ } - public String codeGenXMLFactory(boolean reveng, boolean exportersAll, boolean jpa) { + public String codeGenXMLFactory(boolean reveng, boolean exportersAll, ETestCase testCase) { Map<String, ExporterDefinition> exDefinitions = ExtensionManager.findExporterDefinitionsAsMap(); Map<String, Object> testLaunchConfigAttr = new HashMap<String, Object>(); String tmp = "12345678901234567890"; //$NON-NLS-1$ testLaunchConfigAttr.put(HibernateLaunchConstants.ATTR_TEMPLATE_DIR, tmp); testLaunchConfigAttr.put(HibernateLaunchConstants.ATTR_OUTPUT_DIR, tmp); testLaunchConfigAttr.put(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER_SETTINGS, tmp); - if (jpa) { + if (testCase == ETestCase.jpa) { testLaunchConfigAttr.put(HibernateLaunchConstants.ATTR_ENABLE_EJB3_ANNOTATIONS, true); testLaunchConfigAttr.put(HibernateLaunchConstants.ATTR_ENABLE_JDK5, true); } @@ -225,7 +245,7 @@ testLaunchConfigAttr.put(HBMTEMPLATE0_PROPERTIES, expProps2); testLaunchConfigAttr.put(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER, reveng); TestLaunchConfig testLaunchConfig = new TestLaunchConfig(testLaunchConfigAttr); - CodeGenXMLFactory codeGenFactory = new CodeGenXMLFactory4Test(testLaunchConfig, jpa); + CodeGenXMLFactory codeGenFactory = new CodeGenXMLFactory4Test(testLaunchConfig, testCase); return codeGenFactory.createCodeGenXML(); }

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r23968 - in trunk/vpe/tests/org.jboss.tools.vpe.spring.test: resources/SpringTest/src/main/webapp and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dvinnichek Date: 2010-08-06 08:31:01 -0400 (Fri, 06 Aug 2010) New Revision: 23968 Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/htmlEscape.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/htmlEscape.jsp.xml Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/FormBean.java trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java Log: add tests for spring:htmlEscape (https://jira.jboss.org/browse/JBIDE-6711) Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/FormBean.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/FormBean.java 2010-08-06 10:56:01 UTC (rev 23967) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/java/org/jboss/tools/vpe/spring/test/springtest/FormBean.java 2010-08-06 12:31:01 UTC (rev 23968) @@ -25,6 +25,8 @@ private User user; private String verificationNum; + + private String javascriptStr = "<script>alert('Hello!');</script>"; public FormBean() { for (CategoryType categoryType : CategoryType.values()) { @@ -125,4 +127,12 @@ public void setSelectedCategory(String selectedCategory) { this.selectedCategory = selectedCategory; } + + public String getJavascriptStr() { + return javascriptStr; + } + + public void setJavascriptStr(String javascriptStr) { + this.javascriptStr = javascriptStr; + } } Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/htmlEscape.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/htmlEscape.jsp (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/htmlEscape.jsp 2010-08-06 12:31:01 UTC (rev 23968) @@ -0,0 +1,27 @@ +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> + +<html> + <body> + <h1>Test of spring:htmlEscape</h1> + + <form:form modelAttribute="formBean"> + + <span id="htmlEscapeTrue"> + <spring:htmlEscape defaultHtmlEscape="true" /> + </span> + <spring:bind path="javascriptStr"> + ${status.value} + </spring:bind> + + <span id="htmlEscapeFalse"> + <spring:htmlEscape defaultHtmlEscape="false" /> + </span> + <spring:bind path="javascriptStr"> + ${status.value} + </spring:bind> + + </form:form> + </body> +</html> \ No newline at end of file Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/htmlEscape.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/htmlEscape.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/htmlEscape.jsp.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/htmlEscape.jsp.xml 2010-08-06 12:31:01 UTC (rev 23968) @@ -0,0 +1,10 @@ +<tests> + <test id="htmlEscapeTrue"> + <SPAN ID="htmlEscapeTrue"> + </SPAN> + </test> + <test id="htmlEscapeFalse"> + <SPAN ID="htmlEscapeFalse"> + </SPAN> + </test> +</tests> \ No newline at end of file Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/htmlEscape.jsp.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml 2010-08-06 10:56:01 UTC (rev 23967) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml 2010-08-06 12:31:01 UTC (rev 23968) @@ -35,6 +35,7 @@ <bean name="/select.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> <bean name="/escapeBody.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> <bean name="/url.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/htmlEscape.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> <bean id="userValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.UserValidator"/> <bean id="beanValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.BeanValidator"/> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp 2010-08-06 10:56:01 UTC (rev 23967) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp 2010-08-06 12:31:01 UTC (rev 23968) @@ -26,4 +26,6 @@ <br/> <a href="transform.htm">transform.htm</a> <br/> +<a href="htmlEscape.htm">htmlEscape.htm</a> +<br/> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-08-06 10:56:01 UTC (rev 23967) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-08-06 12:31:01 UTC (rev 23968) @@ -120,6 +120,10 @@ public void testTransform() throws Throwable { performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/transform.jsp"); //$NON-NLS-1$ } + + public void testHtmlEscape() throws Throwable { + performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/htmlEscape.jsp"); //$NON-NLS-1$ + } @Override protected String getTestProjectName() {

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r23967 - trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-08-06 06:56:01 -0400 (Fri, 06 Aug 2010) New Revision: 23967 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta Log: https://jira.jboss.org/browse/JBIDE-5551 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-08-06 10:29:45 UTC (rev 23966) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2010-08-06 10:56:01 UTC (rev 23967) @@ -39,7 +39,7 @@ <PAIR name="org.jboss.soa.esb.actions.transformation.xslt.XsltAction" value="ESBPreActionXSLTAction"/> <PAIR name="org.jboss.soa.esb.actions.validation.SchemaValidationAction" value="ESBPreActionSchemaValidator"/> - <PAIR name="org.jboss.soa.esb.scripting.ScriptingAction" value="ESBPreActionScripting"/> + <PAIR name="org.jboss.soa.esb.actions.scripting.ScriptingAction" value="ESBPreActionScripting"/> <PAIR name="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor" value="ESBPreActionBpmProcessor"/> <PAIR name="org.jboss.soa.esb.smooks.SmooksAction" value="ESBPreActionSmooksAction"/> </MAPPING> @@ -2020,7 +2020,8 @@ <XModelAttribute PROPERTIES="category=general;id=true;save=always" name="name" xmlname="name"/> <XModelAttribute PROPERTIES="category=general;save=always" - default="org.jboss.soa.esb.scripting.ScriptingAction" name="class" xmlname="class"> + default="org.jboss.soa.esb.actions.scripting.ScriptingAction" + name="class" xmlname="class"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="pre=true;category=general" name="script" xmlname="script"> @@ -2030,7 +2031,7 @@ </Constraint> <Editor name="TreeChooser"/> </XModelAttribute> - <XModelAttribute PROPERTIES="pre=true;category=general" + <XModelAttribute PROPERTIES="pre=true;category=advanced" default="Default(false)" name="support message based scripting" xmlname="supportMessageBasedScripting"> <Constraint loader="ListString"> <value name="Default(false)"/> @@ -2039,6 +2040,32 @@ </Constraint> <Editor name="ListString"/> </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced;pre=true" + name="language" xmlname="language"> + <Constraint loader="ListString"> + <value/> + <value name="beanbasic"/> + <value name="beanshell"/> + <value name="bml"/> + <value name="javascript"/> + <value name="jacl"/> + <value name="java"/> + <value name="javaclass"/> + <value name="jpython"/> + <value name="jscript"/> + <value name="judoscript"/> + <value name="jython"/> + <value name="lotusscript"/> + <value name="netrexx"/> + <value name="perl"/> + <value name="perlscript"/> + <value name="pnuts"/> + <value name="ruby"/> + <value name="vbscript"/> + <value name="xslt"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> <XModelAttribute PROPERTIES="category=general" name="process" xmlname="process"> <Editor name="Uneditable"/> </XModelAttribute>

15 years, 5 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits August 2010