[camel] branch master updated (8255261 -> f5bd55b)

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated (8255261 -> f5bd55b)

acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 8255261  Archetypes: Avoid usage of camel-parent, archetype-spring
     new 2bcd0ac  Archetypes: Removed camel-archetype-web
     new ed6ad7f  Removed camel-archetype-web from modules
     new f5bd55b  Updated the list of archetypes

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 archetypes/camel-archetype-web/pom.xml             |  61 -------
 .../META-INF/maven/archetype-metadata.xml          |  78 --------
 .../src/main/resources/META-INF/LICENSE.txt        | 203 ---------------------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 --
 .../main/resources/archetype-resources/ReadMe.txt  |  31 ----
 .../src/main/resources/archetype-resources/pom.xml | 130 -------------
 .../src/main/resources/log4j2.properties           |  23 ---
 .../src/main/webapp/WEB-INF/applicationContext.xml |  47 -----
 .../src/main/webapp/WEB-INF/web.xml                |  48 -----
 .../archetype-resources/src/main/webapp/index.html |  43 -----
 archetypes/pom.xml                                 |   1 -
 .../modules/ROOT/pages/camel-maven-archetypes.adoc |  25 +--
 12 files changed, 7 insertions(+), 694 deletions(-)
 delete mode 100644 archetypes/camel-archetype-web/pom.xml
 delete mode 100644 archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
 delete mode 100644 archetypes/camel-archetype-web/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 archetypes/camel-archetype-web/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 archetypes/camel-archetype-web/src/main/resources/archetype-resources/ReadMe.txt
 delete mode 100644 archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
 delete mode 100644 archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/resources/log4j2.properties
 delete mode 100644 archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
 delete mode 100644 archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/index.html

Reply | Threaded
Open this post in threaded view
|

[camel] 01/03: Archetypes: Removed camel-archetype-web

acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 2bcd0ac303e179411a0752fc21066eff3b30af67
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Fri May 22 11:57:52 2020 +0200

    Archetypes: Removed camel-archetype-web
---
 archetypes/camel-archetype-web/pom.xml             |  61 -------
 .../META-INF/maven/archetype-metadata.xml          |  78 --------
 .../src/main/resources/META-INF/LICENSE.txt        | 203 ---------------------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 --
 .../main/resources/archetype-resources/ReadMe.txt  |  31 ----
 .../src/main/resources/archetype-resources/pom.xml | 130 -------------
 .../src/main/resources/log4j2.properties           |  23 ---
 .../src/main/webapp/WEB-INF/applicationContext.xml |  47 -----
 .../src/main/webapp/WEB-INF/web.xml                |  48 -----
 .../archetype-resources/src/main/webapp/index.html |  43 -----
 10 files changed, 675 deletions(-)

