Author: dennyxu Date: 2009-06-17 04:20:32 -0400 (Wed, 17 Jun 2009) New Revision: 16005 Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.xml trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/ModelQuery.java trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IConstants.java Log: https://engineering.redhat.com/trac/ODE/ticket/22 bpel validator consider xpath2.0 as being invalid Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF 2009-06-17 07:55:00 UTC (rev 16004) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF 2009-06-17 08:20:32 UTC (rev 16005) @@ -15,7 +15,7 @@ org.eclipse.bpel.model;bundle-version="0.4.0", org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)", org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)", - javax.wsdl;bundle-version="[1.4.0,1.5.0)", + javax.wsdl;bundle-version="1.4.0", org.eclipse.core.databinding;bundle-version="[1.1.0,2.0.0)", org.eclipse.jface.databinding;bundle-version="[1.2.0,2.0.0)", org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)", Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.xml =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.xml 2009-06-17 07:55:00 UTC (rev 16004) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.xml 2009-06-17 08:20:32 UTC (rev 16005) @@ -7,7 +7,7 @@ <editor class="org.eclipse.bpel.apache.ode.deploy.ui.editors.ODEDeployMultiPageEditor" contributorClass="org.eclipse.bpel.apache.ode.deploy.ui.editors.ODEDeployMultiPageEditorContributor" - filenames="deploy.xml" + filenames="bpel-deploy.xml,deploy.xml" icon="icons/obj16/ode.gif" id="org.eclipse.bpel.apache.ode.deploy.ui.editors.ODEDeployMultiPageEditor" name="ODE Deployment Descriptor Editor"> Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF 2009-06-17 07:55:00 UTC (rev 16004) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF 2009-06-17 08:20:32 UTC (rev 16005) @@ -23,7 +23,7 @@ org.eclipse.jst.server.ui;bundle-version="[1.0.303,2.0.0)", org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)", org.eclipse.jst.server.core;bundle-version="[1.1.0,2.0.0)", - javax.wsdl;bundle-version="[1.4.0,1.5.0)", + javax.wsdl;bundle-version="1.4.0", org.eclipse.bpel.apache.ode.deploy.model;bundle-version="0.4.0" Bundle-Activator: org.eclipse.bpel.apache.ode.runtime.OdePlugin Export-Package: org.eclipse.bpel.apache.ode.runtime Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/ModelQuery.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/ModelQuery.java 2009-06-17 07:55:00 UTC (rev 16004) +++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/ModelQuery.java 2009-06-17 08:20:32 UTC (rev 16005) @@ -68,11 +68,13 @@ case SUPPORT_QUERY_LANGUAGE : return IConstants.XMLNS_XPATH_QUERY_LANGUAGE.equals ( value ) || + IConstants.XMLNS_XPATH_QUERY_LANGUAGE_XPATH2.equals ( value ) || IConstants.XMLNS_XPATH_QUERY_LANGUAGE_2.equals( value ); case SUPPORT_EXPRESSION_LANGUAGE : return IConstants.XMLNS_XPATH_EXPRESSION_LANGUAGE.equals ( value ) || + IConstants.XMLNS_XPATH_EXPRESSION_LANGUAGE_XPATH2.equals( value ) || IConstants.XMLNS_XPATH_EXPRESSION_LANGUAGE_2.equals( value ); case SUPPORT_IMPORT_TYPE : Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IConstants.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IConstants.java 2009-06-17 07:55:00 UTC (rev 16004) +++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IConstants.java 2009-06-17 08:20:32 UTC (rev 16005) @@ -59,12 +59,14 @@ /** The default expression language */ public static final String XMLNS_XPATH_EXPRESSION_LANGUAGE = "urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0"; //$NON-NLS-1$ + public static final String XMLNS_XPATH_EXPRESSION_LANGUAGE_XPATH2 = "urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"; //$NON-NLS-1$ /** A variant from previous spec iterations */ public static final String XMLNS_XPATH_EXPRESSION_LANGUAGE_2 = "http://www.w3.org/TR/1999/REC-xpath-19991116"; //$NON-NLS-1$ /** The default query language */ public static final String XMLNS_XPATH_QUERY_LANGUAGE = "urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0"; + public static final String XMLNS_XPATH_QUERY_LANGUAGE_XPATH2 = "urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"; public static final String XMLNS_XPATH_QUERY_LANGUAGE_2 = "http://www.w3.org/TR/1999/REC-xpath-19991116";