Merge pull request #87 from lhein/7.2.x

upgrade to build 379

plugins/org.fusesource.ide.branding/archetypes/archetypes.xml

@@ -1,19 +1,19 @@
 <archetypes>
-<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-activemq' version='2.12.0.redhat-610376'>Creates a new Camel project that configures and interacts with ActiveMQ.</archetype>
-<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-blueprint' version='2.12.0.redhat-610376'>Creates a new Camel project with OSGi blueprint support. Ready to be deployed in OSGi.</archetype>
-<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-component' version='2.12.0.redhat-610376'>Creates a new Camel component.</archetype>
-<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-cxf-code-first-blueprint' version='2.12.0.redhat-610376'>Creates a new Camel project with Apache CXF code-first example using OSGi blueprint.</archetype>
-<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-cxf-contract-first-blueprint' version='2.12.0.redhat-610376'>Creates a new Camel project with Apache CXF contract-first example using OSGi blueprint.</archetype>
-<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-dataformat' version='2.12.0.redhat-610376'>Creates a new Camel data format.</archetype>
-<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-java' version='2.12.0.redhat-610376'>Creates a new Camel project using Java DSL.</archetype>
-<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-spring' version='2.12.0.redhat-610376'>Creates a new Camel project with added Spring DSL support.</archetype>
-<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-spring-dm' version='2.12.0.redhat-610376'>Creates a new Camel project with added Spring DSL support. Ready to be deployed in OSGi.</archetype>
-<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-web' version='2.12.0.redhat-610376'>Creates a new Camel web project that deploys the Camel routes as a WAR</archetype>
-<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-webconsole' version='2.12.0.redhat-610376'>Creates a new Camel project that deploys the Camel Web Console, REST API, and your routes as a WAR</archetype>
-<archetype groupId='org.apache.cxf.archetype' artifactId='cxf-jaxrs-service' version='2.7.0.redhat-610376'>Simple CXF JAX-RS webapp service using Spring configuration</archetype>
-<archetype groupId='org.apache.cxf.archetype' artifactId='cxf-jaxws-javafirst' version='2.7.0.redhat-610376'>null</archetype>
-<archetype groupId='io.fabric8' artifactId='camel-cxf-code-first-archetype' version='1.0.0.redhat-376'>Creates a new Camel project using CXF in code (Java) first.</archetype>
-<archetype groupId='io.fabric8' artifactId='camel-cxf-contract-first-archetype' version='1.0.0.redhat-376'>Creates a new Camel project using CXF in contract (WSDL) first.</archetype>
-<archetype groupId='io.fabric8' artifactId='camel-drools-archetype' version='1.0.0.redhat-376'>Creates a new Camel project using the Drools rule engine.</archetype>
-<archetype groupId='io.fabric8' artifactId='camel-webservice-archetype' version='1.0.0.redhat-376'>Creates a new Camel web services project</archetype>
+<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-activemq' version='2.12.0.redhat-610379'>Creates a new Camel project that configures and interacts with ActiveMQ.</archetype>
+<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-blueprint' version='2.12.0.redhat-610379'>Creates a new Camel project with OSGi blueprint support. Ready to be deployed in OSGi.</archetype>
+<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-component' version='2.12.0.redhat-610379'>Creates a new Camel component.</archetype>
+<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-cxf-code-first-blueprint' version='2.12.0.redhat-610379'>Creates a new Camel project with Apache CXF code-first example using OSGi blueprint.</archetype>
+<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-cxf-contract-first-blueprint' version='2.12.0.redhat-610379'>Creates a new Camel project with Apache CXF contract-first example using OSGi blueprint.</archetype>
+<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-dataformat' version='2.12.0.redhat-610379'>Creates a new Camel data format.</archetype>
+<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-java' version='2.12.0.redhat-610379'>Creates a new Camel project using Java DSL.</archetype>
+<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-spring' version='2.12.0.redhat-610379'>Creates a new Camel project with added Spring DSL support.</archetype>
+<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-spring-dm' version='2.12.0.redhat-610379'>Creates a new Camel project with added Spring DSL support. Ready to be deployed in OSGi.</archetype>
+<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-web' version='2.12.0.redhat-610379'>Creates a new Camel web project that deploys the Camel routes as a WAR</archetype>
+<archetype groupId='org.apache.camel.archetypes' artifactId='camel-archetype-webconsole' version='2.12.0.redhat-610379'>Creates a new Camel project that deploys the Camel Web Console, REST API, and your routes as a WAR</archetype>
+<archetype groupId='org.apache.cxf.archetype' artifactId='cxf-jaxrs-service' version='2.7.0.redhat-610379'>Simple CXF JAX-RS webapp service using Spring configuration</archetype>
+<archetype groupId='org.apache.cxf.archetype' artifactId='cxf-jaxws-javafirst' version='2.7.0.redhat-610379'>null</archetype>
+<archetype groupId='io.fabric8' artifactId='camel-cxf-code-first-archetype' version='1.0.0.redhat-379'>Creates a new Camel project using CXF in code (Java) first.</archetype>
+<archetype groupId='io.fabric8' artifactId='camel-cxf-contract-first-archetype' version='1.0.0.redhat-379'>Creates a new Camel project using CXF in contract (WSDL) first.</archetype>
+<archetype groupId='io.fabric8' artifactId='camel-drools-archetype' version='1.0.0.redhat-379'>Creates a new Camel project using the Drools rule engine.</archetype>
+<archetype groupId='io.fabric8' artifactId='camel-webservice-archetype' version='1.0.0.redhat-379'>Creates a new Camel web services project</archetype>
 </archetypes>