diff --git a/archetypes/camel-archetype-web/pom.xml b/archetypes/camel-archetype-web/pom.xml
deleted file mode 100644
index 44295c2..0000000
--- a/archetypes/camel-archetype-web/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>archetypes</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.camel.archetypes</groupId>
-    <artifactId>camel-archetype-web</artifactId>
-    <name>Camel :: Archetypes :: WAR with Spring XML Based Router</name>
-    <description>Creates a new Camel web project that deploys the Camel routes as a WAR application</description>
-    <packaging>maven-archetype</packaging>
-
-    <build>
-        <extensions>
-            <extension>
-                <groupId>org.apache.maven.archetype</groupId>
-                <artifactId>archetype-packaging</artifactId>
-                <version>${maven-archetype-packaging-version}</version>
-            </extension>
-        </extensions>
-
-        <!-- include all resources but only filter archetype-metadata.xml -->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
-                <directory>src/main/resources-filtered</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/archetype-metadata.xml</include>
-                </includes>
-            </resource>
-        </resources>
-    </build>
-
-</project>
diff --git a/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 12792ab..0000000
--- a/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You 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.
-
--->
-<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="camel-archetype-java"
-    xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <requiredProperties>
-    <requiredProperty key="camel-version">
-      <defaultValue>${project.version}</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="jetty9-version">
-      <defaultValue>${jetty9-version}</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="jetty-plugin-version">
-      <defaultValue>${jetty-plugin-version}</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="maven-compiler-plugin-version">
-      <defaultValue>${maven-compiler-plugin-version}</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="maven-resources-plugin-version">
-      <defaultValue>${maven-resources-plugin-version}</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="maven-jboss-as-maven-plugin-version">
-      <defaultValue>${maven-jboss-as-maven-plugin-version}</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="spring-version">
-      <defaultValue>${spring-version}</defaultValue>
-    </requiredProperty>
-  </requiredProperties>
-  <fileSets>
-    <fileSet filtered="true" packaged="true" encoding="UTF-8">
-      <directory>src/main/java</directory>
-      <includes>
-        <include>**/*.java</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
-      <directory>src/main/resources</directory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
-      <directory>src/main/webapp</directory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" packaged="true" encoding="UTF-8">
-      <directory>src/test/java</directory>
-      <includes>
-        <include>**/*.java</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
-      <directory></directory>
-      <includes>
-        <include>ReadMe.txt</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</archetype-descriptor>
diff --git a/archetypes/camel-archetype-web/src/main/resources/META-INF/LICENSE.txt b/archetypes/camel-archetype-web/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/archetypes/camel-archetype-web/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
-
diff --git a/archetypes/camel-archetype-web/src/main/resources/META-INF/NOTICE.txt b/archetypes/camel-archetype-web/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/archetypes/camel-archetype-web/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Camel distribution.                    ==
-   =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Please read the different LICENSE files present in the licenses directory of
-   this distribution.
diff --git a/archetypes/camel-archetype-web/src/main/resources/archetype-resources/ReadMe.txt b/archetypes/camel-archetype-web/src/main/resources/archetype-resources/ReadMe.txt
deleted file mode 100644
index 3388828..0000000
--- a/archetypes/camel-archetype-web/src/main/resources/archetype-resources/ReadMe.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Camel Router WAR Project
-========================
-
-This project includes a sample route as as a WAR.
-You can build the WAR by running
-
-    mvn install
-
-You can then run the project by dropping the WAR into your
-favorite web container or just run
-
-    mvn jetty:run
-
-to start up and deploy to Jetty.
-
-If you have JBoss AS running you can deploy using
-
-   mvn jboss-as:deploy
-
-Or to redeploy
-
-    mvn jboss-as:redeploy
-
-
-The application will be available at:
-   http://localhost:8080/${artifactId}/
-
-For more help see the Apache Camel documentation
-
-    http://camel.apache.org/
-
diff --git a/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 350d984..0000000
--- a/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-## ------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You 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.
-## ------------------------------------------------------------------------
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <version>${version}</version>
-  <packaging>war</packaging>
-
-  <name>Camel Web Application</name>
-  <description>Camel project that deploys the Camel routes as a WAR</description>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <!-- Camel BOM -->
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-parent</artifactId>
-        <version>${camel-version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-
-    <!-- Camel Dependencies -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-spring</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-servlet</artifactId>
-    </dependency>
-
-    <!-- Spring Web -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>${spring-version}</version>
-    </dependency>
-
-    <!-- logging -->
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-
-    <!-- testing -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-test-spring</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <defaultGoal>install</defaultGoal>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>${maven-compiler-plugin-version}</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>${maven-resources-plugin-version}</version>
-        <configuration>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-
-      <!-- allows running this example with mvn jetty:run -->
-      <plugin>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-maven-plugin</artifactId>
-        <version>${jetty9-version}</version>
-        <configuration>
-          <webApp>
-            <contextPath>/${project.artifactId}</contextPath>
-          </webApp>
-        </configuration>
-      </plugin>
-
-      <!-- plugin to deploy to JBoss AS with: mvn jboss-as:deploy (you can also do redeploy/undeploy) -->
-      <plugin>
-        <groupId>org.jboss.as.plugins</groupId>
-        <artifactId>jboss-as-maven-plugin</artifactId>
-        <version>${maven-jboss-as-maven-plugin-version}</version>
-      </plugin>
-
-    </plugins>
-  </build>
-
-</project>
diff --git a/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/resources/log4j2.properties b/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/resources/log4j2.properties
deleted file mode 100644
index d9f0508..0000000
--- a/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/resources/log4j2.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You 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.
-## ---------------------------------------------------------------------------
-
-appender.out.type = Console
-appender.out.name = out
-appender.out.layout.type = PatternLayout
-appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n
-rootLogger.level = INFO
-rootLogger.appenderRef.out.ref = out
diff --git a/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml b/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
deleted file mode 100644
index 02d5a2a..0000000
--- a/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-## ------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You 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.
-## ------------------------------------------------------------------------
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-
-  <camelContext xmlns="http://camel.apache.org/schema/spring">
-    <route id="helloRoute">
-      <!-- incoming requests from the servlet is routed -->
-      <from uri="servlet:hello"/>
-      <choice>
-        <when>
-          <!-- is there a header with the key name? -->
-          <header>name</header>
-          <!-- yes so return back a message to the user -->
-          <transform>
-             <simple>Hi I am ${sysenv.HOSTNAME}. Hello ${header.name} how are you today?</simple>
-          </transform>
-        </when>
-        <otherwise>
-          <!-- if no name parameter then output a syntax to the user -->
-          <transform>
-            <constant>Add a name parameter to uri, eg ?name=foo</constant>
-          </transform>
-        </otherwise>
-      </choice>
-    </route>
-  </camelContext>
-
-</beans>
diff --git a/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 532b3d1..0000000
--- a/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-## ------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You 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.
-## ------------------------------------------------------------------------
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
-  <display-name>Camel Routes</display-name>
-
-  <!-- location of spring xml files -->
-  <context-param>
-    <param-name>contextConfigLocation</param-name>
-    <param-value>/WEB-INF/applicationContext.xml</param-value>
-  </context-param>
-
-  <!-- the listener that kick-starts Spring -->
-  <listener>
-    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-  </listener>
-
-  <!-- Camel servlet -->
-  <servlet>
-    <servlet-name>CamelServlet</servlet-name>
-    <servlet-class>org.apache.camel.component.servlet.CamelHttpTransportServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <!-- Camel servlet mapping -->
-  <servlet-mapping>
-    <servlet-name>CamelServlet</servlet-name>
-    <url-pattern>/camel/*</url-pattern>
-  </servlet-mapping>
-
-</web-app>
diff --git a/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/index.html b/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/index.html
deleted file mode 100644
index 9167a21..0000000
--- a/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/index.html
+++ /dev/null
@@ -1,43 +0,0 @@
-## ------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You 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.
-## ------------------------------------------------------------------------
-<html>
-
-<body>
-<h2>Camel Servlet example</h2>
-
-This example shows how to route messages from HTTP using servlets with Apache Camel.
-<br/>
-<br/>
-To get started click <a href="camel/hello">this link</a>.
-<br/>
-<br/>
-This example is documented at
-<a href="http://camel.apache.org/servlet-tomcat-example.html">servlet tomcat example</a>
-
-<br/>
-If you hit any problems please let us know on the
-<a href="http://camel.apache.org/discussion-forums.html">Camel Forums</a>
-<br/>
-<br/>
-Please help us make Apache Camel better - we appreciate any feedback you may
-have. Enjoy!
-<br/>
-<br/>
-The Camel riders!
-</body>
-
-</html>
\ No newline at end of file

Reply | Threaded
Open this post in threaded view
|

[camel] 02/03: Removed camel-archetype-web from modules

acosentino
In reply to this post by acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit ed6ad7f0b121a5788006850dc7d39b574197a780
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Fri May 22 11:59:38 2020 +0200

    Removed camel-archetype-web from modules
---
 archetypes/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 8fb7a6a..7562179 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -44,7 +44,6 @@
         <module>camel-archetype-main</module>
         <module>camel-archetype-spring</module>
         <module>camel-archetype-spring-boot</module>
-        <module>camel-archetype-web</module>
     </modules>
 
     <build>

Reply | Threaded
Open this post in threaded view
|

[camel] 03/03: Updated the list of archetypes

acosentino
In reply to this post by acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit f5bd55b1e38486401f46a4ed7bd15959830dfaef
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Fri May 22 12:13:13 2020 +0200

    Updated the list of archetypes
---
 .../modules/ROOT/pages/camel-maven-archetypes.adoc | 25 ++++++----------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/docs/user-manual/modules/ROOT/pages/camel-maven-archetypes.adoc b/docs/user-manual/modules/ROOT/pages/camel-maven-archetypes.adoc
index ad19983..188640b 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-maven-archetypes.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-maven-archetypes.adoc
@@ -9,13 +9,15 @@ Camel is distributed with the following archetypes for Maven end users.
 [width="100%",cols="50%,50%",options="header",]
 |=======================================================================
 |Archetype |Description
-|camel-archetype-activemq |This archetype is used to create a new Maven
-project for Camel routes with Apache ActiveMQ embedded.
 
 |camel-archetype-blueprint |*Camel 2.8:* This archetype is used to
 create a new Maven project for Camel routes to be running in OSGi using
 Blueprint.
 
+|camel-archetype-api-component |This archetype is used for creating a new
+Maven project for Camel xref:components::index.adoc[Components]. Use this if
+there is a component missing in Camel that you want to create yourself and it needs the API Maven plugin.
+
 |camel-archetype-component |This archetype is used for creating a new
 Maven project for Camel xref:components::index.adoc[Components]. Use this if
 there is a component missing in Camel that you want to create yourself.
@@ -24,18 +26,6 @@ there is a component missing in Camel that you want to create yourself.
 new Maven project for Camel routes in the Java Container using CDI to
 configure components, endpoints and beans
 
-|[line-through]*camel-archetype-cxf-code-first-blueprint*
-|[line-through]*Deprecated. Camel 2.12.2:* This archetype is used
-creating a new Maven project for Camel with xref:components::cxf-component.adoc[CXF] exposing
-a web service using code-first style. This project is for OSGi Blueprint
-containers. Removed from Camel 2.18 onwards.
-
-|[line-through]*camel-archetype-cxf-contract-first-blueprint*
-|[line-through]*Deprecated. Camel 2.12.1:* This archetype is used
-creating a new Maven project for Camel with xref:components::cxf-component.adoc[CXF] exposing
-a web service using contract-first style. This project is for OSGi
-Blueprint containers. Removed from Camel 2.18 onwards.
-
 |camel-archetype-dataformat |*Camel 2.9:* This archetype is used for
 creating a new Maven project for Camel xref:data-format.adoc[Data
 Format]s. Use this if there is a data format missing in Camel that you
@@ -44,6 +34,9 @@ want to create yourself.
 |camel-archetype-java |This archetype is used to create a new Maven
 project for Camel routes using Java DSL.
 
+|camel-archetype-java8 |This archetype is used to create a new Maven
+project for Camel routes using Java DSL.
+
 |camel-archetype-scr |This archetype is used to create a new Maven
 project for building Camel routes using OSGI SCR Declarative Services
 
@@ -53,10 +46,6 @@ project for Camel routes using Spring XML.
 |camel-archetype-spring-boot |*Camel 2.16:* This archetype is used to
 create a new Maven project for Camel routes using Spring Boot.
 
-|camel-archetype-spring-dm |*Camel 2.8:* This archetype is used to
-create a new Maven project for Camel routes to be running in OSGi using
-Spring DM.
-
 |=======================================================================
 
 The maven coordinates for these archetypes is the following: