JBoss Tools SVN: r20000 - trunk/bpel/releng.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-01-29 00:18:59 -0500 (Fri, 29 Jan 2010)
New Revision: 20000
Modified:
trunk/bpel/releng/custom-library.xml
Log:
call sysproperty what it is
Modified: trunk/bpel/releng/custom-library.xml
===================================================================
--- trunk/bpel/releng/custom-library.xml 2010-01-29 03:32:03 UTC (rev 19999)
+++ trunk/bpel/releng/custom-library.xml 2010-01-29 05:18:59 UTC (rev 20000)
@@ -83,8 +83,9 @@
<arg line="-ws ${ws}"/>
<arg line="-arch ${arch}"/>
<arg line="-consolelog"/>
- <arg line="-vmargs ${vmargs} ${extraVMargs} ${Xflags} ${Dflags} -DPLUGIN_PATH=${plugin-path}"/>
- <jvmarg line="${vmargs} ${extraVMargs} ${Xflags} ${Dflags} -DPLUGIN_PATH=${plugin-path}" />
+ <arg line="-vmargs ${vmargs} ${extraVMargs} ${Xflags} ${Dflags} -DPLUGIN_PATH=${plugin-path}"/>
+ <jvmarg line="${vmargs} ${extraVMargs} ${Xflags} ${Dflags} -DPLUGIN_PATH=${plugin-path}" />
+ <sysproperty key="PLUGIN_PATH" value="${plugin-path}"/>
</java>
<antcall target="collect-results" />
</target>
13 years, 2 months
JBoss Tools SVN: r19999 - workspace/examples.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2010-01-28 22:32:03 -0500 (Thu, 28 Jan 2010)
New Revision: 19999
Modified:
workspace/examples/project-examples-3.0.xml
Log:
Add ESB project examples for soa-p5.0
JBIDE-5546:ESB examples packaged with JBDS 3.0 fail with SOA-P 5.0
JBIDE-5659:Add Project Examples that will work with SOA-P 5.0
Modified: workspace/examples/project-examples-3.0.xml
===================================================================
--- workspace/examples/project-examples-3.0.xml 2010-01-28 22:51:19 UTC (rev 19998)
+++ workspace/examples/project-examples-3.0.xml 2010-01-29 03:32:03 UTC (rev 19999)
@@ -440,6 +440,246 @@
</project>
<project>
+ <category>ESB for SOA-P 5.0</category>
+ <name>helloworld</name>
+ <shortDescription>JBoss ESB HelloWorld Example - ESB</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is a runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
+ This example is to prove that the ESB is is properly configured and happy.
+As well as to demonstrate the needed minimal files to make a basic ESB component execute.</description>
+ <size>59000</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ </project>
+
+ <project>
+ <category>ESB for SOA-P 5.0</category>
+ <name>helloworld_testclient</name>
+ <shortDescription>JBoss ESB HelloWorld Example - Client</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
+ This example is to demonstrate how to invoke the deployed HelloWorld ESB. It requires the helloworld project.</description>
+ <size>1000000</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ </project>
+
+ <project>
+ <category>ESB for SOA-P 5.0</category>
+ <name>helloworld_action</name>
+ <shortDescription>JBoss ESB HelloWorld Action Example - ESB</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
+ This sample is to demonstrate the use of multiple action invocations from a single configuration. You can use
+ a single Action class and make multiple method calls or use multiple Action
+ classes.</description>
+ <size>7100</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ </project>
+
+ <project>
+ <category>ESB for SOA-P 5.0</category>
+ <name>helloworld_action_client</name>
+ <shortDescription>JBoss ESB HelloWorld Action Example - Client</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
+ This sample is to test the deployed helloworld_action ESB. It requires the helloworld_action project</description>
+ <size>18694</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ </project>
+
+ <project>
+ <category>ESB for SOA-P 5.0</category>
+ <name>helloworld_file_action</name>
+ <shortDescription>JBoss ESB HelloWorld File Action Example - ESB</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
+ This is a basic example of using the File gateway feature of the JBoss ESB.
+ Files that are found in a particular directory with a particular extension
+ are sent to a JMS queue with actions for processing. Before deploy the project, please change some properties according to the readme.txt file.</description>
+ <size>7920</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ </project>
+
+ <project>
+ <category>ESB for SOA-P 5.0</category>
+ <name>helloworld_file_action_client</name>
+ <shortDescription>JBoss ESB HelloWorld File Action Example - Client</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
+ This sample is to test the deployed helloworld_file_action ESB. It requires the helloworld_file_action project.</description>
+ <size>18694</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ </project>
+ <project>
+ <category>ESB for SOA-P 5.0</category>
+ <name>webservice_consumer1</name>
+ <shortDescription>JBoss ESB Web Service consumer1 Example</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
+ This example demonstrates how to consume a 181 Web Service in an ESB action.
+ This ESB will make a webservice request that requires a single "toWhom" string parameter.
+ The webservice will return a greeting response. The ESB simply dislays the response on the
+ console.</description>
+ <size>22500</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ </project>
+
+ <project>
+ <category>ESB for SOA-P 5.0</category>
+ <name>webservice_consumer1_client</name>
+ <shortDescription>JBoss ESB Web Service consumer1 Example - Client</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
+ This sample is to test the deployed a comsumer web service.It requires the webservice_consumer1 project.</description>
+ <size>1000000</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ </project>
+
+ <project>
+ <category>ESB for SOA-P 5.0</category>
+ <name>webservice_producer</name>
+ <shortDescription>JBoss ESB Web Service producer Example</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
+ This sample demonstrates how to deploy a JSR181 Webservice endpoint on
+ JBossESB using the SOAPProcessor action.</description>
+ <size>53000</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ </project>
+
+ <project>
+ <category>ESB for SOA-P 5.0</category>
+ <name>webservice_producer_client</name>
+ <shortDescription>JBoss ESB Web Service producer Example - Client</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
+ This sample is to test the deployed a web service endpoint.It requires the webservice_producer project.</description>
+ <size>14200</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ </project>
+
+ <project>
+ <category>ESB for SOA-P 5.0</category>
+ <name>transform_CSV2XML</name>
+ <shortDescription>JBoss ESB Smooks CSV->XML Example</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
+ This sample demonstrates how to transform a comma separated value (CSV) file to an xml.
+ The tranformation is done by configuring Smooks and performing two transformation, one
+ transformation from CSV to an intermediate xml format, and a second transformation from
+ the intermediate xml format to the target xml.</description>
+ <size>7200</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ </project>
+
+ <project>
+ <category>ESB for SOA-P 5.0</category>
+ <name>transform_CSV2XML_client</name>
+ <shortDescription>JBoss ESB Smooks CSV->XML Example - Client</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
+ This sample is to test the JBoss ESB smooks CSV->XML transformation.It requires the transform_CSV2XML project.</description>
+ <size>16600</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ </project>
+
+ <project>
+ <category>ESB for SOA-P 5.0</category>
+ <name>transform_XML2POJO</name>
+ <shortDescription>JBoss ESB Smooks XML->POJO Example</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
+ The purpose of the simple_transformation sample is to illustrate the
+use of Smooks performing a simple transformation by converting a XML file into
+Java POJOs.</description>
+ <size>26600</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ </project>
+
+ <project>
+ <category>ESB for SOA-P 5.0</category>
+ <name>transform_XML2POJO_client</name>
+ <shortDescription>JBoss ESB Smooks XML->POJO Example - Client</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
+ This sample is to test the JBoss ESB smooks XML->POJO transformation.It requires the transform_XML2POJO project.</description>
+ <size>22400</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ </project>
+
+ <project>
+ <category>ESB for SOA-P 5.0</category>
+ <name>transform_XML2XML_date_manipulation</name>
+ <shortDescription>JBoss ESB Smooks XML->XML date-manipulation Example</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
+ This is another simple sample of how to manually define and apply a Message
+ Transformation within JBoss ESB.
+
+ This sample is an extension of the "transformation_XML2XML_simple"
+ Quickstart, demonstrating how JBoss ESB Transformations can simplify your
+ XSLT transformations by combining the power of XSLT with Java. In this
+ Quickstart, we use Java to perform the ugly string manipulation on the
+ SampleOrder date field (see OrderDate.java) and use XSLT for what it's good at
+ i.e. Templating. Again, the transformed SampleOrder.xml message is just
+ printed to the Java console (message before and after).</description>
+ <size>13600</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ </project>
+
+ <project>
+ <category>ESB for SOA-P 5.0</category>
+ <name>transform_XML2XML_date_manipulation_client</name>
+ <shortDescription>JBoss ESB Smooks XML->XML date-manipulation Example - Client</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
+ This sample is to test the JBoss ESB XML->XML date-manipulation transformation.It requires the transform_XML2XML_date_manipulation project.</description>
+ <size>18600</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ </project>
+
+ <project>
+ <category>ESB for SOA-P 5.0</category>
+ <name>transform_XML2XML_simple</name>
+ <shortDescription>JBoss ESB Smooks XML->XML Example</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
+ This is a very basic sample of how to manually define and apply a Message
+ Transformation within JBoss ESB. It applies a very simple XSLT to a
+ SampleOrder.xml message and prints the before and after XML to the console.</description>
+ <size>6700</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ </project>
+
+ <project>
+ <category>ESB for SOA-P 5.0</category>
+ <name>transform_XML2XML_simple_client</name>
+ <shortDescription>JBoss ESB Smooks XML->XML Example - Client</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
+ This sample is to test the JBoss ESB XML->XML transformation.It requires the transform_XML2XML_simple project.</description>
+ <size>17800</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ </project>
+
+ <project>
<category>RESTEasy</category>
<name>simple</name>
<included-projects>
13 years, 2 months
JBoss Tools SVN: r19998 - in trunk/bpel/plugins/org.eclipse.bpel.validator: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-01-28 17:51:19 -0500 (Thu, 28 Jan 2010)
New Revision: 19998
Modified:
trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.eclipse.bpel.validator/build.properties
Log:
switch from nested jar to .
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF 2010-01-28 21:31:23 UTC (rev 19997)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF 2010-01-28 22:51:19 UTC (rev 19998)
@@ -20,7 +20,7 @@
javax.wsdl;bundle-version="[1.5.0,1.6.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ClassPath: bpel-validator.jar
+Bundle-ClassPath: .
Export-Package: org.eclipse.bpel.validator,
org.eclipse.bpel.validator.adapters,
org.eclipse.bpel.validator.factory,
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/build.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/build.properties 2010-01-28 21:31:23 UTC (rev 19997)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/build.properties 2010-01-28 22:51:19 UTC (rev 19998)
@@ -9,7 +9,7 @@
src-exclude.xsl,\
plugin.properties
jars.compile.order = code.jar,\
- bpel-validator.jar
+ .
src.includes = .classpath,\
.project,\
.settings/,\
@@ -30,9 +30,9 @@
customBuildCallbacks.xml,\
plugin.properties
output.code.jar = bin/
-source.bpel-validator.jar = src/,\
- meta/
-output.bpel-validator.jar = bin/
-#
+source.. = src/,\
+ meta/
+output.. = bin/
+
customBuildCallbacks=customBuildCallbacks.xml
-#
+
13 years, 2 months
JBoss Tools SVN: r19997 - trunk/bpel/releng.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-01-28 16:31:23 -0500 (Thu, 28 Jan 2010)
New Revision: 19997
Modified:
trunk/bpel/releng/custom-library.xml
Log:
add <jvmargs/>
Modified: trunk/bpel/releng/custom-library.xml
===================================================================
--- trunk/bpel/releng/custom-library.xml 2010-01-28 20:57:15 UTC (rev 19996)
+++ trunk/bpel/releng/custom-library.xml 2010-01-28 21:31:23 UTC (rev 19997)
@@ -84,6 +84,7 @@
<arg line="-arch ${arch}"/>
<arg line="-consolelog"/>
<arg line="-vmargs ${vmargs} ${extraVMargs} ${Xflags} ${Dflags} -DPLUGIN_PATH=${plugin-path}"/>
+ <jvmarg line="${vmargs} ${extraVMargs} ${Xflags} ${Dflags} -DPLUGIN_PATH=${plugin-path}" />
</java>
<antcall target="collect-results" />
</target>
13 years, 2 months
JBoss Tools SVN: r19996 - trunk/bpel/releng.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-01-28 15:57:15 -0500 (Thu, 28 Jan 2010)
New Revision: 19996
Modified:
trunk/bpel/releng/build.properties
Log:
switch back to 'test'
Modified: trunk/bpel/releng/build.properties
===================================================================
--- trunk/bpel/releng/build.properties 2010-01-28 17:07:40 UTC (rev 19995)
+++ trunk/bpel/releng/build.properties 2010-01-28 20:57:15 UTC (rev 19996)
@@ -13,7 +13,7 @@
testFeatureToBuildID=org.jboss.tools.bpel.tests.feature
# on windows or mac, use testLocal; on linux can use test if Xvnc or Xvfb installed; use testLocal if run from Hudson job w/ Xvnc enabled
-build.steps=buildUpdate,buildTests,generateDigests,testLocal,publish,cleanup
+build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup
JAVA14_HOME=${JAVA_HOME}
JAVA50_HOME=${JAVA_HOME}
13 years, 2 months
JBoss Tools SVN: r19995 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-01-28 12:07:40 -0500 (Thu, 28 Jan 2010)
New Revision: 19995
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ProjectNaturesChecker.java
Log:
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ProjectNaturesChecker.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ProjectNaturesChecker.java 2010-01-28 16:39:18 UTC (rev 19994)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ProjectNaturesChecker.java 2010-01-28 17:07:40 UTC (rev 19995)
@@ -37,7 +37,7 @@
public class ProjectNaturesChecker implements IResourceChangeListener {
- private static final String SEARCH_CLASS = "javax.faces.context.FacesContext"; //$NON-NLS-1$
+ private static final String SEARCH_CLASS = "javax.faces.webapp.FacesServlet"; //$NON-NLS-1$
public static final QualifiedName IS_NATURES_CHECK_NEED = new QualifiedName(
"", "Is natures check"); //$NON-NLS-1$ //$NON-NLS-2$
public static final QualifiedName IS_JSF_CHECK_NEED = new QualifiedName(
13 years, 2 months
JBoss Tools SVN: r19994 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-01-28 11:39:18 -0500 (Thu, 28 Jan 2010)
New Revision: 19994
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java
Log:
JBIDE-5753: EL code completion fails on facelets xhtml files
Logged exception is fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java 2010-01-28 16:23:56 UTC (rev 19993)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java 2010-01-28 16:39:18 UTC (rev 19994)
@@ -59,6 +59,17 @@
return superNameSpaces;
}
+ /*
+ * The method is commented due the following reasons:
+ * 1. https://jira.jboss.org/jira/browse/JBIDE-5753.
+ * 2. Wrong way of gathering Var-s from the included contexts if any. There are at least two ways
+ * of how the code may be included into the page, but anyway we cannot use offset within the page
+ * to search for Var-s in other pages.
+ * 3. Because of ##1-2 this method should be modified in future, but for now we're excluding the included
+ * contexts from the account. So, super method does this job well.
+ *
+ * DO NOT uncomment this until the #2 will be solved
+ *
@Override
public Var[] getVars(int offset) {
Var[] thisVars = super.getVars(offset);
@@ -89,7 +100,8 @@
}
return result;
}
-
+ */
+
public ITagLibrary[] getLibraries() {
List<ITagLibrary> libraries = new ArrayList<ITagLibrary>();
13 years, 2 months
JBoss Tools SVN: r19993 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-28 11:23:56 -0500 (Thu, 28 Jan 2010)
New Revision: 19993
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5747
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2010-01-28 16:20:04 UTC (rev 19992)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2010-01-28 16:23:56 UTC (rev 19993)
@@ -103,21 +103,6 @@
protected IProject[] build(int kind, Map args, IProgressMonitor monitor)
throws CoreException {
-
- IType t = EclipseJavaUtil.findType(EclipseResourceUtil.getJavaProject(getProject()), "pack.model.A2");
- ParametedType p = new ParametedType();
- p.setType(t);
- p.setSignature("Q" + t.getFullyQualifiedName() + ";");
-
- for (IParametedType c: p.getInheritedTypes()) {
- Set<IParametedType> s = ((ParametedType)c).getInheritedTypes();
- for (IParametedType d: s) {
- ((ParametedType)d).getInheritedTypes();
- };
- };
-
-
-
resourceVisitor = null;
findDelegate();
if(getDelegate() == null) {
13 years, 2 months
JBoss Tools SVN: r19992 - in trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model: handlers and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-28 11:20:04 -0500 (Thu, 28 Jan 2010)
New Revision: 19992
Modified:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesLoaderUtil.java
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/PageAdopt.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5757
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesLoaderUtil.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesLoaderUtil.java 2010-01-28 16:16:55 UTC (rev 19991)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesLoaderUtil.java 2010-01-28 16:20:04 UTC (rev 19992)
@@ -14,6 +14,7 @@
import org.jboss.tools.common.meta.XModelEntity;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
+import org.jboss.tools.common.model.util.XModelObjectUtil;
import org.jboss.tools.common.xml.XMLUtilities;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -116,32 +117,19 @@
protected String getChildEntity(XModelEntity entity, Element e) {
String n = e.getNodeName();
if("page".equals(entity.getXMLSubPath())) {
- String suff = (entity.getName().endsWith(SUFF_12))
- ? SUFF_12
- : (entity.getName().endsWith(SUFF_20))
- ? SUFF_20
- : (entity.getName().endsWith(SUFF_21))
- ? SUFF_21
- : (entity.getName().endsWith(SUFF_22))
- ? SUFF_22
- : null;
- if(suff == null) {
- System.out.println("Unknown suffix in seam page entity " + entity.getName());
- suff = SUFF_20;
- }
if("navigation".equals(n)) {
NodeList nl = e.getChildNodes();
for (int i = 0; i < nl.getLength(); i++) {
Node ni = nl.item(i);
if(ni.getNodeType() == Node.ELEMENT_NODE) {
if(ni.getNodeName().equals("rule")) {
- return ENT_NAVIGATION + suff;
+ return XModelObjectUtil.getVersionedChildEntity(entity, ENT_NAVIGATION);
} else {
- return ENT_NAVIGATION_RULE + suff;
+ return XModelObjectUtil.getVersionedChildEntity(entity, ENT_NAVIGATION_RULE);
}
}
}
- return ENT_NAVIGATION + suff;
+ return XModelObjectUtil.getVersionedChildEntity(entity, ENT_NAVIGATION);
}
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/PageAdopt.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/PageAdopt.java 2010-01-28 16:16:55 UTC (rev 19991)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/PageAdopt.java 2010-01-28 16:20:04 UTC (rev 19992)
@@ -172,9 +172,9 @@
// String n = path;
// if(n.lastIndexOf('.') > 0) n = n.substring(0, n.lastIndexOf('.'));
// if(n.lastIndexOf('/') >= 0) n = n.substring(n.lastIndexOf('/') + 1);
- String suffix = DiagramAdopt.getPageSuffix(source.getModelEntity().getName());
- XModelObject cs = source.getModel().createModelObject(ENT_NAVIGATION_RULE + suffix, null);
- XModelObject redirect = source.getModel().createModelObject("SeamPageRedirect" + suffix, null);
+
+ XModelObject cs = source.getModel().createModelObject(XModelObjectUtil.getVersionedChildEntity(source.getModelEntity(), ENT_NAVIGATION_RULE), null);
+ XModelObject redirect = source.getModel().createModelObject(XModelObjectUtil.getVersionedChildEntity(cs.getModelEntity(), "SeamPageRedirect"), null);
redirect.setAttributeValue(ATTR_VIEW_ID, path);
cs.addChild(redirect);
//TODO
13 years, 2 months
JBoss Tools SVN: r19991 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-28 11:16:55 -0500 (Thu, 28 Jan 2010)
New Revision: 19991
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5757
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectUtil.java 2010-01-28 15:36:07 UTC (rev 19990)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectUtil.java 2010-01-28 16:16:55 UTC (rev 19991)
@@ -11,8 +11,12 @@
package org.jboss.tools.common.model.util;
import java.util.*;
+
import org.jboss.tools.common.meta.XAttribute;
+import org.jboss.tools.common.meta.XChild;
+import org.jboss.tools.common.meta.XModelEntity;
import org.jboss.tools.common.model.*;
+
import javax.naming.*;
public final class XModelObjectUtil {
@@ -161,5 +165,38 @@
}
+ private static Map<String, String> versionedChildEntities = new HashMap<String, String>();
+
+ /**
+ * Returns child entity name of parent entity which is equal to entityRoot or differs from it
+ * by digital suffix.
+ * @param parent
+ * @param entityRoot
+ * @return
+ */
+ public static String getVersionedChildEntity(XModelEntity parent, String entityRoot) {
+ String key = parent.getName() + ":" + entityRoot; //$NON-NLS-1$
+ if(versionedChildEntities.containsKey(key)) {
+ return versionedChildEntities.get(key);
+ }
+ XChild[] cs = parent.getChildren();
+ for (int i = 0; i < cs.length; i++) {
+ String n = cs[i].getName();
+ if(n.equals(entityRoot)) {
+ versionedChildEntities.put(key, n);
+ return n;
+ }
+ if(!n.startsWith(entityRoot)) continue;
+ String suff = n.substring(entityRoot.length());
+ if(Character.isDigit(suff.charAt(0))) {
+ versionedChildEntities.put(key, n);
+ return n;
+ }
+ }
+ String result = "Unknown_Child_" + entityRoot + "_in_" + parent.getName(); //$NON-NLS-1$ //$NON-NLS-2$
+ versionedChildEntities.put(key, result);
+ return result;
+ }
+
}
13 years, 2 months