diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml index 4771053b49..b69b06d957 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml @@ -60,6 +60,7 @@ org.apache.commons.logging, javax.naming, javax.xml.*, + org.xml.sax, javax.sql.*, org.wso2.carbon.context, org.wso2.carbon.core, diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/api/mgt/config/APIPublisherConfig.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/api/mgt/config/APIPublisherConfig.java index 93aec93e4d..bae2f2c5d9 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/api/mgt/config/APIPublisherConfig.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/api/mgt/config/APIPublisherConfig.java @@ -25,13 +25,17 @@ import org.wso2.carbon.device.mgt.common.DeviceManagementException; import org.wso2.carbon.device.mgt.core.api.mgt.APIConfig; import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil; import org.wso2.carbon.utils.CarbonUtils; +import org.xml.sax.SAXException; +import javax.xml.XMLConstants; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; import java.io.File; import java.util.List; @@ -48,6 +52,8 @@ public class APIPublisherConfig { private static final Log log = LogFactory.getLog(APIPublisherConfig.class); private static final String USER_DEFINED_API_CONFIG_PATH = CarbonUtils.getEtcCarbonConfigDirPath() + File.separator + "user-api-publisher-config.xml"; + private static final String USER_DEFINED_API_CONFIG_SCHEMA_PATH = + "resources/config/schema/api-publisher-config-schema.xsd"; private static final Object LOCK = new Object(); @@ -83,10 +89,22 @@ public class APIPublisherConfig { /* Un-marshaling API publisher configuration */ JAXBContext ctx = JAXBContext.newInstance(APIPublisherConfig.class); Unmarshaller unmarshaller = ctx.createUnmarshaller(); + unmarshaller.setSchema(getSchema()); config = (APIPublisherConfig) unmarshaller.unmarshal(doc); } catch (JAXBException e) { throw new DeviceManagementException("Error occurred while un-marshalling API Publisher Config", e); } } + private static Schema getSchema() throws DeviceManagementException { + try { + File deviceManagementSchemaConfig = new File(APIPublisherConfig.USER_DEFINED_API_CONFIG_SCHEMA_PATH); + SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); + return factory.newSchema(deviceManagementSchemaConfig); + } catch (SAXException e) { + throw new DeviceManagementException("Error occurred while initializing the schema of " + + "user-api-publisher-config.xml", e); + } + } + } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceConfigurationManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceConfigurationManager.java index 38a99f45a2..d2d67bc4d9 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceConfigurationManager.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceConfigurationManager.java @@ -24,10 +24,14 @@ import org.wso2.carbon.device.mgt.common.DeviceManagementException; import org.wso2.carbon.device.mgt.core.config.email.NotificationMessagesConfig; import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil; import org.wso2.carbon.utils.CarbonUtils; +import org.xml.sax.SAXException; +import javax.xml.XMLConstants; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; import java.io.File; /** @@ -39,10 +43,11 @@ public class DeviceConfigurationManager { private NotificationMessagesConfig notificationMessagesConfig; private static DeviceConfigurationManager deviceConfigManager; - private static final String deviceMgtConfigXMLPath = + private static final String DEVICE_MGT_CONFIG_PATH = CarbonUtils.getCarbonConfigDirPath() + File.separator + DeviceManagementConstants.DataSourceProperties.DEVICE_CONFIG_XML_NAME; - private static final String notificationMessagesConfigXMLPath = + private static final String DEVICE_MGT_CONFIG_SCHEMA_PATH = "resources/config/schema/device-mgt-config-schema.xsd"; + private static final String NOTIFICATION_MSG_CONFIG_PATH = CarbonUtils.getCarbonConfigDirPath() + File.separator + DeviceManagementConstants.NotificationProperties.NOTIFICATION_CONFIG_FILE; @@ -60,19 +65,20 @@ public class DeviceConfigurationManager { public synchronized void initConfig() throws DeviceManagementException { try { - File deviceMgtConfig = new File(deviceMgtConfigXMLPath); + File deviceMgtConfig = new File(DeviceConfigurationManager.DEVICE_MGT_CONFIG_PATH); Document doc = DeviceManagerUtil.convertToDocument(deviceMgtConfig); /* Un-marshaling Device Management configuration */ JAXBContext cdmContext = JAXBContext.newInstance(DeviceManagementConfig.class); Unmarshaller unmarshaller = cdmContext.createUnmarshaller(); + unmarshaller.setSchema(getSchema()); this.currentDeviceConfig = (DeviceManagementConfig) unmarshaller.unmarshal(doc); } catch (JAXBException e) { throw new DeviceManagementException("Error occurred while initializing Data Source config", e); } try { - File notificationConfig = new File(notificationMessagesConfigXMLPath); + File notificationConfig = new File(DeviceConfigurationManager.NOTIFICATION_MSG_CONFIG_PATH); Document doc = DeviceManagerUtil.convertToDocument(notificationConfig); /* Un-marshaling Notifications Management configuration */ @@ -82,7 +88,17 @@ public class DeviceConfigurationManager { } catch(JAXBException e){ throw new DeviceManagementException("Error occurred while initializing Notification settings config", e); } + } + private static Schema getSchema() throws DeviceManagementException { + try { + File deviceManagementSchemaConfig = new File(DeviceConfigurationManager.DEVICE_MGT_CONFIG_SCHEMA_PATH); + SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); + return factory.newSchema(deviceManagementSchemaConfig); + } catch (SAXException e) { + throw new DeviceManagementException("Error occurred while initializing the schema of " + + "device-mgt-config.xml", e); + } } public DeviceManagementConfig getDeviceManagementConfig() { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/resources/config/schema/api-publisher-config-schema.xsd b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/resources/config/schema/api-publisher-config-schema.xsd new file mode 100644 index 0000000000..eabca46b08 --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/resources/config/schema/api-publisher-config-schema.xsd @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/resources/config/schema/device-mgt-config-schema.xsd b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/resources/config/schema/device-mgt-config-schema.xsd new file mode 100644 index 0000000000..35cf26ecb6 --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/resources/config/schema/device-mgt-config-schema.xsd @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/DeviceManagementConfigTests.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/DeviceManagementConfigTests.java index a31352eb82..f0861fb1f4 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/DeviceManagementConfigTests.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/DeviceManagementConfigTests.java @@ -44,7 +44,7 @@ public class DeviceManagementConfigTests { private static final String MALFORMED_TEST_CONFIG_LOCATION_NO_JNDI_CONFIG = "./src/test/resources/config/malformed-cdm-config-no-jndi-config.xml"; private static final String TEST_CONFIG_SCHEMA_LOCATION = - "./src/test/resources/config/schema/DeviceManagementConfigSchema.xsd"; + "./src/test/resources/config/schema/device-mgt-config-schema.xsd"; private Schema schema; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/schema/DeviceManagementConfigSchema.xsd b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/schema/device-mgt-config-schema.xsd similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/schema/DeviceManagementConfigSchema.xsd rename to components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/schema/device-mgt-config-schema.xsd diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml index 69da22d03e..265570cac2 100644 --- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml +++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml @@ -31,8 +31,8 @@ org.wso2.carbon.webapp.authenticator.framework 0.9.2-SNAPSHOT bundle - WSO2 Carbon - Key Management Handler Valve - WSO2 Carbon - Key Management Handler Valve + WSO2 Carbon - Web Application Authenticator Framework Bundle + WSO2 Carbon - Web Application Authenticator Framework Bundle http://wso2.org diff --git a/features/etc/feature.properties b/features/etc/feature.properties deleted file mode 100644 index a84f4e33e9..0000000000 --- a/features/etc/feature.properties +++ /dev/null @@ -1,241 +0,0 @@ -################################################################################ -# Copyright 2015 WSO2, Inc. (http://wso2.com) -# -# WSO2 Inc. Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -################################################################################ - -providerName=WSO2 Inc. - -########################## license properties ################################## -licenseURL=http://www.apache.org/licenses/LICENSE-2.0 - -license=\ - Apache License\n\ - Version 2.0, January 2004\n\ - http://www.apache.org/licenses/\n\ -\n\ - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\ -\n\ - 1. Definitions.\n\ -\n\ - "License" shall mean the terms and conditions for use, reproduction,\n\ - and distribution as defined by Sections 1 through 9 of this document.\n\ -\n\ - "Licensor" shall mean the copyright owner or entity authorized by\n\ - the copyright owner that is granting the License.\n\ -\n\ - "Legal Entity" shall mean the union of the acting entity and all\n\ - other entities that control, are controlled by, or are under common\n\ - control with that entity. For the purposes of this definition,\n\ - "control" means (i) the power, direct or indirect, to cause the\n\ - direction or management of such entity, whether by contract or\n\ - otherwise, or (ii) ownership of fifty percent (50%) or more of the\n\ - outstanding shares, or (iii) beneficial ownership of such entity.\n\ -\n\ - "You" (or "Your") shall mean an individual or Legal Entity\n\ - exercising permissions granted by this License.\n\ -\n\ - "Source" form shall mean the preferred form for making modifications,\n\ - including but not limited to software source code, documentation\n\ - source, and configuration files.\n\ -\n\ - "Object" form shall mean any form resulting from mechanical\n\ - transformation or translation of a Source form, including but\n\ - not limited to compiled object code, generated documentation,\n\ - and conversions to other media types.\n\ -\n\ - "Work" shall mean the work of authorship, whether in Source or\n\ - Object form, made available under the License, as indicated by a\n\ - copyright notice that is included in or attached to the work\n\ - (an example is provided in the Appendix below).\n\ -\n\ - "Derivative Works" shall mean any work, whether in Source or Object\n\ - form, that is based on (or derived from) the Work and for which the\n\ - editorial revisions, annotations, elaborations, or other modifications\n\ - represent, as a whole, an original work of authorship. For the purposes\n\ - of this License, Derivative Works shall not include works that remain\n\ - separable from, or merely link (or bind by name) to the interfaces of,\n\ - the Work and Derivative Works thereof.\n\ -\n\ - "Contribution" shall mean any work of authorship, including\n\ - the original version of the Work and any modifications or additions\n\ - to that Work or Derivative Works thereof, that is intentionally\n\ - submitted to Licensor for inclusion in the Work by the copyright owner\n\ - or by an individual or Legal Entity authorized to submit on behalf of\n\ - the copyright owner. For the purposes of this definition, "submitted"\n\ - means any form of electronic, verbal, or written communication sent\n\ - to the Licensor or its representatives, including but not limited to\n\ - communication on electronic mailing lists, source code control systems,\n\ - and issue tracking systems that are managed by, or on behalf of, the\n\ - Licensor for the purpose of discussing and improving the Work, but\n\ - excluding communication that is conspicuously marked or otherwise\n\ - designated in writing by the copyright owner as "Not a Contribution."\n\ -\n\ - "Contributor" shall mean Licensor and any individual or Legal Entity\n\ - on behalf of whom a Contribution has been received by Licensor and\n\ - subsequently incorporated within the Work.\n\ -\n\ - 2. Grant of Copyright License. Subject to the terms and conditions of\n\ - this License, each Contributor hereby grants to You a perpetual,\n\ - worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\ - copyright license to reproduce, prepare Derivative Works of,\n\ - publicly display, publicly perform, sublicense, and distribute the\n\ - Work and such Derivative Works in Source or Object form.\n\ -\n\ - 3. Grant of Patent License. Subject to the terms and conditions of\n\ - this License, each Contributor hereby grants to You a perpetual,\n\ - worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\ - (except as stated in this section) patent license to make, have made,\n\ - use, offer to sell, sell, import, and otherwise transfer the Work,\n\ - where such license applies only to those patent claims licensable\n\ - by such Contributor that are necessarily infringed by their\n\ - Contribution(s) alone or by combination of their Contribution(s)\n\ - with the Work to which such Contribution(s) was submitted. If You\n\ - institute patent litigation against any entity (including a\n\ - cross-claim or counterclaim in a lawsuit) alleging that the Work\n\ - or a Contribution incorporated within the Work constitutes direct\n\ - or contributory patent infringement, then any patent licenses\n\ - granted to You under this License for that Work shall terminate\n\ - as of the date such litigation is filed.\n\ -\n\ - 4. Redistribution. You may reproduce and distribute copies of the\n\ - Work or Derivative Works thereof in any medium, with or without\n\ - modifications, and in Source or Object form, provided that You\n\ - meet the following conditions:\n\ -\n\ - (a) You must give any other recipients of the Work or\n\ - Derivative Works a copy of this License; and\n\ -\n\ - (b) You must cause any modified files to carry prominent notices\n\ - stating that You changed the files; and\n\ -\n\ - (c) You must retain, in the Source form of any Derivative Works\n\ - that You distribute, all copyright, patent, trademark, and\n\ - attribution notices from the Source form of the Work,\n\ - excluding those notices that do not pertain to any part of\n\ - the Derivative Works; and\n\ -\n\ - (d) If the Work includes a "NOTICE" text file as part of its\n\ - distribution, then any Derivative Works that You distribute must\n\ - include a readable copy of the attribution notices contained\n\ - within such NOTICE file, excluding those notices that do not\n\ - pertain to any part of the Derivative Works, in at least one\n\ - of the following places: within a NOTICE text file distributed\n\ - as part of the Derivative Works; within the Source form or\n\ - documentation, if provided along with the Derivative Works; or,\n\ - within a display generated by the Derivative Works, if and\n\ - wherever such third-party notices normally appear. The contents\n\ - of the NOTICE file are for informational purposes only and\n\ - do not modify the License. You may add Your own attribution\n\ - notices within Derivative Works that You distribute, alongside\n\ - or as an addendum to the NOTICE text from the Work, provided\n\ - that such additional attribution notices cannot be construed\n\ - as modifying the License.\n\ -\n\ - You may add Your own copyright statement to Your modifications and\n\ - may provide additional or different license terms and conditions\n\ - for use, reproduction, or distribution of Your modifications, or\n\ - for any such Derivative Works as a whole, provided Your use,\n\ - reproduction, and distribution of the Work otherwise complies with\n\ - the conditions stated in this License.\n\ -\n\ - 5. Submission of Contributions. Unless You explicitly state otherwise,\n\ - any Contribution intentionally submitted for inclusion in the Work\n\ - by You to the Licensor shall be under the terms and conditions of\n\ - this License, without any additional terms or conditions.\n\ - Notwithstanding the above, nothing herein shall supersede or modify\n\ - the terms of any separate license agreement you may have executed\n\ - with Licensor regarding such Contributions.\n\ -\n\ - 6. Trademarks. This License does not grant permission to use the trade\n\ - names, trademarks, service marks, or product names of the Licensor,\n\ - except as required for reasonable and customary use in describing the\n\ - origin of the Work and reproducing the content of the NOTICE file.\n\ -\n\ - 7. Disclaimer of Warranty. Unless required by applicable law or\n\ - agreed to in writing, Licensor provides the Work (and each\n\ - Contributor provides its Contributions) on an "AS IS" BASIS,\n\ - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n\ - implied, including, without limitation, any warranties or conditions\n\ - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n\ - PARTICULAR PURPOSE. You are solely responsible for determining the\n\ - appropriateness of using or redistributing the Work and assume any\n\ - risks associated with Your exercise of permissions under this License.\n\ -\n\ - 8. Limitation of Liability. In no event and under no legal theory,\n\ - whether in tort (including negligence), contract, or otherwise,\n\ - unless required by applicable law (such as deliberate and grossly\n\ - negligent acts) or agreed to in writing, shall any Contributor be\n\ - liable to You for damages, including any direct, indirect, special,\n\ - incidental, or consequential damages of any character arising as a\n\ - result of this License or out of the use or inability to use the\n\ - Work (including but not limited to damages for loss of goodwill,\n\ - work stoppage, computer failure or malfunction, or any and all\n\ - other commercial damages or losses), even if such Contributor\n\ - has been advised of the possibility of such damages.\n\ -\n\ - 9. Accepting Warranty or Additional Liability. While redistributing\n\ - the Work or Derivative Works thereof, You may choose to offer,\n\ - and charge a fee for, acceptance of support, warranty, indemnity,\n\ - or other liability obligations and/or rights consistent with this\n\ - License. However, in accepting such obligations, You may act only\n\ - on Your own behalf and on Your sole responsibility, not on behalf\n\ - of any other Contributor, and only if You agree to indemnify,\n\ - defend, and hold each Contributor harmless for any liability\n\ - incurred by, or claims asserted against, such Contributor by reason\n\ - of your accepting any such warranty or additional liability.\n\ -\n\ - END OF TERMS AND CONDITIONS\n\ -\n\ - APPENDIX: How to apply the Apache License to your work.\n\ -\n\ - To apply the Apache License to your work, attach the following\n\ - boilerplate notice, with the fields enclosed by brackets "[]"\n\ - replaced with your own identifying information. (Don't include\n\ - the brackets!) The text should be enclosed in the appropriate\n\ - comment syntax for the file format. We also recommend that a\n\ - file or class name and description of purpose be included on the\n\ - same "printed page" as the copyright notice for easier\n\ - identification within third-party archives.\n\ -\n\ - Copyright [yyyy] [name of copyright owner]\n\ -\n\ - Licensed under the Apache License, Version 2.0 (the "License");\n\ - you may not use this file except in compliance with the License.\n\ - You may obtain a copy of the License at\n\ -\n\ - http://www.apache.org/licenses/LICENSE-2.0\n\ -\n\ - Unless required by applicable law or agreed to in writing, software\n\ - distributed under the License is distributed on an "AS IS" BASIS,\n\ - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n\ - See the License for the specific language governing permissions and\n\ - limitations under the License.\n - -######################### copyright properties ################################# -copyrightURL=TODO - -copyright=\ -Copyright (c) WSO2 Inc. (http://wso2.com)\n\ -\n\ -WSO2 Inc. Licensed under the Apache License, Version 2.0 (the "License");\n\ -you may not use this file except in compliance with the License.\n\ -You may obtain a copy of the License at\n\ -\n\ -http://www.apache.org/licenses/LICENSE-2.0\n\ -\n\ -Unless required by applicable law or agreed to in writing, software\n\ -distributed under the License is distributed on an "AS IS" BASIS,\n\ -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n\ -See the License for the specific language governing permissions and\n\ -limitations under the License.\n diff --git a/pom.xml b/pom.xml index bf1b5a422c..a95d74ad26 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,8 @@ components/device-mgt components/policy-mgt components/user-mgt - components/webapp-authenticator-framework + components/webapp-authenticator-framework + components/oauth-extensions features/device-mgt features/policy-mgt features/user-mgt @@ -834,6 +835,43 @@ + + + org.apache.cxf + cxf-rt-frontend-jaxws + ${cxf.version} + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} + + + org.apache.cxf + cxf-rt-transports-http + ${cxf.version} + + + org.apache.cxf + cxf-rt-bindings-soap + ${cxf.version} + + + org.apache.cxf + cxf-rt-bindings-http + ${cxf.bindings.version} + + + org.apache.cxf + cxf-rt-rs-extension-providers + ${cxf.version} + + + org.apache.cxf + cxf-rt-ws-security + ${cxf.version} + + @@ -1027,6 +1065,7 @@ 6.1.1 4.3.0 + 1.5.4 1.3 @@ -1057,6 +1096,7 @@ 1.2.140.wso2v3 + 7.0.52.wso2v5 7.0.52.wso2v1 7.0.34.wso2v2 @@ -1089,6 +1129,10 @@ 1.3.1 + + 2.6.1 + 2.5.11 +