JBoss Tools SVN: r23041 - trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-06-25 10:28:17 -0400 (Fri, 25 Jun 2010)
New Revision: 23041
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java
Log:
https://jira.jboss.org/browse/JBIDE-6539 , details were added to the error message.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java 2010-06-25 14:03:39 UTC (rev 23040)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java 2010-06-25 14:28:17 UTC (rev 23041)
@@ -156,6 +156,7 @@
+ "\" but must be \"" + modelNode.getNodeValue().trim() //$NON-NLS-1$
+ "\""); //$NON-NLS-1$
}
+
// compare node's attributes
if (modelNode.getNodeType() == Node.ELEMENT_NODE) {
compareAttributes(modelNode.getAttributes(), vpeNode
@@ -283,7 +284,9 @@
"VPE element has less style parameters [" //$NON-NLS-1$
+ vpeStyle.size()
+ "] than was specified [" //$NON-NLS-1$
- + xmlStyle.size() + "]."); //$NON-NLS-1$
+ + xmlStyle.size() + "]." //$NON-NLS-1$
+ + "\n Expected: " + xmlStyle //$NON-NLS-1$
+ + "\n Was: " + vpeStyle); //$NON-NLS-1$
} else {
if ((xmlStyle.size() > 0) && (vpeStyle.size() > 0)) {
for (String key : xmlStyle.keySet()) {
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r23040 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-06-25 10:03:39 -0400 (Fri, 25 Jun 2010)
New Revision: 23040
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java
Log:
https://jira.jboss.org/browse/JBIDE-6346
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java 2010-06-25 14:01:37 UTC (rev 23039)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java 2010-06-25 14:03:39 UTC (rev 23040)
@@ -93,12 +93,12 @@
}
IModule[] add = new IModule[]{m};
IModule[] remove = new IModule[0];
- try {
- server.getRootModules(m, null);
- } catch (CoreException ce) {
- WebModelPlugin.getPluginLog().logError(ce);
- return ce.getStatus().getMessage();
- }
+// try {
+// server.getRootModules(m, null);
+// } catch (CoreException ce) {
+// WebModelPlugin.getPluginLog().logError(ce);
+// return ce.getStatus().getMessage();
+// }
IProgressMonitor monitor = new NullProgressMonitor();
IServerWorkingCopy copy = server.createWorkingCopy();
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r23039 - trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-06-25 10:01:37 -0400 (Fri, 25 Jun 2010)
New Revision: 23039
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/AddJSFCapabilitiesTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6540
Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/AddJSFCapabilitiesTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/AddJSFCapabilitiesTest.java 2010-06-25 13:59:41 UTC (rev 23038)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/AddJSFCapabilitiesTest.java 2010-06-25 14:01:37 UTC (rev 23039)
@@ -8,16 +8,12 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.ui.IWorkbenchWizard;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.wizards.IWizardDescriptor;
import org.jboss.tools.common.meta.key.WizardKeys;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.action.AddNatureActionDelegate;
import org.jboss.tools.common.model.ui.util.ExtensionPointUtils;
import org.jboss.tools.jst.web.ui.wizards.project.ImportWebProjectWizard;
-import org.jboss.tools.test.util.JUnitUtils;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ProjectImportTestSetup;
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r23038 - in trunk/jst/tests/org.jboss.tools.jst.web.ui.test: projects/test_add_jsf_capabilities and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-06-25 09:59:41 -0400 (Fri, 25 Jun 2010)
New Revision: 23038
Added:
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.classpath
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.project
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.settings/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.settings/org.eclipse.jdt.core.prefs
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/META-INF/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/classes/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/faces-config.xml
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/common-annotations.jar
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-beanutils.jar
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-collections.jar
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-digester.jar
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-logging.jar
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/jsf-tlds.jar
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/jstl.jar
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/standard.jar
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/web.xml
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/bin/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/src/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/AddJSFCapabilitiesTest.java
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JstWebUiAllTests.java
Log:
https://jira.jboss.org/browse/JBIDE-6540
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.classpath (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.classpath 2010-06-25 13:59:41 UTC (rev 23038)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.project
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.project (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.project 2010-06-25 13:59:41 UTC (rev 23038)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>test_add_jsf_capabilities</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.settings/org.eclipse.jdt.core.prefs 2010-06-25 13:59:41 UTC (rev 23038)
@@ -0,0 +1,12 @@
+#Fri Jun 25 15:56:21 MSD 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/META-INF/MANIFEST.MF 2010-06-25 13:59:41 UTC (rev 23038)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/faces-config.xml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/faces-config.xml 2010-06-25 13:59:41 UTC (rev 23038)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+ <application>
+ <locale-config/>
+ </application>
+ <factory/>
+ <lifecycle/>
+</faces-config>
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/faces-config.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/common-annotations.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/common-annotations.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-beanutils.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-beanutils.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-collections.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-collections.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-digester.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-digester.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-logging.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-logging.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/jsf-tlds.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/jsf-tlds.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/jstl.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/jstl.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/standard.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/standard.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/web.xml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/web.xml 2010-06-25 13:59:41 UTC (rev 23038)
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <display-name>p20</display-name>
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>server</param-value>
+ </context-param>
+ <listener>
+ <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
+ </listener>
+ <!-- Faces Servlet -->
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <!-- Faces Servlet Mapping -->
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+</web-app>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/web.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/AddJSFCapabilitiesTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/AddJSFCapabilitiesTest.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/AddJSFCapabilitiesTest.java 2010-06-25 13:59:41 UTC (rev 23038)
@@ -0,0 +1,94 @@
+package org.jboss.tools.jst.web.ui.test;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.ui.IImportWizard;
+import org.eclipse.ui.IWorkbenchWizard;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.wizards.IWizardDescriptor;
+import org.jboss.tools.common.meta.key.WizardKeys;
+import org.jboss.tools.common.model.ui.ModelUIPlugin;
+import org.jboss.tools.common.model.ui.action.AddNatureActionDelegate;
+import org.jboss.tools.common.model.ui.util.ExtensionPointUtils;
+import org.jboss.tools.jst.web.ui.wizards.project.ImportWebProjectWizard;
+import org.jboss.tools.test.util.JUnitUtils;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+
+
+public class AddJSFCapabilitiesTest extends TestCase {
+ IProject project = null;
+
+ public AddJSFCapabilitiesTest() {
+ super("Add JSF Capabilities Test");
+ }
+
+ public AddJSFCapabilitiesTest(String name) {
+ super(name);
+ }
+
+ protected void setUp() throws Exception {
+ JobUtils.waitForIdle(3000);
+ IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember("test_add_jsf_capabilities");
+ if(project == null) {
+ ProjectImportTestSetup setup = new ProjectImportTestSetup(
+ this,
+ "org.jboss.tools.jst.web.ui.test",
+ "projects/test_add_jsf_capabilities",
+ "test_add_jsf_capabilities");
+ project = setup.importProject();
+ }
+ this.project = project.getProject();
+ JobUtils.waitForIdle();
+ }
+
+ public void testAddJSFCapabilities() {
+ ImportWebProjectWizard wizard = (ImportWebProjectWizard)new Act().getWizard(project);
+ WizardDialog dialog = new WizardDialog(
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+ wizard);
+ dialog.setBlockOnOpen(false);
+ dialog.open();
+
+ //TODO implement finish of wizard and check of results.
+ //TODO it is necessary to provide server runtime; without it, wizard cannot finish
+ System.out.println(wizard.canFinish());
+ }
+
+ private void refreshProject(IProject project){
+ try {
+ project.refreshLocal(IResource.DEPTH_INFINITE, null);
+ JobUtils.waitForIdle();
+ JobUtils.delay(2000);
+ } catch (CoreException e) {
+ // ignore
+ }
+ }
+
+ class Act extends AddNatureActionDelegate {
+
+ protected IWizard getWizard(IProject project) {
+ ImportWebProjectWizard wizard = (ImportWebProjectWizard)ExtensionPointUtils.findImportWizardsItem(
+ "org.jboss.tools.jsf",
+ "org.jboss.tools.jsf.ui.wizard.project.ImportProjectWizard" //$NON-NLS-1$
+ );
+ if (wizard == null) throw new IllegalArgumentException("Wizard org.jboss.tools.common.model.ui.wizards.ImportProjectWizard is not found."); //$NON-NLS-1$
+ wizard.setInitialName(project.getName());
+ wizard.setInitialLocation(findWebXML(project.getLocation().toString()));
+ wizard.init(ModelUIPlugin.getDefault().getWorkbench(), null);
+ wizard.setWindowTitle(WizardKeys.getString("ADD_JSF_NATURE")); //$NON-NLS-1$
+ return wizard;
+ }
+
+ protected String getNatureID() {
+ return null;
+ }
+
+ }
+}
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/AddJSFCapabilitiesTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JstWebUiAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JstWebUiAllTests.java 2010-06-25 13:28:31 UTC (rev 23037)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JstWebUiAllTests.java 2010-06-25 13:59:41 UTC (rev 23038)
@@ -31,6 +31,10 @@
"org.jboss.tools.jst.web.ui.test",
new String[]{"projects/test_jsf_project"},
new String[]{"test_jsf_project"}));
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(AddJSFCapabilitiesTest.class),
+ "org.jboss.tools.jst.web.ui.test",
+ new String[]{"projects/test_add_jsf_capabilities"},
+ new String[]{"test_add_jsf_capabilities"}));
return suite;
}
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r23037 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/jpa2.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-06-25 09:28:31 -0400 (Fri, 25 Jun 2010)
New Revision: 23037
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/jpa2/HibernateOrmXml2_0ContextNodeFactory.java
Log:
https://jira.jboss.org/browse/JBIDE-6538
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/jpa2/HibernateOrmXml2_0ContextNodeFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/jpa2/HibernateOrmXml2_0ContextNodeFactory.java 2010-06-25 12:42:16 UTC (rev 23036)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/jpa2/HibernateOrmXml2_0ContextNodeFactory.java 2010-06-25 13:28:31 UTC (rev 23037)
@@ -11,6 +11,7 @@
package org.jboss.tools.hibernate.jpt.core.internal.context.orm.jpa2;
import org.eclipse.jpt.core.context.XmlContextNode;
+import org.eclipse.jpt.core.context.orm.EntityMappings;
import org.eclipse.jpt.core.context.orm.OrmBasicMapping;
import org.eclipse.jpt.core.context.orm.OrmColumn;
import org.eclipse.jpt.core.context.orm.OrmEntity;
@@ -35,6 +36,7 @@
import org.eclipse.jpt.core.resource.orm.XmlManyToOne;
import org.eclipse.jpt.core.resource.orm.XmlOneToMany;
import org.eclipse.jpt.core.resource.orm.XmlOneToOne;
+import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOrmBasicMapping;
import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOrmColumnImpl;
import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOrmEntityImpl;
@@ -42,6 +44,7 @@
import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOrmJoinColumnImpl;
import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOrmJoinTableImpl;
import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOrmManyToManyMapping;
+import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOrmPersistentType;
import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOrmTableImpl;
/**
@@ -117,5 +120,11 @@
OrmPersistentAttribute parent, XmlManyToMany resourceMapping) {
return new HibernateOrmManyToManyMapping(parent, resourceMapping);
}
+
+ @Override
+ public OrmPersistentType buildOrmPersistentType(EntityMappings parent,
+ XmlTypeMapping resourceMapping) {
+ return new HibernateOrmPersistentType(parent, resourceMapping);
+ }
}
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r23036 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2010-06-25 08:42:16 -0400 (Fri, 25 Jun 2010)
New Revision: 23036
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JpdlSerializer.java
Log:
GPD-384
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JpdlSerializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JpdlSerializer.java 2010-06-25 12:10:01 UTC (rev 23035)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JpdlSerializer.java 2010-06-25 12:42:16 UTC (rev 23036)
@@ -12,7 +12,7 @@
public static void serialize(Wrapper wrapper, OutputStream os) throws IOException {
StringBuffer buffer = new StringBuffer();
serialize(wrapper, buffer, 0);
- Writer writer = new OutputStreamWriter(os);
+ Writer writer = new OutputStreamWriter(os, "UTF-8");
writer.write(buffer.toString());
writer.close();
}
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r23035 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-06-25 08:10:01 -0400 (Fri, 25 Jun 2010)
New Revision: 23035
Added:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmPersistentType.java
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmXmlContextNodeFactory.java
Log:
https://jira.jboss.org/browse/JBIDE-6538
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmPersistentType.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmPersistentType.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmPersistentType.java 2010-06-25 12:10:01 UTC (rev 23035)
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.hibernate.jpt.core.internal.context.orm;
+
+import org.eclipse.jpt.core.context.AccessType;
+import org.eclipse.jpt.core.context.orm.EntityMappings;
+import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmPersistentType;
+import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class HibernateOrmPersistentType extends GenericOrmPersistentType {
+
+ public HibernateOrmPersistentType(EntityMappings parent,
+ XmlTypeMapping resourceMapping) {
+ super(parent, resourceMapping);
+ }
+
+ protected AccessType buildDefaultAccess() {
+ if ( ! this.mapping.isMetadataComplete()) {
+ if (this.javaPersistentType != null) {
+ if (this.javaPersistentTypeHasSpecifiedAccess()) {
+ return this.javaPersistentType.getAccess();
+ }
+ if (this.superPersistentType != null) {
+ return this.superPersistentType.getAccess();
+ }
+ }
+ }
+ AccessType access = this.getMappingFileRoot().getAccess();
+ //fix for https://jira.jboss.org/browse/JBIDE-6538
+ return (access != null) ? access : AccessType.PROPERTY; //default to PROPERTY if no specified access found
+ }
+
+
+}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmXmlContextNodeFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmXmlContextNodeFactory.java 2010-06-25 11:57:27 UTC (rev 23034)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmXmlContextNodeFactory.java 2010-06-25 12:10:01 UTC (rev 23035)
@@ -11,6 +11,7 @@
package org.jboss.tools.hibernate.jpt.core.internal.context.orm;
import org.eclipse.jpt.core.context.XmlContextNode;
+import org.eclipse.jpt.core.context.orm.EntityMappings;
import org.eclipse.jpt.core.context.orm.OrmBasicMapping;
import org.eclipse.jpt.core.context.orm.OrmColumn;
import org.eclipse.jpt.core.context.orm.OrmEntity;
@@ -35,6 +36,7 @@
import org.eclipse.jpt.core.resource.orm.XmlManyToOne;
import org.eclipse.jpt.core.resource.orm.XmlOneToMany;
import org.eclipse.jpt.core.resource.orm.XmlOneToOne;
+import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
/**
* @author Dmitry Geraskov
@@ -109,5 +111,11 @@
OrmPersistentAttribute parent, XmlManyToMany resourceMapping) {
return new HibernateOrmManyToManyMapping(parent, resourceMapping);
}
+
+ @Override
+ public OrmPersistentType buildOrmPersistentType(EntityMappings parent,
+ XmlTypeMapping resourceMapping) {
+ return new HibernateOrmPersistentType(parent, resourceMapping);
+ }
}
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r23034 - in branches/smooks-dmb: plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2010-06-25 07:57:27 -0400 (Fri, 25 Jun 2010)
New Revision: 23034
Added:
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1_1/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.ftl
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/FreeMarkerTemplate.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/v1_1/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.ftl
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/FreeMarkerTemplateTest.java
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/config-01.xml
Removed:
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml
Modified:
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Params.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/descriptor.properties
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-all-1.4-SNAPSHOT.jar
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java
Log:
Added FreMarker model
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF 2010-06-25 11:53:28 UTC (rev 23033)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF 2010-06-25 11:57:27 UTC (rev 23034)
@@ -14,6 +14,8 @@
org.jboss.tools.smooks.model.core,
org.jboss.tools.smooks.model.csv,
org.jboss.tools.smooks.model.edi,
+ org.jboss.tools.smooks.model.freemarker,
org.jboss.tools.smooks.model.javabean,
+ org.jboss.tools.smooks.model.json,
org.jboss.tools.smooks.model.plugin
Bundle-ClassPath: .
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java 2010-06-25 11:53:28 UTC (rev 23033)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java 2010-06-25 11:57:27 UTC (rev 23034)
@@ -20,12 +20,10 @@
package org.jboss.tools.smooks.model;
import org.jboss.tools.smooks.model.core.Component;
-import org.jboss.tools.smooks.model.core.Params;
+import org.jboss.tools.smooks.model.core.GlobalParams;
import org.jboss.tools.smooks.model.core.Reader;
-import org.milyn.javabean.dynamic.Model;
import org.milyn.javabean.dynamic.serialize.DefaultNamespace;
-import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
@@ -39,15 +37,15 @@
public static final String MODEL_DESCRIPTOR = "org/jboss/tools/smooks/model/descriptor.properties";
- private Params params;
+ private GlobalParams params;
private List<Reader> readers = new ArrayList<Reader>();
private List<Component> components = new ArrayList<Component>();
- public Params getParams() {
+ public GlobalParams getParams() {
return params;
}
- public void setParams(Params params) {
+ public void setParams(GlobalParams params) {
this.params = params;
}
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java 2010-06-25 11:53:28 UTC (rev 23033)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java 2010-06-25 11:57:27 UTC (rev 23034)
@@ -37,7 +37,7 @@
*/
public class SmooksModelBuilder {
- private static ModelBuilder modelBuilder;
+ public static ModelBuilder modelBuilder;
static {
ClassLoader contextClassloader = Thread.currentThread().getContextClassLoader();
Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java 2010-06-25 11:57:27 UTC (rev 23034)
@@ -0,0 +1,50 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2009, JBoss Inc.
+ */
+package org.jboss.tools.smooks.model.core;
+
+import org.milyn.StreamFilterType;
+import org.milyn.delivery.Filter;
+
+/**
+ * Global Parameters.
+ *
+ * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
+ */
+public class GlobalParams extends Params {
+
+ public GlobalParams setFilterType(StreamFilterType filterType) {
+ setParam(Filter.STREAM_FILTER_TYPE, filterType.toString());
+ return this;
+ }
+
+ public StreamFilterType getFilterType() {
+ String filterType = getParam(Filter.STREAM_FILTER_TYPE);
+
+ if(filterType == null) {
+ return null;
+ }
+
+ try {
+ return StreamFilterType.valueOf(filterType);
+ } catch(Exception e) {
+ return null;
+ }
+ }
+}
Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Params.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Params.java 2010-06-25 11:53:28 UTC (rev 23033)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Params.java 2010-06-25 11:57:27 UTC (rev 23034)
@@ -23,9 +23,6 @@
import java.util.Iterator;
import java.util.List;
-import org.milyn.StreamFilterType;
-import org.milyn.delivery.Filter;
-
/**
* Params.
*
@@ -85,23 +82,4 @@
return this;
}
-
- public Params setFilterType(StreamFilterType filterType) {
- setParam(Filter.STREAM_FILTER_TYPE, filterType.toString());
- return this;
- }
-
- public StreamFilterType getFilterType() {
- String filterType = getParam(Filter.STREAM_FILTER_TYPE);
-
- if(filterType == null) {
- return null;
- }
-
- try {
- return StreamFilterType.valueOf(filterType);
- } catch(Exception e) {
- return null;
- }
- }
}
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl 2010-06-25 11:53:28 UTC (rev 23033)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl 2010-06-25 11:57:27 UTC (rev 23034)
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list <@writeNamespaces indent="22"/>>
-
-<#if bean.params??>
- <@writePreText bean=bean.params />
- <params>
- <#list bean.params.params as param>
- <@writePreText bean=param />
- <param name="${param.name}">${param.value}</param>
- </#list>
- </params>
-</#if>
-<#list bean.readers as reader><@writeBean bean=reader /></#list>
-<#list bean.components as component><@writeBean bean=component /></#list>
-
-</smooks-resource-list>
\ No newline at end of file
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml 2010-06-25 11:53:28 UTC (rev 23033)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml 2010-06-25 11:57:27 UTC (rev 23034)
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
- xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.4.xsd"
- xmlns:dmb="http://www.milyn.org/xsd/smooks/dmb-1.4.xsd">
-
- <!--
- Main Smooks model bean.
- -->
- <jb:bean beanId="smooksModel" class="org.jboss.tools.smooks.model.SmooksModel" createOnElement="#document">
- <jb:wiring property="params" beanIdRef="params" />
- <jb:wiring property="readers" beanIdRef="readers" />
- <jb:wiring property="components" beanIdRef="components" />
- </jb:bean>
- <jb:bean beanId="readers" class="java.util.ArrayList" createOnElement="#document">
- <jb:wiring beanType="org.jboss.tools.smooks.model.core.Reader" />
- </jb:bean>
- <jb:bean beanId="components" class="java.util.ArrayList" createOnElement="#document">
- <jb:wiring beanType="org.jboss.tools.smooks.model.core.Component" />
- </jb:bean>
-
- <!-- params -->
- <jb:bean beanId="params" class="org.jboss.tools.smooks.model.core.Params" createOnElement="/smooks-resource-list/params">
- <jb:wiring property="params" beanIdRef="paramsList" />
- </jb:bean>
- <jb:bean beanId="paramsList" class="java.util.ArrayList" createOnElement="/smooks-resource-list/params">
- <jb:wiring beanIdRef="param" />
- </jb:bean>
- <jb:bean beanId="param" class="org.jboss.tools.smooks.model.core.Param" createOnElement="/smooks-resource-list/params/param">
- <jb:value property="name" data="/smooks-resource-list/params/param/@name" />
- <jb:value property="value" data="/smooks-resource-list/params/param" />
- </jb:bean>
-
- <!--
- Top level writer...
- -->
- <dmb:writer beanId="smooksModel" class="org.milyn.javabean.dynamic.serialize.freemarker.FreeMarkerBeanWriter">
- <param name="template">/org/jboss/tools/smooks/model/core/v1.1.ftl</param>
- </dmb:writer>
-
-</smooks-resource-list>
\ No newline at end of file
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.ftl (from rev 22992, branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.ftl (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.ftl 2010-06-25 11:57:27 UTC (rev 23034)
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<smooks-resource-list <@writeNamespaces indent="22"/>>
+
+<#if bean.params??>
+ <@writePreText bean=bean.params />
+ <params>
+ <#list bean.params.params as param>
+ <@writePreText bean=param />
+ <param name="${param.name}">${param.value}</param>
+ </#list>
+ </params>
+</#if>
+<#list bean.readers as reader><@writeBean bean=reader /></#list>
+<#list bean.components as component><@writeBean bean=component /></#list>
+
+</smooks-resource-list>
\ No newline at end of file
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml (from rev 22992, branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml 2010-06-25 11:57:27 UTC (rev 23034)
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+ xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.4.xsd"
+ xmlns:dmb="http://www.milyn.org/xsd/smooks/dmb-1.4.xsd">
+
+ <!--
+ Main Smooks model bean.
+ -->
+ <jb:bean beanId="smooksModel" class="org.jboss.tools.smooks.model.SmooksModel" createOnElement="#document">
+ <jb:wiring property="params" beanIdRef="globalParams" />
+ <jb:wiring property="readers" beanIdRef="readers" />
+ <jb:wiring property="components" beanIdRef="components" />
+ </jb:bean>
+ <jb:bean beanId="readers" class="java.util.ArrayList" createOnElement="#document">
+ <jb:wiring beanType="org.jboss.tools.smooks.model.core.Reader" />
+ </jb:bean>
+ <jb:bean beanId="components" class="java.util.ArrayList" createOnElement="#document">
+ <jb:wiring beanType="org.jboss.tools.smooks.model.core.Component" />
+ </jb:bean>
+
+ <!-- params -->
+ <jb:bean beanId="globalParams" class="org.jboss.tools.smooks.model.core.GlobalParams" createOnElement="/smooks-resource-list/params">
+ <jb:wiring property="params" beanIdRef="paramsList" />
+ </jb:bean>
+ <jb:bean beanId="paramsList" class="java.util.ArrayList" createOnElement="/smooks-resource-list/params">
+ <jb:wiring beanIdRef="param" />
+ </jb:bean>
+ <jb:bean beanId="param" class="org.jboss.tools.smooks.model.core.Param" createOnElement="/smooks-resource-list/params/param">
+ <jb:value property="name" data="/smooks-resource-list/params/param/@name" />
+ <jb:value property="value" data="/smooks-resource-list/params/param" />
+ </jb:bean>
+
+ <!--
+ Top level writer...
+ -->
+ <dmb:writer beanId="smooksModel" class="org.milyn.javabean.dynamic.serialize.freemarker.FreeMarkerBeanWriter">
+ <param name="template">/org/jboss/tools/smooks/model/core/v1_1/v1.1.ftl</param>
+ </dmb:writer>
+
+</smooks-resource-list>
\ No newline at end of file
Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/descriptor.properties
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/descriptor.properties 2010-06-25 11:53:28 UTC (rev 23033)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/descriptor.properties 2010-06-25 11:57:27 UTC (rev 23034)
@@ -7,7 +7,7 @@
# smooks core v1.1
smooks11.namespace=http://www.milyn.org/xsd/smooks-1.1.xsd
smooks11.schemaLocation=/META-INF/xsd/smooks-1.1.xsd
-smooks11.bindingConfigLocation=/org/jboss/tools/smooks/model/core/v1.1.xml
+smooks11.bindingConfigLocation=/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml
smooks11.order=0
# csv v1.2
@@ -54,3 +54,8 @@
jb13.namespace=http://www.milyn.org/xsd/smooks/javabean-1.3.xsd
jb13.schemaLocation=/META-INF/xsd/smooks/javabean-1.3.xsd
jb13.bindingConfigLocation=/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.xml
+
+ # freemarker v1.1
+ftl11.namespace=http://www.milyn.org/xsd/smooks/freemarker-1.1.xsd
+ftl11.schemaLocation=/META-INF/xsd/smooks/freemarker-1.1.xsd
+ftl11.bindingConfigLocation=/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.xml
Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/FreeMarkerTemplate.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/FreeMarkerTemplate.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/FreeMarkerTemplate.java 2010-06-25 11:57:27 UTC (rev 23034)
@@ -0,0 +1,70 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2009, JBoss Inc.
+ */
+package org.jboss.tools.smooks.model.freemarker;
+
+import org.jboss.tools.smooks.model.core.Component;
+import org.jboss.tools.smooks.model.core.Params;
+import org.milyn.javabean.dynamic.serialize.DefaultNamespace;
+
+/**
+ * FreeMarker Template component model.
+ *
+ * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
+ */
+@DefaultNamespace(uri = "http://www.milyn.org/xsd/smooks/freemarker-1.1.xsd", prefix = "ftl11")
+public class FreeMarkerTemplate implements Component {
+
+ private String template;
+ private String applyOnElement;
+ private String applyOnElementNS;
+ private Boolean applyBefore;
+ private Params params;
+
+ public String getTemplate() {
+ return template;
+ }
+ public void setTemplate(String template) {
+ this.template = template;
+ }
+ public String getApplyOnElement() {
+ return applyOnElement;
+ }
+ public void setApplyOnElement(String applyOnElement) {
+ this.applyOnElement = applyOnElement;
+ }
+ public String getApplyOnElementNS() {
+ return applyOnElementNS;
+ }
+ public void setApplyOnElementNS(String applyOnElementNS) {
+ this.applyOnElementNS = applyOnElementNS;
+ }
+ public Boolean getApplyBefore() {
+ return applyBefore;
+ }
+ public void setApplyBefore(Boolean applyBefore) {
+ this.applyBefore = applyBefore;
+ }
+ public Params getParams() {
+ return params;
+ }
+ public void setParams(Params params) {
+ this.params = params;
+ }
+}
Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/FreeMarkerTemplate.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.ftl
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.ftl (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.ftl 2010-06-25 11:57:27 UTC (rev 23034)
@@ -0,0 +1,8 @@
+<${nsp}:freemarker <@writeAttribs attribs="applyOnElement,applyOnElementNS,applyBefore" />>
+ <${nsp}:template><![CDATA[${bean.template}]]></${nsp}:template>
+ <#if (bean.params.params?size > 0)>
+ <#list bean.params.params as param>
+ <param name="${param.name}">${param.value}</param>
+ </#list>
+ </#if>
+ </${nsp}:freemarker>
\ No newline at end of file
Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.xml
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.xml (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.xml 2010-06-25 11:57:27 UTC (rev 23034)
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+ xmlns:core="http://www.milyn.org/xsd/smooks/smooks-core-1.3.xsd"
+ xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.4.xsd"
+ xmlns:dmb="http://www.milyn.org/xsd/smooks/dmb-1.4.xsd">
+
+ <core:namespaces>
+ <!--
+ Need to explicitly defin the smooks v1.1 namespace because we use it in the
+ in the "param" bean selectors. All the other configuration namespaces
+ will default to the binding namespace (in this case the freemarker-1.1 namespace).
+ The <param> element (targeted by the "param" bean config) is in the smooks-1.1 namespace
+ and so needs to be explicitly handled.
+ -->
+ <core:namespace prefix="smooks" uri="http://www.milyn.org/xsd/smooks-1.1.xsd" />
+ </core:namespaces>
+
+ <!-- Binding configs (unmarshal)... -->
+
+ <jb:bean beanId="freemarkerTemplate" class="org.jboss.tools.smooks.model.freemarker.FreeMarkerTemplate" createOnElement="freemarker">
+ <jb:value property="template" data="freemarker/template" />
+ <jb:value property="applyOnElement" data="freemarker/@applyOnElement" />
+ <jb:value property="applyOnElementNS" data="freemarker/@applyOnElementNS" />
+ <jb:value property="applyBefore" data="freemarker/@applyBefore" />
+ <jb:wiring property="params" beanIdRef="params" />
+ </jb:bean>
+ <jb:bean beanId="params" class="org.jboss.tools.smooks.model.core.Params" createOnElement="freemarker">
+ <jb:wiring property="params" beanIdRef="paramsList" />
+ </jb:bean>
+ <jb:bean beanId="paramsList" class="java.util.ArrayList" createOnElement="freemarker">
+ <jb:wiring beanIdRef="param" />
+ </jb:bean>
+ <jb:bean beanId="param" class="org.jboss.tools.smooks.model.core.Param" createOnElement="freemarker/smooks:param">
+ <jb:value property="name" data="freemarker/smooks:param/@name" />
+ <jb:value property="value" data="freemarker/smooks:param" />
+ </jb:bean>
+
+ <!-- Writers (marshal)... -->
+
+ <dmb:writer beanId="freemarkerTemplate" class="org.milyn.javabean.dynamic.serialize.freemarker.FreeMarkerBeanWriter">
+ <param name="template">/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.ftl</param>
+ </dmb:writer>
+
+</smooks-resource-list>
\ No newline at end of file
Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-all-1.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java 2010-06-25 11:53:28 UTC (rev 23033)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java 2010-06-25 11:57:27 UTC (rev 23034)
@@ -70,4 +70,8 @@
XMLUnit.setIgnoreWhitespace( true );
XMLAssert.assertXMLEqual(new InputStreamReader(getClass().getResourceAsStream(messageFile)), new StringReader(modelWriter.toString()));
}
+
+ protected void reportTo(String reportPath) {
+ SmooksModelBuilder.modelBuilder.setReportPath(reportPath);
+ }
}
\ No newline at end of file
Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java 2010-06-25 11:53:28 UTC (rev 23033)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java 2010-06-25 11:57:27 UTC (rev 23034)
@@ -37,7 +37,7 @@
}
public void test_manual() {
- Params params = new Params();
+ GlobalParams params = new GlobalParams();
assertEquals(null, params.getParam("a"));
params.removeParam("a"); // make sure there's no exception
params.setParam("a", "aVal");
@@ -53,7 +53,7 @@
public void test_config_v11_01() throws IOException, SAXException {
Model<SmooksModel> model = test("v1_1/config-01.xml");
- Params params = model.getModelRoot().getParams();
+ GlobalParams params = model.getModelRoot().getParams();
assertTrue(params.getFilterType() == StreamFilterType.SAX);
@@ -64,7 +64,7 @@
public void test_config_v11_02() throws IOException, SAXException {
Model<SmooksModel> model = test("v1_1/config-02.xml");
- Params params = model.getModelRoot().getParams();
+ GlobalParams params = model.getModelRoot().getParams();
assertTrue(params.getFilterType() == StreamFilterType.DOM);
Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/FreeMarkerTemplateTest.java
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/FreeMarkerTemplateTest.java (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/FreeMarkerTemplateTest.java 2010-06-25 11:57:27 UTC (rev 23034)
@@ -0,0 +1,41 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2009, JBoss Inc.
+ */
+package org.jboss.tools.smooks.model.freemarker;
+
+import java.io.IOException;
+
+import org.jboss.tools.smooks.model.SmooksModelTestCase;
+import org.xml.sax.SAXException;
+
+/**
+ *
+ *
+ * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
+ */
+public class FreeMarkerTemplateTest extends SmooksModelTestCase {
+
+ public FreeMarkerTemplateTest() throws IOException, SAXException {
+ super();
+ }
+
+ public void test_01() throws IOException, SAXException {
+ test("config-01.xml");
+ }
+}
Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/FreeMarkerTemplateTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/config-01.xml
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/config-01.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/config-01.xml 2010-06-25 11:57:27 UTC (rev 23034)
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+ xmlns:ftl="http://www.milyn.org/xsd/smooks/freemarker-1.1.xsd">
+
+ <!-- comment -->
+ <params>
+ <param name="stream.filter.type">SAX</param>
+ </params>
+
+ <ftl:freemarker applyOnElement="root/bla/blub">
+ <ftl:template><![CDATA[${env.abc}]]></ftl:template>
+ </ftl:freemarker>
+
+ <!-- comment -->
+ <ftl:freemarker applyOnElement="root/bla/blub">
+ <ftl:template><![CDATA[${env.def}]]></ftl:template>
+ <param name="x">1</param>
+ <param name="y">2</param>
+ </ftl:freemarker>
+
+ </smooks-resource-list>
Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/config-01.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r23033 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-06-25 07:53:28 -0400 (Fri, 25 Jun 2010)
New Revision: 23033
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java
Log:
https://jira.jboss.org/browse/JBIDE-6540
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2010-06-25 11:34:37 UTC (rev 23032)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2010-06-25 11:53:28 UTC (rev 23033)
@@ -437,6 +437,7 @@
wcco.setDataModel(dataModel);
dataModel.setProperty(IProjectCreationPropertiesNew.PROJECT_NAME, projectName);
+ dataModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
if(!isDefaultLocation(projectLocation)) {
dataModel.setProperty(IProjectCreationPropertiesNew.USE_DEFAULT_LOCATION, Boolean.FALSE);
dataModel.setProperty(IProjectCreationPropertiesNew.USER_DEFINED_LOCATION, projectLocation);
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r23032 - in trunk: vpe/tests/org.jboss.tools.vpe.ui.test/META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-06-25 07:34:37 -0400 (Fri, 25 Jun 2010)
New Revision: 23032
Modified:
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleListener.java
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleManager.java
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/StyleAttribyteContainer.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java
Log:
https://jira.jboss.org/browse/JBIDE-6539 , in ComponentContentTest style attribute will be compared by its parmeters insted of the whole style string.
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleListener.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleListener.java 2010-06-25 11:19:15 UTC (rev 23031)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleListener.java 2010-06-25 11:34:37 UTC (rev 23032)
@@ -37,8 +37,6 @@
private ListenerList listeners = new ListenerList();
- private CSSStyleManager styleManager = new CSSStyleManager();
-
private StyleContainer currentStyle;
private IWorkbenchPart currentPart;
@@ -93,7 +91,7 @@
public void selectionChanged(IWorkbenchPart part, ISelection selection) {
- StyleContainer newStyle = styleManager.recognizeCSSStyle(selection);
+ StyleContainer newStyle = CSSStyleManager.recognizeCSSStyle(selection);
if (isImportant(part)
&& ((currentStyle == null) || !(currentStyle.equals(newStyle)))) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleManager.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleManager.java 2010-06-25 11:19:15 UTC (rev 23031)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleManager.java 2010-06-25 11:34:37 UTC (rev 23032)
@@ -10,6 +10,9 @@
******************************************************************************/
package org.jboss.tools.jst.css.common;
+import java.util.HashMap;
+import java.util.Map;
+
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -24,6 +27,9 @@
import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
+import org.jboss.tools.jst.jsp.outline.cssdialog.common.CSSConstants;
+import org.jboss.tools.jst.jsp.outline.cssdialog.common.Constants;
+import org.jboss.tools.jst.jsp.outline.cssdialog.common.Util;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -32,74 +38,79 @@
import org.w3c.dom.css.CSSStyleSheet;
import org.w3c.dom.css.ElementCSSInlineStyle;
+// TODO: Auto-generated Javadoc
/**
+ * The Class CSSStyleManager.
+ *
* @author Sergey Dzmitrovich
- *
*/
public class CSSStyleManager {
+ /** The Constant STYLE_TAG_NAME. */
public static final String STYLE_TAG_NAME = "style"; //$NON-NLS-1$
+ /** The Constant STYLE_ATTRIBUTE_NAME. */
public static final String STYLE_ATTRIBUTE_NAME = "style"; //$NON-NLS-1$
/**
- *
- * @param selection
- * @return
+ * Recognize css style.
+ *
+ * @param node the selected node
+ * @return the style container
*/
- public StyleContainer recognizeCSSStyle(ISelection selection) {
-
+ public static StyleContainer recognizeCSSStyle(Object node) {
StyleContainer container = null;
+ // if selected object is node in css file
+ if (node instanceof ICSSNode) {
+ CSSStyleRule styleRule = getStyleRule((ICSSNode) node);
+ if (styleRule != null)
+ container = new CSSStyleRuleContainer(styleRule);
+ } else if ((node instanceof Element)
+ || (node instanceof Attr)) {
+ Element selectedElement = null;
+ if (node instanceof Attr) {
+ selectedElement = ((Attr) node).getOwnerElement();
+ } else {
+ selectedElement = (Element) node;
+ }
+ if (isSuitableElement(selectedElement)) {
+ container = new StyleAttribyteContainer(selectedElement);
+ }
+ }
+ return container;
+ }
+
+ /**
+ * Recognize css style.
+ *
+ * @param selection the selection
+ * @return the style container
+ */
+ public static StyleContainer recognizeCSSStyle(ISelection selection) {
+ StyleContainer container = null;
if (selection instanceof IStructuredSelection) {
-
Object selectedObject = ((IStructuredSelection) selection)
.getFirstElement();
-
- // if selected object is node in css file
- if (selectedObject instanceof ICSSNode) {
-
- CSSStyleRule styleRule = getStyleRule((ICSSNode) selectedObject);
-
- if (styleRule != null)
- container = new CSSStyleRuleContainer(styleRule);
-
- } else if ((selectedObject instanceof Element)
- || (selectedObject instanceof Attr)) {
-
- Element selectedElement = null;
-
- if (selectedObject instanceof Attr)
- selectedElement = ((Attr) selectedObject).getOwnerElement();
- else
- selectedElement = (Element) selectedObject;
-
- if (isSuitableElement(selectedElement)) {
-
- container = new StyleAttribyteContainer(selectedElement);
-
- }
- } else if ((selectedObject instanceof Text)
+ container = recognizeCSSStyle(selectedObject);
+ /*
+ * When container was not found and
+ * the selection is text selection then:
+ */
+ if ((null == container) && (selectedObject instanceof Text)
&& (selection instanceof ITextSelection)) {
-
Text styleText = (Text) selectedObject;
-
Node parentNode = styleText.getParentNode();
-
if ((parentNode != null)
&& STYLE_TAG_NAME.equalsIgnoreCase(parentNode
.getNodeName())) {
-
int offset = getRelationalOffset(styleText,
((ITextSelection) selection).getOffset());
-
CSSStyleSheet sheet = getSheet(parentNode);
-
ICSSNode node = getNode(sheet, offset);
-
CSSStyleRule styleRule = getStyleRule(node);
-
if (styleRule != null) {
- container = new StyleElementRuleContainer(styleText, styleRule);
+ container = new StyleElementRuleContainer(
+ styleText, styleRule);
}
}
}
@@ -108,11 +119,12 @@
}
/**
- *
- * @param styleContainer
- * @return
+ * Gets the sheet.
+ *
+ * @param styleContainer the style container
+ * @return the sheet
*/
- private CSSStyleSheet getSheet(Node styleContainer) {
+ private static CSSStyleSheet getSheet(Node styleContainer) {
if (styleContainer instanceof INodeNotifier) {
@@ -131,12 +143,13 @@
}
/**
- *
- * @param sheet
- * @param offset
- * @return
+ * Gets the node.
+ *
+ * @param sheet the sheet
+ * @param offset the offset
+ * @return the node
*/
- private ICSSNode getNode(CSSStyleSheet sheet, int offset) {
+ private static ICSSNode getNode(CSSStyleSheet sheet, int offset) {
ICSSModel model = ((ICSSDocument) sheet).getModel();
@@ -149,11 +162,12 @@
}
/**
- *
- * @param element
- * @return
+ * Checks if element has "style" property.
+ *
+ * @param element the element
+ * @return true, if is suitable element
*/
- private boolean isSuitableElement(Element element) {
+ private static boolean isSuitableElement(Element element) {
if (element instanceof ElementCSSInlineStyle
&& isAttributeAvailable(element, STYLE_TAG_NAME)) {
@@ -164,11 +178,12 @@
}
/**
- *
- * @param node
- * @return
+ * Gets the style rule.
+ *
+ * @param node the node
+ * @return the style rule
*/
- private CSSStyleRule getStyleRule(ICSSNode node) {
+ private static CSSStyleRule getStyleRule(ICSSNode node) {
while (node != null) {
@@ -182,20 +197,23 @@
}
/**
- *
- * @param selection
- * @param styleText
- * @return
+ * Gets the relational offset.
+ *
+ * @param basicNode the basic node
+ * @param absoluteOffset the absolute offset
+ * @return the relational offset
*/
- private int getRelationalOffset(Node basicNode, int absoluteOffset) {
+ private static int getRelationalOffset(Node basicNode, int absoluteOffset) {
return absoluteOffset - ((IndexedRegion) basicNode).getStartOffset();
}
/**
- * @param element
- * @param attrName
- * @return
+ * Checks if attribute is available.
+ *
+ * @param element the element
+ * @param attrName the attr name
+ * @return true, if is attribute available
*/
private static boolean isAttributeAvailable(Element element, String attrName) {
ModelQuery modelQuery = ModelQueryUtil.getModelQuery(element
@@ -213,4 +231,30 @@
return false;
}
+
+
+ /**
+ * Gets the style attributes.
+ *
+ * @param styleString the style string
+ * @return the style attributes
+ */
+ public static Map<String, String> getStyleAttributes(String styleString) {
+ Map<String, String> styleMap = new HashMap<String, String>();
+ if ((styleString != null) && (styleString.length() > 0)) {
+ String[] styles = styleString.split(Constants.SEMICOLON);
+ for (String styleElement : styles) {
+ String[] styleElementParts = styleElement.trim().split(
+ Constants.COLON);
+ if ((styleElementParts != null)
+ && (styleElementParts.length == 2)
+ && Util.searchInElement(styleElementParts[0],
+ CSSConstants.CSS_STYLES_MAP)) {
+ styleMap.put(styleElementParts[0], styleElementParts[1]);
+ }
+ }
+ }
+ return styleMap;
+ }
+
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/StyleAttribyteContainer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/StyleAttribyteContainer.java 2010-06-25 11:19:15 UTC (rev 23031)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/StyleAttribyteContainer.java 2010-06-25 11:34:37 UTC (rev 23032)
@@ -48,29 +48,8 @@
}
public Map<String, String> getStyleAttributes() {
-
- String styleString = element.getAttribute(STYLE_ATTRIBUTE_NAME);
-
- Map<String, String> styleMap = new HashMap<String, String>();
-
- if ((styleString != null) && (styleString.length() > 0)) {
-
- String[] styles = styleString.split(Constants.SEMICOLON);
- for (String styleElement : styles) {
- String[] styleElementParts = styleElement.trim().split(
- Constants.COLON);
- if ((styleElementParts != null)
- && (styleElementParts.length == 2)
- && Util.searchInElement(styleElementParts[0],
- CSSConstants.CSS_STYLES_MAP)) {
-
- styleMap.put(styleElementParts[0], styleElementParts[1]);
- }
- }
-
- }
-
- return styleMap;
+ return CSSStyleManager.getStyleAttributes(element
+ .getAttribute(STYLE_ATTRIBUTE_NAME));
}
public Object getStyleObject() {
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-06-25 11:19:15 UTC (rev 23031)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-06-25 11:34:37 UTC (rev 23032)
@@ -11,6 +11,7 @@
org.eclipse.core.resources,
org.eclipse.ui.ide,
org.jboss.tools.jst.jsp,
+ org.jboss.tools.jst.css,
org.jboss.tools.vpe.xulrunner;bundle-version="3.1.0",
org.mozilla.xpcom;bundle-version="1.9.1",
org.eclipse.jface.text,
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2010-06-25 11:19:15 UTC (rev 23031)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2010-06-25 11:34:37 UTC (rev 23032)
@@ -44,16 +44,17 @@
/**
*
* there are several conditions:
- *
+ * <p>
* 1) xml file which contain tests must be named 'name of test page' +
* '.xml'
- *
+ * <br>
* Example: test.jsp and test.jsp.xml
- *
+ * <p>
* 2) a tag <test> in xml file and required element in test page must have
* the same attribute "id"
- *
+ * <br>
* Example: <tests>... <test id="testId" > ...<tests> - in xml file and
+ * <br>
* <html>... <x:testElement id="testId" > ... </html> - in test page
*
* @param elementPagePath
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java 2010-06-25 11:19:15 UTC (rev 23031)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java 2010-06-25 11:34:37 UTC (rev 23032)
@@ -18,15 +18,23 @@
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.jboss.tools.common.model.util.XMLUtil;
+import org.jboss.tools.jst.css.common.CSSStyleManager;
+import org.jboss.tools.jst.css.common.StyleContainer;
import org.jboss.tools.vpe.editor.util.Constants;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
import org.mozilla.interfaces.nsIDOMAttr;
+import org.mozilla.interfaces.nsIDOMCSSStyleDeclaration;
+import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNamedNodeMap;
import org.mozilla.interfaces.nsIDOMNode;
import org.mozilla.interfaces.nsIDOMNodeList;
@@ -36,6 +44,8 @@
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.w3c.dom.css.CSSStyleDeclaration;
+import org.w3c.dom.css.ElementCSSInlineStyle;
/**
* @author Sergey Dzmitrovich
@@ -148,7 +158,6 @@
}
// compare node's attributes
if (modelNode.getNodeType() == Node.ELEMENT_NODE) {
-
compareAttributes(modelNode.getAttributes(), vpeNode
.getAttributes());
}
@@ -220,79 +229,91 @@
for (int i = 0; i < modelAttributes.getLength(); i++) {
Attr modelAttr = (Attr) modelAttributes.item(i);
String name = modelAttr.getName();
-
// if the attribute has to be skipped, then do it
if ( name != null
&& skippedAtributes.contains(name.toUpperCase()) ) {
continue;
}
-
// if there are limitation of attributes
if (ILLEGAL_ATTRIBUTES.equals(name)) {
-
String[] illegalAttributes = modelAttr.getNodeValue().split(
ILLEGAL_ATTRIBUTES_SEPARATOR);
-
for (String illegalAttributeName : illegalAttributes) {
if (vpeAttributes.getNamedItem(illegalAttributeName.trim()) != null)
throw new ComparisonException("illegal attribute :" //$NON-NLS-1$
+ illegalAttributeName);
}
-
} else {
-
-
- if (vpeAttributes.getNamedItem(
- name) == null)
+ if (vpeAttributes.getNamedItem(name) == null) {
throw new ComparisonException("there is not : \"" + name //$NON-NLS-1$
+ "\" attribute"); //$NON-NLS-1$
-
+ }
nsIDOMAttr vpeAttr = queryInterface(
vpeAttributes.getNamedItem(name), nsIDOMAttr.class);
-
-
-
-// if (HTML.ATTR_STYLE.equalsIgnoreCase(name)) {
-//
-// String[] modelParameters = modelAttr.getNodeValue().split(
-// Constants.SEMICOLON);
-// String[] vpeParameters = vpeAttr.getNodeValue().split(
-// Constants.SEMICOLON);
-//
-// for (int j = 0; j < modelParameters.length; j++) {
-// String modelParam = modelParameters[j];
-// String vpeParam = vpeParameters[j];
-//
-// String[] splittedModelParam = modelParam.split(
-// Constants.COLON, 2);
-//
-// String[] splittedVpeParam = vpeParam.split(
-// Constants.COLON, 2);
-//
-// if (!splittedModelParam[0].trim().equals(
-// splittedVpeParam[0].trim())) {
-// throw new ComparisonException(
-// "param of style attribute is\""
-// + splittedVpeParam[0].trim()
-// + "\" but must be \""
-// + splittedModelParam[0].trim()
-// + "\"");
-// }
-//
-//// compareComplexStrings(splittedModelParam[0].trim(), splittedVpeParam[0].trim());
-//
-//
-// if (splittedModelParam.length > 1)
-// compareComplexStrings(splittedModelParam[1].trim(),
-// splittedVpeParam[1].trim());
-//
-// }
-//
-// }
-
+ /*
+ * By default every attribute show pass through
+ * compareComplexStrings(..) method.
+ * For "style" attribute there is a separate comparison.
+ */
+ boolean performComplexStringsComparison = true;
+ if (HTML.ATTR_STYLE.equalsIgnoreCase(name)) {
+ String xmlAttrValue = modelAttr.getNodeValue();
+ /*
+ * Check if it is not a regular expression.
+ * Otherwise perform Complex Strings Comparison
+ * as usual.
+ */
+ if (!(xmlAttrValue.startsWith(START_REGEX)
+ && xmlAttrValue.endsWith(END_REGEX))) {
+ performComplexStringsComparison = false;
+ /*
+ * Parse style attribute value
+ */
+ Map<String, String> vpeStyle = CSSStyleManager
+ .getStyleAttributes(vpeAttr.getNodeValue());
+ Map<String, String> xmlStyle = CSSStyleManager
+ .getStyleAttributes(xmlAttrValue);
+ /*
+ * Major condition is that
+ * all styles from the xml file should present
+ * in the style attribute of the vpe element.
+ */
+ if (xmlStyle.size() > vpeStyle.size()) {
+ throw new ComparisonException(
+ "VPE element has less style parameters [" //$NON-NLS-1$
+ + vpeStyle.size()
+ + "] than was specified [" //$NON-NLS-1$
+ + xmlStyle.size() + "]."); //$NON-NLS-1$
+ } else {
+ if ((xmlStyle.size() > 0) && (vpeStyle.size() > 0)) {
+ for (String key : xmlStyle.keySet()) {
+ if (vpeStyle.containsKey(key)) {
+ if (!xmlStyle.get(key).equalsIgnoreCase(
+ vpeStyle.get(key))) {
+ throw new ComparisonException(
+ "Style value for parameter [" //$NON-NLS-1$
+ + key
+ + "] is different. Expected [" //$NON-NLS-1$
+ + xmlStyle.get(key)
+ + "] but was [" //$NON-NLS-1$
+ + vpeStyle.get(key)
+ + "]"); //$NON-NLS-1$
+ }
+ } else {
+ throw new ComparisonException(
+ "Style parameter [" //$NON-NLS-1$
+ + key
+ + "] is missing in the VPE element"); //$NON-NLS-1$
+ }
+ }
+ }
+ }
+ }
+ }
+ if (performComplexStringsComparison) {
compareComplexStrings(modelAttr.getNodeValue().trim(),
vpeAttr.getNodeValue().trim());
-
+ }
}
}
}
13 years, 11 months
- 1
- 0