plugins/org.fusesource.ide.catalogs/plugin.xml

@@ -7,35 +7,35 @@
                    <uri
                       id="org.fusesource.xml.catalog.uri.activemq-spring"
                       name="http://activemq.apache.org/schema/spring/activemq-spring.xsd"
-                      uri="xsd/fuse/activemq-spring-5.9.0.redhat-610376.xsd"/>
+                      uri="xsd/fuse/activemq-spring-5.9.0.redhat-610379.xsd"/>
                <uri
                       id="org.fusesource.xml.catalog.uri.activemq-ra"
                       name="http://activemq.apache.org/schema/ra/activemq-ra.xsd"
-                      uri="xsd/fuse/activemq-ra-5.9.0.redhat-610376.xsd"/>
+                      uri="xsd/fuse/activemq-ra-5.9.0.redhat-610379.xsd"/>
                <uri
                       id="org.fusesource.xml.catalog.uri.camel-blueprint"
                       name="http://camel.apache.org/schema/blueprint/camel-blueprint.xsd"
-                      uri="xsd/fuse/camel-blueprint-2.12.0.redhat-610376.xsd"/>
+                      uri="xsd/fuse/camel-blueprint-2.12.0.redhat-610379.xsd"/>
                <uri
                       id="org.fusesource.xml.catalog.uri.camel-cxf"
                       name="http://camel.apache.org/schema/cxf/camel-cxf.xsd"
-                      uri="xsd/fuse/camel-cxf-2.12.0.redhat-610376-blueprint.xsd"/>
+                      uri="xsd/fuse/camel-cxf-2.12.0.redhat-610379-blueprint.xsd"/>
                <uri
                       id="org.fusesource.xml.catalog.uri.camel-cxf"
                       name="http://camel.apache.org/schema/cxf/camel-cxf.xsd"
-                      uri="xsd/fuse/camel-cxf-2.12.0.redhat-610376-spring.xsd"/>
+                      uri="xsd/fuse/camel-cxf-2.12.0.redhat-610379-spring.xsd"/>
                <uri
                       id="org.fusesource.xml.catalog.uri.camel-spring"
                       name="http://camel.apache.org/schema/spring/camel-spring.xsd"
-                      uri="xsd/fuse/camel-spring-2.12.0.redhat-610376.xsd"/>
+                      uri="xsd/fuse/camel-spring-2.12.0.redhat-610379.xsd"/>
                <uri
                       id="org.fusesource.xml.catalog.uri.camel-spring-integration"
                       name="http://camel.apache.org/schema/spring-integration/camel-spring-integration.xsd"
-                      uri="xsd/fuse/camel-spring-integration-2.12.0.redhat-610376.xsd"/>
+                      uri="xsd/fuse/camel-spring-integration-2.12.0.redhat-610379.xsd"/>
                <uri
                       id="org.fusesource.xml.catalog.uri.camel-spring-security"
                       name="http://camel.apache.org/schema/spring-security/camel-spring-security.xsd"
-                      uri="xsd/fuse/camel-spring-security-2.12.0.redhat-610376.xsd"/>
+                      uri="xsd/fuse/camel-spring-security-2.12.0.redhat-610379.xsd"/>
 
 
             </catalogContribution>

plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-blueprint-2.12.0.redhat-610376.xsd → plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-blueprint-2.12.0.redhat-610379.xsd

@@ -3142,28 +3142,28 @@
 
   <xs:simpleType name="errorHandlerType">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="LoggingErrorHandler"/>
-      <xs:enumeration value="NoErrorHandler"/>
       <xs:enumeration value="DeadLetterChannel"/>
       <xs:enumeration value="DefaultErrorHandler"/>
