JBoss Tools SVN: r12114 - trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-11-28 05:33:17 -0500 (Fri, 28 Nov 2008)
New Revision: 12114
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java
Log:
JUnit tests for html components were updated.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java 2008-11-28 10:29:32 UTC (rev 12113)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java 2008-11-28 10:33:17 UTC (rev 12114)
@@ -119,7 +119,7 @@
}
public void testLink() throws Throwable {
- fail("it is necessary to add body of the test"); //$NON-NLS-1$
+ performInvisibleTagTest("components/core/link.html", "link"); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testMap() throws Throwable {
@@ -135,11 +135,11 @@
}
public void testStyle() throws Throwable {
- fail("it is necessary to add body of the test"); //$NON-NLS-1$
+ performInvisibleTagTest("components/core/style.html", "style"); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testTitle() throws Throwable {
- performContentTest("components/core/title.html"); //$NON-NLS-1$
+ performInvisibleTagTest("components/core/title.html", "title"); //$NON-NLS-1$ //$NON-NLS-2$
}
/*
16 years, 1 month
JBoss Tools SVN: r12113 - trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-11-28 05:29:32 -0500 (Fri, 28 Nov 2008)
New Revision: 12113
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSProviderInvokeCommand.java
Log:
JBIDE-3310:Could not load class -- invalid classpath when using jboss ws bottomup
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSProviderInvokeCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSProviderInvokeCommand.java 2008-11-28 09:00:32 UTC (rev 12112)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSProviderInvokeCommand.java 2008-11-28 10:29:32 UTC (rev 12113)
@@ -74,12 +74,19 @@
.append("src");
try {
- commandLine.append(" -c ").append("\"");
+ commandLine.append(" -c ");
+ if(seperator.equals(SEPERATOR_WIN)){
+ commandLine.append("\"");
+ }
commandLine.append(projectRoot).append(Path.SEPARATOR).append(
javaProject.getOutputLocation().removeFirstSegments(1)
.toOSString()).append(seperator);
- commandLine.append(getClasspathEntries(javaProject)).append("\" ");
+ commandLine.append(getClasspathEntries(javaProject));
+ if(seperator.equals(SEPERATOR_WIN)){
+ commandLine.append("\"");
+ }
+ commandLine.append(" ");
} catch (JavaModelException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
@@ -125,7 +132,11 @@
}
path.append(entry.getPath().toOSString()).append(seperator);
}
- return path.toString();
+ String str = path.toString();
+ if(str.endsWith(seperator)){
+ str = str.substring(0, str.length()-1);
+ }
+ return str;
}
}
16 years, 1 month
JBoss Tools SVN: r12112 - in trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test: Pricing and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-11-28 04:00:32 -0500 (Fri, 28 Nov 2008)
New Revision: 12112
Modified:
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/gpd.xml
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/processdefinition.xml
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/test/BpmnConvertTest.java
Log:
JBIDE-3309:modify tests for jbpm convert modules
Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/gpd.xml
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/gpd.xml 2008-11-28 08:39:29 UTC (rev 12111)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/gpd.xml 2008-11-28 09:00:32 UTC (rev 12112)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process-diagram name="Policy Pricing" width="1500" height="214">
- <node width="100" height="40" name="Price Policy" x="144" y="0"> <transition name="au_gen_3"> <label x="5" y="-10"/> </transition> </node> <node width="100" height="40" name="Review Pricing" x="555" y="141"> <transition name="au_gen_4"> <label x="5" y="-10"/> </transition> </node> <node width="100" height="40" name=" Price Calculated ?" x="373" y="16"> <transition name="false"> <label x="5" y="-10"/> </transition> <transition name="true"> <label x="5" y="-10"/> </transition> </node> <node width="100" height="40" name="au_gen" x="16" y="80"> <transition name="au_gen_2"> <label x="5" y="-10"/> </transition> </node> <node width="100" height="40" name="au_gen_1" x="832" y="80"/></process-diagram>
+<process-diagram name="Policy Pricing" width="1500" height="214">
+ <node width="100" height="40" name="Price Policy" x="144" y="0"> <transition name="au_gen_3"> <label x="5" y="-10"/> </transition> </node> <node width="100" height="40" name="Review Pricing" x="555" y="141"> <transition name="au_gen_4"> <label x="5" y="-10"/> </transition> </node> <node width="100" height="40" name="au_gen_1" x="832" y="80"/> <node width="100" height="40" name=" Price Calculated ?" x="373" y="16"> <transition name="false"> <label x="5" y="-10"/> </transition> <transition name="true"> <label x="5" y="-10"/> </transition> </node> <node width="100" height="40" name="au_gen" x="16" y="80"> <transition name="au_gen_2"> <label x="5" y="-10"/> </transition> </node></process-diagram>
Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/processdefinition.xml
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/processdefinition.xml 2008-11-28 08:39:29 UTC (rev 12111)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/processdefinition.xml 2008-11-28 09:00:32 UTC (rev 12112)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process-definition xmlns="urn:jbpm.org:jpdl-3.2" name="Policy Pricing">
- <node name="Price Policy"> <transition name="au_gen_3" to=" Price Calculated ?"/> </node> <start-state name="au_gen"> <transition name="au_gen_2" to="Price Policy"/> </start-state> <decision name=" Price Calculated ?"> <transition name="false" to="au_gen_1"/> <transition name="true" to="Review Pricing"/> </decision> <node name="Review Pricing"> <transition name="au_gen_4" to="au_gen_1"/> </node> <end-state name="au_gen_1"/></process-definition>
+<process-definition xmlns="urn:jbpm.org:jpdl-3.2" name="Policy Pricing">
+ <node name="Price Policy"> <transition name="au_gen_3" to=" Price Calculated ?"/> </node> <start-state name="au_gen"> <transition name="au_gen_2" to="Price Policy"/> </start-state> <decision name=" Price Calculated ?"> <transition name="false" to="au_gen_1"/> <transition name="true" to="Review Pricing"/> </decision> <node name="Review Pricing"> <transition name="au_gen_4" to="au_gen_1"/> </node> <end-state name="au_gen_1"/></process-definition>
Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/test/BpmnConvertTest.java
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/test/BpmnConvertTest.java 2008-11-28 08:39:29 UTC (rev 12111)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/test/BpmnConvertTest.java 2008-11-28 09:00:32 UTC (rev 12112)
@@ -16,9 +16,16 @@
public class BpmnConvertTest extends TestCase {
public void testConvert() throws IOException {
- String absolutePath = Platform.getBundle(
- "org.jboss.tools.jbpm.convert.test").getLocation()
- .substring(16);
+ String absolutePath = "";
+ if (System.getProperty("os.name").toLowerCase().indexOf("win") >= 0) {
+ absolutePath = Platform.getBundle(
+ "org.jboss.tools.jbpm.convert.test").getLocation()
+ .substring(16);
+ } else {
+ absolutePath = Platform.getBundle(
+ "org.jboss.tools.jbpm.convert.test").getLocation()
+ .substring(15);
+ }
String bpmnfilePath = absolutePath + "testfile";
String expectedPath = absolutePath + "resultfile";
File[] bpmnFiles = listAll(bpmnfilePath);
@@ -52,7 +59,7 @@
if (!compareWithExpectedResult(tmpLocation + File.separator
+ "jpdl" + File.separator + name, expectedPath
+ File.separator + name)) {
- System.out.println("the testing bpmn named /" + str1
+ System.out.println("the testing bpmn named /" + name
+ " tranformation is failure");
assertEquals(true, false);
16 years, 1 month
JBoss Tools SVN: r12111 - in trunk/jbpm: plugins/org.jboss.tools.jbpm.convert/META-INF and 23 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-11-28 03:39:29 -0500 (Fri, 28 Nov 2008)
New Revision: 12111
Added:
trunk/jbpm/tests/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/.classpath
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/.project
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/.settings/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/.settings/org.eclipse.jdt.core.prefs
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/META-INF/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/META-INF/MANIFEST.MF
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/bin/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/bin/org/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/bin/org/jboss/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/bin/org/jboss/tools/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/bin/org/jboss/tools/jbpm/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/bin/org/jboss/tools/jbpm/convert/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/bin/org/jboss/tools/jbpm/convert/test/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/bin/org/jboss/tools/jbpm/convert/test/BpmnConvertTest.class
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/build.properties
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/gpd.xml
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/processdefinition.xml
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/test/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/test/BpmnConvertTest.java
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/testfile/
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/testfile/PolicyPricingProcess.bpmn
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/testfile/PolicyPricingProcess.bpmn_diagram
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF
Log:
add tests for jbpm convert module
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF 2008-11-28 07:22:26 UTC (rev 12110)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF 2008-11-28 08:39:29 UTC (rev 12111)
@@ -16,7 +16,9 @@
Bundle-Vendor: %PLUGIN_PROVIDER
Import-Package: org.eclipse.core.resources,
org.eclipse.ui.model
-Export-Package: org.jboss.tools.jbpm.convert.bpmnto,
+Export-Package: org.dom4j,
+ org.jboss.tools.jbpm.convert.b2j.translate,
+ org.jboss.tools.jbpm.convert.bpmnto,
org.jboss.tools.jbpm.convert.bpmnto.translate,
org.jboss.tools.jbpm.convert.bpmnto.util,
org.jboss.tools.jbpm.convert.bpmnto.wizard
Added: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/.classpath
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/.classpath (rev 0)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/.classpath 2008-11-28 08:39:29 UTC (rev 12111)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/.project
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/.project (rev 0)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/.project 2008-11-28 08:39:29 UTC (rev 12111)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.jbpm.convert.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/.settings/org.eclipse.jdt.core.prefs 2008-11-28 08:39:29 UTC (rev 12111)
@@ -0,0 +1,7 @@
+#Wed Nov 26 13:02:25 CST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Added: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/META-INF/MANIFEST.MF (rev 0)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/META-INF/MANIFEST.MF 2008-11-28 08:39:29 UTC (rev 12111)
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test Plug-in
+Bundle-SymbolicName: org.jboss.tools.jbpm.convert.test;singleton:=true
+Bundle-Version: 1.0.0
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.jboss.tools.jbpm.convert;bundle-version="1.0.0"
+Import-Package: junit.framework,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime;version="3.4.0",
+ org.eclipse.emf.common,
+ org.eclipse.emf.ecore.resource,
+ org.eclipse.emf.ecore.xmi,
+ org.eclipse.emf.ecore.xmi.impl,
+ org.osgi.framework
+Bundle-ActivationPolicy: lazy
Added: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/bin/org/jboss/tools/jbpm/convert/test/BpmnConvertTest.class
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/bin/org/jboss/tools/jbpm/convert/test/BpmnConvertTest.class
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/build.properties
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/build.properties (rev 0)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/build.properties 2008-11-28 08:39:29 UTC (rev 12111)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Added: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/gpd.xml
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/gpd.xml (rev 0)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/gpd.xml 2008-11-28 08:39:29 UTC (rev 12111)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-diagram name="Policy Pricing" width="1500" height="214">
+ <node width="100" height="40" name="Price Policy" x="144" y="0"> <transition name="au_gen_3"> <label x="5" y="-10"/> </transition> </node> <node width="100" height="40" name="Review Pricing" x="555" y="141"> <transition name="au_gen_4"> <label x="5" y="-10"/> </transition> </node> <node width="100" height="40" name=" Price Calculated ?" x="373" y="16"> <transition name="false"> <label x="5" y="-10"/> </transition> <transition name="true"> <label x="5" y="-10"/> </transition> </node> <node width="100" height="40" name="au_gen" x="16" y="80"> <transition name="au_gen_2"> <label x="5" y="-10"/> </transition> </node> <node width="100" height="40" name="au_gen_1" x="832" y="80"/></process-diagram>
Added: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/processdefinition.xml
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/processdefinition.xml (rev 0)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/resultfile/PolicyPricingProcess.bpmn/Policy Pricing/processdefinition.xml 2008-11-28 08:39:29 UTC (rev 12111)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition xmlns="urn:jbpm.org:jpdl-3.2" name="Policy Pricing">
+ <node name="Price Policy"> <transition name="au_gen_3" to=" Price Calculated ?"/> </node> <start-state name="au_gen"> <transition name="au_gen_2" to="Price Policy"/> </start-state> <decision name=" Price Calculated ?"> <transition name="false" to="au_gen_1"/> <transition name="true" to="Review Pricing"/> </decision> <node name="Review Pricing"> <transition name="au_gen_4" to="au_gen_1"/> </node> <end-state name="au_gen_1"/></process-definition>
Added: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/test/BpmnConvertTest.java
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/test/BpmnConvertTest.java (rev 0)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/test/BpmnConvertTest.java 2008-11-28 08:39:29 UTC (rev 12111)
@@ -0,0 +1,192 @@
+package org.jboss.tools.jbpm.convert.test;
+
+import junit.framework.TestCase;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+
+import org.dom4j.Document;
+import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.jbpm.convert.b2j.translate.*;
+import org.jboss.tools.jbpm.convert.bpmnto.util.BPMNToUtil;
+
+public class BpmnConvertTest extends TestCase {
+
+ public void testConvert() throws IOException {
+ String absolutePath = Platform.getBundle(
+ "org.jboss.tools.jbpm.convert.test").getLocation()
+ .substring(16);
+ String bpmnfilePath = absolutePath + "testfile";
+ String expectedPath = absolutePath + "resultfile";
+ File[] bpmnFiles = listAll(bpmnfilePath);
+
+ BPMN2JPDL jpdltranformer = null;
+ GraphicalFileGenerator gpdtranformer = null;
+ String str1 = "";
+ int count = 0;
+ for (int i = 0; i < bpmnFiles.length; i++) {
+ String name = bpmnFiles[i].getName();
+ String path = bpmnFiles[i].getParentFile().getAbsolutePath();
+ Document bpmnDocument = null;
+ Document bpmnDiagramDocument = null;
+ try {
+ bpmnDocument = getDocument(path, name);
+ bpmnDiagramDocument = getDocument(path, TranslateHelper
+ .getBpmnDiagramName(name));
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ String tmpLocation = getTempDir().getAbsolutePath();
+
+ jpdltranformer = new BPMN2JPDL(name, path, bpmnDocument);
+ jpdltranformer.translateToFiles(tmpLocation);
+
+ gpdtranformer = new GraphicalFileGenerator(bpmnDiagramDocument,
+ jpdltranformer.getMap(), path, name);
+ gpdtranformer.translateToFiles(tmpLocation);
+
+ try {
+ if (!compareWithExpectedResult(tmpLocation + File.separator
+ + "jpdl" + File.separator + name, expectedPath
+ + File.separator + name)) {
+ System.out.println("the testing bpmn named /" + str1
+ + " tranformation is failure");
+ assertEquals(true, false);
+
+ } else {
+ count++;
+ assertEquals(true, true);
+ }
+ } catch (Exception e) {
+ System.out.println("the testing bpmn named /" + str1
+ + " has error");
+ e.printStackTrace();
+ assertEquals(true, false);
+ return;
+ }
+ }
+
+ System.out.println("the test is over!!! " + count
+ + " files have been examined.");
+ }
+
+ private boolean compareWithExpectedResult(String tmpLocation,
+ String expectedPath) throws IOException {
+ boolean isTrue = true;
+
+ File tmp = new File(tmpLocation);
+ File expectedFile = new File(expectedPath);
+
+ isTrue = compareFile(tmp, expectedFile);
+
+ if (!isTrue) {
+ return isTrue;
+ }
+ return isTrue;
+ }
+
+ private boolean compareFile(File result, File expectedFile)
+ throws IOException {
+ boolean isTrue = true;
+ if (result.isFile()) {
+ isTrue = compareInputSteam(getInputStream(expectedFile),
+ getInputStream(result));
+ }
+ if (!isTrue) {
+ return isTrue;
+ }
+ if (result.isDirectory()) {
+ for (int i = 0; i < result.listFiles().length; i++) {
+ String name = result.listFiles()[i].getName();
+ File tmp = new File(expectedFile, name);
+ isTrue = compareFile(result.listFiles()[i], tmp);
+ if (!isTrue) {
+ return isTrue;
+ }
+ }
+ }
+ return isTrue;
+ }
+
+ private boolean compareInputSteam(InputStream expected, InputStream result)
+ throws IOException {
+
+ String expectedStr = "";
+ String resultStr = "";
+
+ while (true) {
+ int i = expected.read();
+ int j = result.read();
+ expectedStr += (char) i;
+ resultStr += (char) j;
+ if (i != j) {
+ System.err.println(expectedStr);
+ System.out.println();
+ return false;
+ }
+ if (i == -1)
+ return true;
+ }
+ }
+
+ private InputStream getInputStream(File file) throws FileNotFoundException {
+ InputStream stream = null;
+ stream = new FileInputStream(file);
+ return stream;
+ }
+
+ // return the file array of the directory
+ public static File[] listAll(String filename) {
+ File file = new File(filename);
+ ArrayList<File> list = new ArrayList<File>();
+ File[] files;
+ if (!file.exists() || file.isFile()) {
+ return new File[0];
+ }
+ list(list, file);
+ list.remove(file);
+ files = new File[list.size()];
+ list.toArray(files);
+ return files;
+ }
+
+ // add the file to the file array
+ private static void list(ArrayList<File> list, File file) {
+ if (file.getName().endsWith("bpmn")) {
+ list.add(file);
+ }
+ if (file.isFile()) {
+ return;
+ }
+
+ if (file.isDirectory()) {
+ File files[] = file.listFiles();
+ for (int i = 0; i < files.length; i++) {
+ list(list, files[i]);
+ }
+ }
+ }
+
+ /*
+ * get the dom document from a given path and file name
+ */
+ public Document getDocument(String bpmnFileParentPath, String bpmnFileName)
+ throws Exception {
+ Document bpmnDocument = null;
+ bpmnDocument = BPMNToUtil.parse(bpmnFileParentPath, bpmnFileName);
+ return bpmnDocument;
+ }
+
+ public File getTempDir() {
+ File tempdir = new File(System.getProperty("java.io.tmpdir"));
+ File tmpdir = new File(tempdir, "tmp" + System.currentTimeMillis());
+ if (tmpdir.exists()) {
+ System.out.println("This dir is exist");
+ }
+ tmpdir.mkdirs();
+ return tmpdir;
+ }
+}
\ No newline at end of file
Added: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/testfile/PolicyPricingProcess.bpmn
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/testfile/PolicyPricingProcess.bpmn (rev 0)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/testfile/PolicyPricingProcess.bpmn 2008-11-28 08:39:29 UTC (rev 12111)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:BpmnDiagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:bpmn="http://stp.eclipse.org/bpmn" xmi:id="_1ZcdAVmhEd2P9rCHPooJgA" iD="_1ZcdAFmhEd2P9rCHPooJgA">
+ <pools xmi:type="bpmn:Pool" xmi:id="_1ZpRUVmhEd2P9rCHPooJgA" iD="_1ZpRUFmhEd2P9rCHPooJgA" name="Policy Pricing">
+ <artifacts xmi:type="bpmn:DataObject" xmi:id="_fliSgVmmEd2P9rCHPooJgA" iD="_fliSgFmmEd2P9rCHPooJgA" name="Driver">
+ <associations xmi:type="bpmn:Association" xmi:id="_iz_ykFmmEd2P9rCHPooJgA" target="_A-sB0FmiEd2P9rCHPooJgA"/>
+ </artifacts>
+ <artifacts xmi:type="bpmn:DataObject" xmi:id="_eFomAVmmEd2P9rCHPooJgA" iD="_eFomAFmmEd2P9rCHPooJgA" name="Policy">
+ <associations xmi:type="bpmn:Association" xmi:id="_iAHekFmmEd2P9rCHPooJgA" target="_A-sB0FmiEd2P9rCHPooJgA"/>
+ </artifacts>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_1ZpRU1mhEd2P9rCHPooJgA" iD="_1ZpRUlmhEd2P9rCHPooJgA" outgoingEdges="_W_ip4VmiEd2P9rCHPooJgA" incomingEdges="_WBEPcVmiEd2P9rCHPooJgA" name="Price Policy" lanes="_GO-2wVmiEd2P9rCHPooJgA" activityType="Task"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_A-sB0FmiEd2P9rCHPooJgA" iD="_A-rawFmiEd2P9rCHPooJgA" associations="_iAHekFmmEd2P9rCHPooJgA _iz_ykFmmEd2P9rCHPooJgA" outgoingEdges="_WBEPcVmiEd2P9rCHPooJgA" lanes="_HHcIwVmiEd2P9rCHPooJgA _GO-2wVmiEd2P9rCHPooJgA" activityType="EventStartMessage"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_OwuOUVmiEd2P9rCHPooJgA" iD="_OwuOUFmiEd2P9rCHPooJgA" outgoingEdges="_h4ty4VmiEd2P9rCHPooJgA _kUIscVmiEd2P9rCHPooJgA" incomingEdges="_W_ip4VmiEd2P9rCHPooJgA" name=" Price Calculated ?" lanes="_GO-2wVmiEd2P9rCHPooJgA _HHcIwVmiEd2P9rCHPooJgA" activityType="GatewayDataBasedExclusive"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_P2TWUVmiEd2P9rCHPooJgA" iD="_P2TWUFmiEd2P9rCHPooJgA" outgoingEdges="_lkjLcVmiEd2P9rCHPooJgA" incomingEdges="_kUIscVmiEd2P9rCHPooJgA" name="Review Pricing" lanes="_HHcIwVmiEd2P9rCHPooJgA"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_ZxYfYVmiEd2P9rCHPooJgA" iD="_ZxYfYFmiEd2P9rCHPooJgA" incomingEdges="_h4ty4VmiEd2P9rCHPooJgA _lkjLcVmiEd2P9rCHPooJgA" lanes="_HHcIwVmiEd2P9rCHPooJgA _GO-2wVmiEd2P9rCHPooJgA" activityType="EventEndEmpty"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_WBEPcVmiEd2P9rCHPooJgA" iD="_WBEPcFmiEd2P9rCHPooJgA" source="_A-sB0FmiEd2P9rCHPooJgA" target="_1ZpRU1mhEd2P9rCHPooJgA"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_W_ip4VmiEd2P9rCHPooJgA" iD="_W_ip4FmiEd2P9rCHPooJgA" source="_1ZpRU1mhEd2P9rCHPooJgA" target="_OwuOUVmiEd2P9rCHPooJgA"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_h4ty4VmiEd2P9rCHPooJgA" iD="_h4ty4FmiEd2P9rCHPooJgA" name="false" source="_OwuOUVmiEd2P9rCHPooJgA" target="_ZxYfYVmiEd2P9rCHPooJgA"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_kUIscVmiEd2P9rCHPooJgA" iD="_kUIscFmiEd2P9rCHPooJgA" name="true" source="_OwuOUVmiEd2P9rCHPooJgA" target="_P2TWUVmiEd2P9rCHPooJgA"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_lkjLcVmiEd2P9rCHPooJgA" iD="_lkjLcFmiEd2P9rCHPooJgA" source="_P2TWUVmiEd2P9rCHPooJgA" target="_ZxYfYVmiEd2P9rCHPooJgA"/>
+ <lanes xmi:type="bpmn:Lane" xmi:id="_GO-2wVmiEd2P9rCHPooJgA" iD="_GO-2wFmiEd2P9rCHPooJgA" name="services-lane" activities="_1ZpRU1mhEd2P9rCHPooJgA _OwuOUVmiEd2P9rCHPooJgA _A-sB0FmiEd2P9rCHPooJgA _ZxYfYVmiEd2P9rCHPooJgA"/>
+ <lanes xmi:type="bpmn:Lane" xmi:id="_HHcIwVmiEd2P9rCHPooJgA" iD="_HHcIwFmiEd2P9rCHPooJgA" name="loanprocessor" activities="_A-sB0FmiEd2P9rCHPooJgA _P2TWUVmiEd2P9rCHPooJgA _ZxYfYVmiEd2P9rCHPooJgA _OwuOUVmiEd2P9rCHPooJgA"/>
+ </pools>
+</bpmn:BpmnDiagram>
Added: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/testfile/PolicyPricingProcess.bpmn_diagram
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/testfile/PolicyPricingProcess.bpmn_diagram (rev 0)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/testfile/PolicyPricingProcess.bpmn_diagram 2008-11-28 08:39:29 UTC (rev 12111)
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:bpmn="http://stp.eclipse.org/bpmn" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmi:id="_1Ze5QFmhEd2P9rCHPooJgA" type="Bpmn" name="PolicyPricingProcess.bpmn_diagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Node" xmi:id="_1ZqfcFmhEd2P9rCHPooJgA" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_1ZrGgFmhEd2P9rCHPooJgA" type="4008"/>
+ <children xmi:type="notation:Node" xmi:id="_1ZrtkFmhEd2P9rCHPooJgA" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_1Zs7sFmhEd2P9rCHPooJgA" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_1Zs7tlmhEd2P9rCHPooJgA" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_1Zs7sVmhEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_1Zs7slmhEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_1Zs7s1mhEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_1Zs7tFmhEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="PolicyPricingProcess.bpmn#_1ZpRU1mhEd2P9rCHPooJgA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ZtiwFmhEd2P9rCHPooJgA" x="144" width="133" height="61"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_A-so4FmiEd2P9rCHPooJgA" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_A-tP8FmiEd2P9rCHPooJgA" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_A-so4VmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_A-so4lmiEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_A-so41miEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_A-so5FmiEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="PolicyPricingProcess.bpmn#_A-sB0FmiEd2P9rCHPooJgA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A-so5VmiEd2P9rCHPooJgA" x="16" y="80"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_GPAr8FmiEd2P9rCHPooJgA" type="2007">
+ <children xmi:type="notation:Node" xmi:id="_GPBTAFmiEd2P9rCHPooJgA" type="4007"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_GPAr8VmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_GPAr8lmiEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_GPAr81miEd2P9rCHPooJgA" fillColor="16771304"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_GPAr9FmiEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:Lane" href="PolicyPricingProcess.bpmn#_GO-2wVmiEd2P9rCHPooJgA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GPAr9VmiEd2P9rCHPooJgA" y="5" height="89"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_HHdW4FmiEd2P9rCHPooJgA" type="2007">
+ <children xmi:type="notation:Node" xmi:id="_HHdW5lmiEd2P9rCHPooJgA" type="4007"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_HHdW4VmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_HHdW4lmiEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_HHdW41miEd2P9rCHPooJgA" fillColor="16771304"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_HHdW5FmiEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:Lane" href="PolicyPricingProcess.bpmn#_HHcIwVmiEd2P9rCHPooJgA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HHdW5VmiEd2P9rCHPooJgA" y="96" height="103"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_OwvccFmiEd2P9rCHPooJgA" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_OwwDgFmiEd2P9rCHPooJgA" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_OwvccVmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_OwvcclmiEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_Owvcc1miEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_OwvcdFmiEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="PolicyPricingProcess.bpmn#_OwuOUVmiEd2P9rCHPooJgA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OwvcdVmiEd2P9rCHPooJgA" x="373" y="16"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_P2UkcFmiEd2P9rCHPooJgA" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_P2VLgFmiEd2P9rCHPooJgA" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_P2UkcVmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_P2UkclmiEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_P2Ukc1miEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_P2UkdFmiEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="PolicyPricingProcess.bpmn#_P2TWUVmiEd2P9rCHPooJgA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P2UkdVmiEd2P9rCHPooJgA" x="555" y="141"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_ZxZtgFmiEd2P9rCHPooJgA" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_ZxaUlFmiEd2P9rCHPooJgA" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_ZxZtgVmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_ZxaUkFmiEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_ZxaUkVmiEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_ZxaUklmiEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="PolicyPricingProcess.bpmn#_ZxYfYVmiEd2P9rCHPooJgA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZxaUk1miEd2P9rCHPooJgA" x="832" y="80"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_fli5kFmmEd2P9rCHPooJgA" type="1003">
+ <children xmi:type="notation:Node" xmi:id="_fljgoFmmEd2P9rCHPooJgA" type="4010"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_fli5kVmmEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_fli5klmmEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_fli5k1mmEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_fli5lFmmEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:DataObject" href="PolicyPricingProcess.bpmn#_fliSgVmmEd2P9rCHPooJgA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fli5lVmmEd2P9rCHPooJgA" x="160" y="144"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_eFp0IFmmEd2P9rCHPooJgA" type="1003">
+ <children xmi:type="notation:Node" xmi:id="_eFp0JlmmEd2P9rCHPooJgA" type="4010"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_eFp0IVmmEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_eFp0IlmmEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_eFp0I1mmEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_eFp0JFmmEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:DataObject" href="PolicyPricingProcess.bpmn#_eFomAVmmEd2P9rCHPooJgA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eFp0JVmmEd2P9rCHPooJgA" x="64" y="144"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_1ZrtkVmhEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_1ZrtklmhEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_1Zrtk1mhEd2P9rCHPooJgA"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_1ZqfcVmhEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_1ZqfclmhEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_1Zqfc1mhEd2P9rCHPooJgA" fillColor="16771304"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_1ZqfdFmhEd2P9rCHPooJgA" lineColor="11119017"/>
+ <element xmi:type="bpmn:Pool" href="PolicyPricingProcess.bpmn#_1ZpRUVmhEd2P9rCHPooJgA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ZrtlFmhEd2P9rCHPooJgA" x="16" y="32" width="1500" height="214"/>
+ </children>
+ <styles xmi:type="notation:PageStyle" xmi:id="_1Ze5QVmhEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:GuideStyle" xmi:id="_1Ze5QlmhEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_1Ze5Q1mhEd2P9rCHPooJgA"/>
+ <element xmi:type="bpmn:BpmnDiagram" href="PolicyPricingProcess.bpmn#_1ZcdAVmhEd2P9rCHPooJgA"/>
+ <edges xmi:type="notation:Edge" xmi:id="_WBGEoFmiEd2P9rCHPooJgA" type="3001" source="_A-so4FmiEd2P9rCHPooJgA" target="_1Zs7sFmhEd2P9rCHPooJgA">
+ <children xmi:type="notation:Node" xmi:id="_WBHSwFmiEd2P9rCHPooJgA" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_WBHSwVmiEd2P9rCHPooJgA" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_WBHSwlmiEd2P9rCHPooJgA" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_WBHSw1miEd2P9rCHPooJgA" y="-10"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_WBGEoVmiEd2P9rCHPooJgA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_WBGEolmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_WBGEo1miEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="PolicyPricingProcess.bpmn#_WBEPcVmiEd2P9rCHPooJgA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WBGEpFmiEd2P9rCHPooJgA" points="[15, -6, -162, 45]$[113, -50, -64, 1]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_W_kfEFmiEd2P9rCHPooJgA" type="3001" source="_1Zs7sFmhEd2P9rCHPooJgA" target="_OwvccFmiEd2P9rCHPooJgA">
+ <children xmi:type="notation:Node" xmi:id="_W_kfFVmiEd2P9rCHPooJgA" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_W_kfFlmiEd2P9rCHPooJgA" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_W_kfF1miEd2P9rCHPooJgA" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_W_kfGFmiEd2P9rCHPooJgA" y="-10"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_W_kfEVmiEd2P9rCHPooJgA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_W_kfElmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_W_kfE1miEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="PolicyPricingProcess.bpmn#_W_ip4VmiEd2P9rCHPooJgA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_W_kfFFmiEd2P9rCHPooJgA" points="[65, -4, -136, -1]$[185, -13, -16, -10]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_h4uZ8FmiEd2P9rCHPooJgA" type="3001" source="_OwvccFmiEd2P9rCHPooJgA" target="_ZxZtgFmiEd2P9rCHPooJgA">
+ <children xmi:type="notation:Node" xmi:id="_h4vBBFmiEd2P9rCHPooJgA" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_h4vBBVmiEd2P9rCHPooJgA" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_h4vBBlmiEd2P9rCHPooJgA" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_h4vBB1miEd2P9rCHPooJgA" y="-10"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_h4vBAFmiEd2P9rCHPooJgA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_h4vBAVmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_h4vBAlmiEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="PolicyPricingProcess.bpmn#_h4ty4VmiEd2P9rCHPooJgA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_h4vBA1miEd2P9rCHPooJgA" points="[0, 1, -397, -70]$[397, 36, 0, -35]$[397, 71, 0, 0]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_kUJ6kFmiEd2P9rCHPooJgA" type="3001" source="_OwvccFmiEd2P9rCHPooJgA" target="_P2UkcFmiEd2P9rCHPooJgA">
+ <children xmi:type="notation:Node" xmi:id="_kUKhoFmiEd2P9rCHPooJgA" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_kUKhoVmiEd2P9rCHPooJgA" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_kUKholmiEd2P9rCHPooJgA" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_kUKho1miEd2P9rCHPooJgA" y="-10"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_kUJ6kVmiEd2P9rCHPooJgA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_kUJ6klmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_kUJ6k1miEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="PolicyPricingProcess.bpmn#_kUIscVmiEd2P9rCHPooJgA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kUJ6lFmiEd2P9rCHPooJgA" points="[13, 11, -186, -101]$[165, 141, -34, 29]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_lklnsFmiEd2P9rCHPooJgA" type="3001" source="_P2UkcFmiEd2P9rCHPooJgA" target="_ZxZtgFmiEd2P9rCHPooJgA">
+ <children xmi:type="notation:Node" xmi:id="_lklntVmiEd2P9rCHPooJgA" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_lklntlmiEd2P9rCHPooJgA" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_lklnt1miEd2P9rCHPooJgA" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_lklnuFmiEd2P9rCHPooJgA" y="-10"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_lklnsVmiEd2P9rCHPooJgA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_lklnslmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_lklns1miEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="PolicyPricingProcess.bpmn#_lkjLcVmiEd2P9rCHPooJgA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lklntFmiEd2P9rCHPooJgA" points="[54, -11, -185, 47]$[254, -43, 15, 15]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_iAIFoFmmEd2P9rCHPooJgA" type="3003" source="_eFp0IFmmEd2P9rCHPooJgA" target="_A-so4FmiEd2P9rCHPooJgA">
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_iAIFoVmmEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_iAIFolmmEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_iAIFo1mmEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:Association" href="PolicyPricingProcess.bpmn#_iAHekFmmEd2P9rCHPooJgA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iAIFpFmmEd2P9rCHPooJgA" points="[-9, -6, 39, 32]$[-63, -40, -15, -2]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iAJ60FmmEd2P9rCHPooJgA" id="(0.25,0.175)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_i0AZoFmmEd2P9rCHPooJgA" type="3003" source="_fli5kFmmEd2P9rCHPooJgA" target="_A-so4FmiEd2P9rCHPooJgA">
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_i0AZoVmmEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_i0AZolmmEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_i0AZo1mmEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:Association" href="PolicyPricingProcess.bpmn#_iz_ykFmmEd2P9rCHPooJgA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_i0AZpFmmEd2P9rCHPooJgA" points="[-12, -3, 160, 36]$[-187, -27, -15, 12]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i0C14FmmEd2P9rCHPooJgA" id="(0.325,0.15)"/>
+ </edges>
+</notation:Diagram>
16 years, 1 month
JBoss Tools SVN: r12110 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-11-28 02:22:26 -0500 (Fri, 28 Nov 2008)
New Revision: 12110
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java
Log:
JBIDE-2943
Fix it
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-11-28 07:02:01 UTC (rev 12109)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-11-28 07:22:26 UTC (rev 12110)
@@ -67,7 +67,7 @@
private AdapterFactoryEditingDomain editingDomain;
private Resource smooksResource;
- private SmooksTextEdtor textEdtior = null;
+ // private SmooksTextEdtor textEdtior = null;
private boolean forceDirty = false;
private boolean onlyShowTextEditor = false;
@@ -150,19 +150,22 @@
this.showTextEditorReason = reason;
}
+ /**
+ * @deprecated
+ */
public void removeGraphicalFormPage() {
int count = this.getPageCount();
- try {
- if (textEdtior == null) {
- textEdtior = new SmooksTextEdtor(showTextEditorReason);
- this.addPage(textEdtior, getEditorInput());
- for (int i = 0; i < count; i++) {
- this.removePage(0);
- }
- }
- } catch (PartInitException e) {
- e.printStackTrace();
- }
+ // try {
+ // if (textEdtior == null) {
+ // textEdtior = new SmooksTextEdtor(showTextEditorReason);
+ // this.addPage(textEdtior, getEditorInput());
+ // for (int i = 0; i < count; i++) {
+ // this.removePage(0);
+ // }
+ // }
+ // } catch (PartInitException e) {
+ // e.printStackTrace();
+ // }
}
/*
@@ -241,13 +244,14 @@
@Override
public void doSave(IProgressMonitor monitor) {
- IEditorPart activeEditor = this.getEditor(this.getCurrentPage());
- if (activeEditor != normalPage && activeEditor != null) {
- activeEditor.doSave(monitor);
+ int index = this.getCurrentPage();
+ if (index == 2) {
+ this.xmlTextEditor.doSave(monitor);
fireEditorDirty(false);
- }
- if(activeEditor == null){
+ } else {
+
this.graphicalPage.doSave(monitor);
+ fireEditorDirty(false);
}
}
16 years, 1 month
JBoss Tools SVN: r12109 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-11-28 02:02:01 -0500 (Fri, 28 Nov 2008)
New Revision: 12109
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java
Log:
JBIDE-3258
fix the bug that source tab can't save file on windows.
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-11-28 06:09:38 UTC (rev 12108)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-11-28 07:02:01 UTC (rev 12109)
@@ -112,7 +112,7 @@
if (mappingResourceConfig != null) {
refreshNormalPage(mappingResourceConfig
.getRelationgResourceConfigList());
- }else{
+ } else {
refreshNormalPage(Collections.EMPTY_LIST);
}
}
@@ -241,13 +241,14 @@
@Override
public void doSave(IProgressMonitor monitor) {
- this.graphicalPage.doSave(monitor);
- fireEditorDirty(false);
- // IEditorPart activeEditor = this.getEditor(this.getCurrentPage());
- // if (activeEditor != normalPage && activeEditor != null) {
- // activeEditor.doSave(monitor);
- // fireEditorDirty(false);
- // }
+ IEditorPart activeEditor = this.getEditor(this.getCurrentPage());
+ if (activeEditor != normalPage && activeEditor != null) {
+ activeEditor.doSave(monitor);
+ fireEditorDirty(false);
+ }
+ if(activeEditor == null){
+ this.graphicalPage.doSave(monitor);
+ }
}
public void fireEditorDirty(boolean dirty) {
16 years, 1 month
JBoss Tools SVN: r12107 - trunk/i18n.
by jbosstools-commits＠lists.jboss.org
Author: sflanigan
Date: 2008-11-27 23:57:55 -0500 (Thu, 27 Nov 2008)
New Revision: 12107
Modified:
trunk/i18n/build.xml
trunk/i18n/site-template.xml
Log:
Changed site.xml generation to use CDATA in <echo>; other minor tweaks.
Modified: trunk/i18n/build.xml
===================================================================
--- trunk/i18n/build.xml 2008-11-28 03:16:20 UTC (rev 12106)
+++ trunk/i18n/build.xml 2008-11-28 04:57:55 UTC (rev 12107)
@@ -78,7 +78,7 @@
<delete dir="po" includes="**/*.pot" />
</target>
- <target name="clean" description="Remove generated files">
+ <target name="clean" description="Remove generated files (except pot)">
<!-- obsolete dirs -->
<delete dir="target/pot" />
<delete dir="po/en" />
@@ -234,7 +234,7 @@
</path>
<sequential>
<echo message="@{pluginsrcdir}" />
- <!-- TODO avoid property override if possible -->
+ <!-- TODO avoid property overrides if possible -->
<!-- work out the plugin ID -->
<var name="module" unset="true" />
<propertyregex override="true" property="module"
@@ -261,7 +261,6 @@
<target name="-plugin" >
<!-- Jars up one fragment plugin. -->
- <echo message="${plugindir}"/>
<jar
destfile="${jardir}/plugins/${plugin}.nl-${locale}_${PLUGIN_VERSION}.jar"
filesonly="true"
@@ -295,7 +294,7 @@
<delete dir="${jardir}/features" />
<mkdir dir="${jardir}/features" />
<tempfile
- property="temp.file.sitefeatures"
+ property="temp.file.site.contents"
destdir="${target.dir}"
prefix="site"
suffix=".tmp"
@@ -327,14 +326,14 @@
<foreachlocale task="-categorydef"/>
+ <!-- Shouldn't need this, just being safe: -->
+ <var name="site.contents" unset="true" />
<!-- Read in the list of <feature>s and <category-def>s created by
the targets -categorydef and -feature -->
- <!-- TODO this is an ugly way to build XML
- (see also the <echo>s in above-mentioned targets) -->
- <var name="features" unset="true" />
- <loadfile property="features" srcFile="${temp.file.sitefeatures}"/>
- <delete file="${temp.file.sitefeatures}"/>
-
+ <loadfile property="site.contents" srcFile="${temp.file.site.contents}"/>
+ <!--
+ <delete file="${temp.file.site.contents}"/>
+ -->
<!-- And create the feature from the template, filling in the list of features -->
<copy overwrite="true" tofile="${jardir}/site.xml" file="site-template.xml">
<filterchain>
@@ -343,33 +342,16 @@
</copy>
</target>
- <!-- Create a <category-def> for ${locale} for site.xml -->
- <target name="-categorydef">
- <!-- ugly -->
- <echo append="true" file="${temp.file.sitefeatures}"
- message="<category-def name="${locale}" label="JBoss Tools Localization (${localename})"/>" />
- <!-- demunged, that looks like:
- <category-def
- name="${locale}"
- label="JBoss Tools Localization (${localename})"/>
- -->
- </target>
-
<!-- Create feature jar including manifest. Also create a <feature> for site.xml -->
<target name="-feature">
- <!-- create langpack feature element for site.xml -->
- <!-- ugly -->
- <echo append="true" file="${temp.file.sitefeatures}"
- message="<feature url="features/${feature}.nl-${locale}_${FEATURE_VERSION}.jar"
- id="${feature}.nl-${locale}" version="${FEATURE_VERSION}">
- <category name="${locale}"/>
- </feature>" />
- <!-- demunged, that looks like:
- <feature url="features/${feature}.nl-${locale}_${FEATURE_VERSION}.jar"
- id="${feature}.nl-${locale}" version="${FEATURE_VERSION}">
- <category name="${locale}"/>
- </feature>
- -->
+ <!-- create langpack <feature> to go into site.xml -->
+ <echo append="true" file="${temp.file.site.contents}"><![CDATA[
+ <feature
+ url="features/${feature}.nl-${locale}_${FEATURE_VERSION}.jar"
+ id="${feature}.nl-${locale}"
+ version="${FEATURE_VERSION}">
+ <category name="${locale}"/>
+ </feature>]]></echo>
<!-- Process feature.xml with <xslt> -->
<xslt
style="feature.xsl"
@@ -390,10 +372,18 @@
<jar destfile="${jardir}/features/${feature}.nl-${locale}_${PLUGIN_VERSION}.jar"
basedir="${propdir}/features/${feature}.nl-${locale}_${PLUGIN_VERSION}" />
<!-- might want to keep around for debugging:
- <delete dir="${propdir}/features/${feature}.nl-${locale}_${PLUGIN_VERSION}" />
-->
+ <delete dir="${propdir}/features/${feature}.nl-${locale}_${PLUGIN_VERSION}" />
</target>
+ <!-- Create a <category-def> for ${locale} to go into site.xml -->
+ <target name="-categorydef">
+ <echo append="true" file="${temp.file.site.contents}"><![CDATA[
+ <category-def
+ name="${locale}"
+ label="JBoss Tools Localization (${localename})"/>]]></echo>
+ </target>
+
<target name="p2" description="Generate metadata for Eclipse 3.4's update manager (P2)" >
<!-- Generate P2 metadata so that update manager won't take forever.
http://wiki.eclipse.org/Equinox_p2_Metadata_Generator
Modified: trunk/i18n/site-template.xml
===================================================================
--- trunk/i18n/site-template.xml 2008-11-28 03:16:20 UTC (rev 12106)
+++ trunk/i18n/site-template.xml 2008-11-28 04:57:55 UTC (rev 12107)
@@ -3,5 +3,5 @@
<description url="http://www.jboss.org/tools">
This is the development update site for JBoss Tools Localization. You will find the latest development release of JBossTools here.
</description>
- ${features}
+${site.contents}
</site>
16 years, 1 month
JBoss Tools SVN: r12106 - trunk/i18n.
by jbosstools-commits＠lists.jboss.org
Author: sflanigan
Date: 2008-11-27 22:16:20 -0500 (Thu, 27 Nov 2008)
New Revision: 12106
Added:
trunk/i18n/prop2potincludes.txt
Modified:
trunk/i18n/build.xml
trunk/i18n/i18n.properties
Log:
Externalised prop2pot wildcards and corresponding regex.
Modified: trunk/i18n/build.xml
===================================================================
--- trunk/i18n/build.xml 2008-11-28 02:52:08 UTC (rev 12105)
+++ trunk/i18n/build.xml 2008-11-28 03:16:20 UTC (rev 12106)
@@ -107,8 +107,8 @@
regexpmapper below)
-->
<prop2pot srcDir="${jbt.srcdir}" dstDir="po"
- includes="*/plugins/*/plugin.properties,*/plugins/*/src/**/*.properties,*/plugins/*/jbosscore/**/*.properties,*/plugins/*/jbossui/**/*.properties,*/plugins/*/resources/**/*.properties,*/plugins/*/template-src/**/*.properties" >
- <!-- we need to include properties from the following base directories:
+ includesfile="prop2potincludes.txt">
+ <!-- we currently need to include properties from the following base directories:
src/main
src
jbosscore
@@ -120,10 +120,12 @@
-->
<chainedmapper>
<!-- rename to module~pluginID-org.jboss.ide.*~org.jboss.ide.*.pot -->
+
+ <!-- from/to params are defined in i18n.properties -->
<regexpmapper
handledirsep="true"
- from="^([^/]+)/plugins/([^/]+)/(?:src/main/resources/|src/main/|[^/]+/|)(.*)[.]properties$$"
- to="\1~\2-\3~\3.pot" />
+ from="${prop2pot_regex_from}"
+ to="${prop2pot_regex_to}" />
<filtermapper>
<!-- org/jboss/ide/* -> org.jboss.ide.* -->
<replacestring from="${file.separator}" to="."/>
Modified: trunk/i18n/i18n.properties
===================================================================
--- trunk/i18n/i18n.properties 2008-11-28 02:52:08 UTC (rev 12105)
+++ trunk/i18n/i18n.properties 2008-11-28 03:16:20 UTC (rev 12106)
@@ -5,25 +5,8 @@
#locales: en,en_AA,qps,zh_CN,pt_BR,es_ES,fr_FR,de_DE
locales: en,en_AA,qps
-#we don't care about .properties/.meta in these places:
-srcexcludes=\
-*/plugins/*/.settings,\
-*/plugins/*/bin,\
-*/plugins/*/build,\
-*/plugins/*/dtd,\
-*/plugins/*/dtds,\
-*/plugins/*/dtdsAndSchemas,\
-*/plugins/*/icons,\
-*/plugins/*/images,\
-*/plugins/*/lib,\
-*/plugins/*/libsrc,\
-*/plugins/*/META-INF,\
-*/plugins/*/template-src,\
-*/plugins/*/meta,\
-*/plugins/*/schema,\
-*/plugins/*/schemas,\
-*/plugins/*/target
-#*/plugins/*/templates
+prop2pot_regex_from=^([^/]+)/plugins/([^/]+)/(?:src/main/resources/|src/main/|[^/]+/|)(.*)[.]properties$$
+prop2pot_regex_to=\\1~\\2-\\3~\\3.pot
BUILD_NUMBER=0
PLUGIN_VERSION=0.1.${BUILD_NUMBER}
Added: trunk/i18n/prop2potincludes.txt
===================================================================
--- trunk/i18n/prop2potincludes.txt (rev 0)
+++ trunk/i18n/prop2potincludes.txt 2008-11-28 03:16:20 UTC (rev 12106)
@@ -0,0 +1,6 @@
+*/plugins/*/plugin.properties
+*/plugins/*/src/**/*.properties
+*/plugins/*/jbosscore/**/*.properties
+*/plugins/*/jbossui/**/*.properties
+*/plugins/*/resources/**/*.properties
+*/plugins/*/template-src/**/*.properties
16 years, 1 month
JBoss Tools SVN: r12105 - trunk/i18n.
by jbosstools-commits＠lists.jboss.org
Author: sflanigan
Date: 2008-11-27 21:52:08 -0500 (Thu, 27 Nov 2008)
New Revision: 12105
Modified:
trunk/i18n/build.xml
Log:
Changed params to prop2pot task, so that it picks up properties files from more source directories, and changed the regex to suit.
Modified: trunk/i18n/build.xml
===================================================================
--- trunk/i18n/build.xml 2008-11-27 22:46:03 UTC (rev 12104)
+++ trunk/i18n/build.xml 2008-11-28 02:52:08 UTC (rev 12105)
@@ -95,28 +95,34 @@
<target name="prop2pot" depends="init"
description="Extract translation templates (POT) from the JBoss Tools English properties files">
- <!-- paths under jbt.srcdir look like: ${module}/plugins/${plugin}/{src,main,...} -->
- <!-- TODO properties *should* be found in exactly one place, but aren't.
- See https://jira.jboss.org/jira/browse/JBIDE-2972 -->
- <prop2pot srcDir="${jbt.srcdir}" dstDir="po" includes="*/plugins/*/src/**/*.properties" >
- <!-- next two are Maven style, not currently used in JBT: -->
-<!-- These filesets were used in a <jar> call, not supported by <prop2pot>
- <fileset erroronmissingdir="false" dir="${plugindir}/src/main/java"/>
- <fileset erroronmissingdir="false" dir="${plugindir}/src/main/resources"/>
-
- <fileset erroronmissingdir="false" dir="${plugindir}/src/main" excludes="java,resources"/>
- <fileset erroronmissingdir="false" dir="${plugindir}/src" excludes="main"/>
- <fileset erroronmissingdir="false" dir="${plugindir}/jbosscore"/>
- <fileset erroronmissingdir="false" dir="${plugindir}/jbossui"/>
- <fileset erroronmissingdir="false" dir="${plugindir}/resources"/>
- <fileset erroronmissingdir="false" dir="${plugindir}/template-src"/>
- //<fileset dir="${plugindir}/templates"/>
--->
+ <!--
+ Paths under jbt.srcdir look like: ${module}/plugins/${plugin}/{src,src/main,jbosscore,...}
+ TODO the includes and the related regex are too complicated,
+ because we have to look in too many directories to find properties files.
+ See https://jira.jboss.org/jira/browse/JBIDE-2972
+ We can't simply say */plugins/*/*/**/*.properties lest we pick
+ up bin directories, etc.
+
+ NB Leaving out */features/*/feature.properties (also affects
+ regexpmapper below)
+ -->
+ <prop2pot srcDir="${jbt.srcdir}" dstDir="po"
+ includes="*/plugins/*/plugin.properties,*/plugins/*/src/**/*.properties,*/plugins/*/jbosscore/**/*.properties,*/plugins/*/jbossui/**/*.properties,*/plugins/*/resources/**/*.properties,*/plugins/*/template-src/**/*.properties" >
+ <!-- we need to include properties from the following base directories:
+ src/main
+ src
+ jbosscore
+ jbossui
+ resources
+ template-src (but *not* templates)
+ NB Maven conventions would also require:
+ src/main/resources
+ -->
<chainedmapper>
<!-- rename to module~pluginID-org.jboss.ide.*~org.jboss.ide.*.pot -->
<regexpmapper
handledirsep="true"
- from="^([^/]+)/plugins/([^/]+)/[^/]+/(.*)[.]properties$$"
+ from="^([^/]+)/plugins/([^/]+)/(?:src/main/resources/|src/main/|[^/]+/|)(.*)[.]properties$$"
to="\1~\2-\3~\3.pot" />
<filtermapper>
<!-- org/jboss/ide/* -> org.jboss.ide.* -->
16 years, 1 month
JBoss Tools SVN: r12104 - in trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core: internal/project/facet and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-11-27 17:46:03 -0500 (Thu, 27 Nov 2008)
New Revision: 12104
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDataModelProvider.java
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDelegate.java
Log:
JBIDE-2792 Add runtime support for portal
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java 2008-11-27 22:45:52 UTC (rev 12103)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java 2008-11-27 22:46:03 UTC (rev 12104)
@@ -63,7 +63,7 @@
static final String USER_LIBRARY = Messages.IPortletConstants_User_library;
- static final String LIBRARY_PROVIDED_BY_JBOSS_TOOLS = Messages.IPortletConstants_Library_provided_by_JBoss_Tools;
+ //static final String LIBRARY_PROVIDED_BY_JBOSS_TOOLS = Messages.IPortletConstants_Library_provided_by_JBoss_Tools;
static final String LIBRARIES_PROVIDED_BY_SERVER_RUNTIME = Messages.IPortletConstants_Libraries_provided_by_server_runtime;
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDataModelProvider.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDataModelProvider.java 2008-11-27 22:45:52 UTC (rev 12103)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDataModelProvider.java 2008-11-27 22:46:03 UTC (rev 12104)
@@ -15,6 +15,7 @@
import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
import org.jboss.tools.portlet.core.IPortletConstants;
import org.jboss.tools.portlet.core.Messages;
+import org.jboss.tools.portlet.core.PortletCoreActivator;
/**
* @author snjeza
@@ -38,7 +39,15 @@
return ""; //$NON-NLS-1$
}
if (propertyName.equals(IPortletConstants.IMPLEMENTATION_LIBRARY)) {
- return IPortletConstants.LIBRARY_PROVIDED_BY_JBOSS_TOOLS;
+ boolean checkRuntimes = PortletCoreActivator.getDefault()
+ .getPluginPreferences().getBoolean(
+ PortletCoreActivator.CHECK_RUNTIMES);
+ if (checkRuntimes) {
+ return IPortletConstants.LIBRARIES_PROVIDED_BY_SERVER_RUNTIME;
+ } else {
+ return IPortletConstants.USER_LIBRARY;
+ }
+ //return IPortletConstants.LIBRARY_PROVIDED_BY_JBOSS_TOOLS;
}
return super.getDefaultProperty(propertyName);
}
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDelegate.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDelegate.java 2008-11-27 22:45:52 UTC (rev 12103)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDelegate.java 2008-11-27 22:46:03 UTC (rev 12104)
@@ -102,10 +102,11 @@
copyLibraries(monitor,javaProject,config);
} else {
String implementationLibrary = config.getStringProperty(IPortletConstants.IMPLEMENTATION_LIBRARY);
- if (IPortletConstants.LIBRARY_PROVIDED_BY_JBOSS_TOOLS.equals(implementationLibrary)) {
+ /*if (IPortletConstants.LIBRARY_PROVIDED_BY_JBOSS_TOOLS.equals(implementationLibrary)) {
IPath containerPath = new Path(IPortletConstants.PORTLET_CONTAINER_20_ID);
setContainerPath(monitor, javaProject, containerPath);
- } else if (IPortletConstants.LIBRARIES_PROVIDED_BY_SERVER_RUNTIME.equals(implementationLibrary)) {
+ } else*/
+ if (IPortletConstants.LIBRARIES_PROVIDED_BY_SERVER_RUNTIME.equals(implementationLibrary)) {
IPath containerPath = new Path(IPortletConstants.PORTLET_RUNTIME_CONTAINER_ID);
setContainerPath(monitor, javaProject, containerPath);
} else {
16 years, 1 month