+      <xs:enumeration value="NoErrorHandler"/>
+      <xs:enumeration value="LoggingErrorHandler"/>
     </xs:restriction>
   </xs:simpleType>
 
   <xs:simpleType name="loggingLevel">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="DEBUG"/>
-      <xs:enumeration value="TRACE"/>
       <xs:enumeration value="OFF"/>
-      <xs:enumeration value="WARN"/>
+      <xs:enumeration value="TRACE"/>
       <xs:enumeration value="ERROR"/>
+      <xs:enumeration value="DEBUG"/>
+      <xs:enumeration value="WARN"/>
       <xs:enumeration value="INFO"/>
     </xs:restriction>
   </xs:simpleType>
 
   <xs:simpleType name="threadPoolRejectedPolicy">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="Abort"/>
       <xs:enumeration value="Discard"/>
+      <xs:enumeration value="Abort"/>
       <xs:enumeration value="DiscardOldest"/>
       <xs:enumeration value="CallerRuns"/>
     </xs:restriction>
@@ -3172,41 +3172,41 @@
   <xs:simpleType name="exchangePattern">
     <xs:restriction base="xs:string">
       <xs:enumeration value="OutOptionalIn"/>
-      <xs:enumeration value="OutIn"/>
-      <xs:enumeration value="InOptionalOut"/>
-      <xs:enumeration value="InOut"/>
-      <xs:enumeration value="InOnly"/>
-      <xs:enumeration value="RobustOutOnly"/>
       <xs:enumeration value="OutOnly"/>
       <xs:enumeration value="RobustInOnly"/>
+      <xs:enumeration value="InOptionalOut"/>
+      <xs:enumeration value="RobustOutOnly"/>
+      <xs:enumeration value="OutIn"/>
+      <xs:enumeration value="InOnly"/>
+      <xs:enumeration value="InOut"/>
     </xs:restriction>
   </xs:simpleType>
 
   <xs:simpleType name="bindyType">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="Csv"/>
       <xs:enumeration value="Fixed"/>
       <xs:enumeration value="KeyValue"/>
+      <xs:enumeration value="Csv"/>
     </xs:restriction>
   </xs:simpleType>
 
   <xs:simpleType name="jsonLibrary">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="Gson"/>
-      <xs:enumeration value="XStream"/>
       <xs:enumeration value="Jackson"/>
+      <xs:enumeration value="XStream"/>
+      <xs:enumeration value="Gson"/>
     </xs:restriction>
   </xs:simpleType>
 
   <xs:simpleType name="c24IOContentType">
     <xs:restriction base="xs:string">
+      <xs:enumeration value="Default"/>
       <xs:enumeration value="Sax"/>
-      <xs:enumeration value="Text"/>
-      <xs:enumeration value="TagValuePair"/>
+      <xs:enumeration value="Auto"/>
       <xs:enumeration value="Java"/>
+      <xs:enumeration value="Text"/>
       <xs:enumeration value="Xml"/>
-      <xs:enumeration value="Default"/>
-      <xs:enumeration value="Auto"/>
+      <xs:enumeration value="TagValuePair"/>
       <xs:enumeration value="Binary"/>
     </xs:restriction>
   </xs:simpleType>

plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-spring-2.12.0.redhat-610376.xsd → plugins/org.fusesource.ide.catalogs/xsd/fuse/camel-spring-2.12.0.redhat-610379.xsd

@@ -3127,68 +3127,68 @@
     <xs:restriction base="xs:string">
       <xs:enumeration value="OutOptionalIn"/>
       <xs:enumeration value="OutIn"/>
-      <xs:enumeration value="RobustInOnly"/>
-      <xs:enumeration value="InOnly"/>
+      <xs:enumeration value="InOptionalOut"/>
       <xs:enumeration value="OutOnly"/>
       <xs:enumeration value="RobustOutOnly"/>
-      <xs:enumeration value="InOptionalOut"/>
+      <xs:enumeration value="InOnly"/>
       <xs:enumeration value="InOut"/>
+      <xs:enumeration value="RobustInOnly"/>
     </xs:restriction>
   </xs:simpleType>
 
   <xs:simpleType name="loggingLevel">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="TRACE"/>
+      <xs:enumeration value="WARN"/>
+      <xs:enumeration value="DEBUG"/>
       <xs:enumeration value="OFF"/>
       <xs:enumeration value="ERROR"/>
+      <xs:enumeration value="TRACE"/>
       <xs:enumeration value="INFO"/>
-      <xs:enumeration value="DEBUG"/>
-      <xs:enumeration value="WARN"/>
     </xs:restriction>
   </xs:simpleType>
 
   <xs:simpleType name="threadPoolRejectedPolicy">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="Abort"/>
       <xs:enumeration value="Discard"/>
-      <xs:enumeration value="CallerRuns"/>
       <xs:enumeration value="DiscardOldest"/>
+      <xs:enumeration value="Abort"/>
+      <xs:enumeration value="CallerRuns"/>
     </xs:restriction>
   </xs:simpleType>
 
   <xs:simpleType name="bindyType">
     <xs:restriction base="xs:string">
       <xs:enumeration value="Csv"/>
-      <xs:enumeration value="Fixed"/>
       <xs:enumeration value="KeyValue"/>
+      <xs:enumeration value="Fixed"/>
     </xs:restriction>
   </xs:simpleType>
 
   <xs:simpleType name="c24IOContentType">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="Sax"/>
-      <xs:enumeration value="TagValuePair"/>
-      <xs:enumeration value="Text"/>
+      <xs:enumeration value="Java"/>
       <xs:enumeration value="Xml"/>
-      <xs:enumeration value="Auto"/>
+      <xs:enumeration value="Sax"/>
       <xs:enumeration value="Binary"/>
-      <xs:enumeration value="Java"/>
+      <xs:enumeration value="TagValuePair"/>
       <xs:enumeration value="Default"/>
+      <xs:enumeration value="Auto"/>
+      <xs:enumeration value="Text"/>
     </xs:restriction>
   </xs:simpleType>
 
   <xs:simpleType name="jsonLibrary">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="Gson"/>
       <xs:enumeration value="Jackson"/>
+      <xs:enumeration value="Gson"/>
       <xs:enumeration value="XStream"/>
     </xs:restriction>
   </xs:simpleType>
 
   <xs:simpleType name="shutdownRoute">
     <xs:restriction base="xs:string">
-      <xs:enumeration value="Defer"/>
       <xs:enumeration value="Default"/>
+      <xs:enumeration value="Defer"/>
     </xs:restriction>
   </xs:simpleType>
 
@@ -3201,11 +3201,11 @@
 
   <xs:simpleType name="errorHandlerType">
     <xs:restriction base="xs:string">
+      <xs:enumeration value="TransactionErrorHandler"/>
+      <xs:enumeration value="DeadLetterChannel"/>
       <xs:enumeration value="LoggingErrorHandler"/>
-      <xs:enumeration value="DefaultErrorHandler"/>
       <xs:enumeration value="NoErrorHandler"/>
-      <xs:enumeration value="DeadLetterChannel"/>
-      <xs:enumeration value="TransactionErrorHandler"/>
+      <xs:enumeration value="DefaultErrorHandler"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>

plugins/org.fusesource.ide.server.fuse.core/plugin.xml

@@ -103,15 +103,15 @@
           os="linux">
     </runtime>
     <runtime
-          archivePath="jboss-fuse-6.1.0.redhat-376"
-          archiveUrl="https://repository.jboss.org/nexus/content/groups/ea/org/jboss/fuse/jboss-fuse-full/6.1.0.redhat-376/jboss-fuse-full-6.1.0.redhat-376.zip"
+          archivePath="jboss-fuse-6.1.0.redhat-379"
+          archiveUrl="https://repository.jboss.org/nexus/content/groups/ea/org/jboss/fuse/jboss-fuse-full/6.1.0.redhat-379/jboss-fuse-full-6.1.0.redhat-379.zip"
           id="org.fusesource.ide.fuseesb.runtime.61"
           licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt"
           os="win32">
     </runtime>
     <runtime
-          archivePath="jboss-fuse-6.1.0.redhat-376"
-          archiveUrl="https://repository.jboss.org/nexus/content/groups/ea/org/jboss/fuse/jboss-fuse-full/6.1.0.redhat-376/jboss-fuse-full-6.1.0.redhat-376.zip"
+          archivePath="jboss-fuse-6.1.0.redhat-379"
+          archiveUrl="https://repository.jboss.org/nexus/content/groups/ea/org/jboss/fuse/jboss-fuse-full/6.1.0.redhat-379/jboss-fuse-full-6.1.0.redhat-379.zip"
           id="org.fusesource.ide.fuseesb.runtime.61"
           licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt"
           os="linux">

pom.xml

@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.fusesource</groupId>
     <artifactId>fuse-project</artifactId>
-    <version>1.0.0.redhat-376</version>
+    <version>1.0.0.redhat-379</version>
     <!-- 
     <version>99-master-SNAPSHOT</version>
     -->