You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/12/11 08:10:46 UTC
[3/3] camel git commit: CAMEL-9411 Remove old stuff
CAMEL-9411 Remove old stuff
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6dd1856a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6dd1856a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6dd1856a
Branch: refs/heads/master
Commit: 6dd1856a5181b94af48e24190bdff111954fbded
Parents: 841dab8
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 11 08:10:21 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 11 08:10:21 2015 +0100
----------------------------------------------------------------------
apache-camel/src/main/descriptors/unix-bin.xml | 38 --------------------
.../src/main/descriptors/windows-bin.xml | 37 -------------------
apache-camel/src/main/release/README.txt | 23 +++++++-----
3 files changed, 15 insertions(+), 83 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6dd1856a/apache-camel/src/main/descriptors/unix-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/unix-bin.xml b/apache-camel/src/main/descriptors/unix-bin.xml
index ce0850e..67eb8a8 100644
--- a/apache-camel/src/main/descriptors/unix-bin.xml
+++ b/apache-camel/src/main/descriptors/unix-bin.xml
@@ -46,11 +46,6 @@
<exclude>**/target/*</exclude>
<exclude>**/*.ser</exclude>
<exclude>**/*.log</exclude>
- <!-- exclude README.txt which need get filtered -->
- <exclude>**/camel-example-reportincident-wssecurity/README.txt</exclude>
- <exclude>**/camel-example-osgi/README.txt</exclude>
- <exclude>**/camel-example-cxf-osgi/README.txt</exclude>
- <exclude>**/camel-example-cxf-blueprint/README.txt</exclude>
</excludes>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -74,39 +69,6 @@
</fileSet>
</fileSets>
- <files>
- <!--filtering README.txt-->
- <file>
- <source>../examples/camel-example-reportincident-wssecurity/README.txt</source>
- <outputDirectory>/examples/camel-example-reportincident-wssecurity</outputDirectory>
- <filtered>true</filtered>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- <file>
- <source>../examples/camel-example-osgi/README.txt</source>
- <outputDirectory>/examples/camel-example-osgi</outputDirectory>
- <filtered>true</filtered>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- <file>
- <source>../examples/camel-example-cxf-osgi/README.txt</source>
- <outputDirectory>/examples/camel-example-cxf-osgi</outputDirectory>
- <filtered>true</filtered>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- <file>
- <source>../examples/camel-example-cxf-blueprint/README.txt</source>
- <outputDirectory>/examples/camel-example-cxf-blueprint</outputDirectory>
- <filtered>true</filtered>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- </files>
-
-
<componentDescriptors>
<componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
</componentDescriptors>
http://git-wip-us.apache.org/repos/asf/camel/blob/6dd1856a/apache-camel/src/main/descriptors/windows-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/windows-bin.xml b/apache-camel/src/main/descriptors/windows-bin.xml
index d088456..27627cc 100644
--- a/apache-camel/src/main/descriptors/windows-bin.xml
+++ b/apache-camel/src/main/descriptors/windows-bin.xml
@@ -46,11 +46,6 @@
<exclude>**/target/*</exclude>
<exclude>**/*.ser</exclude>
<exclude>**/*.log</exclude>
- <!-- exclude README.txt which need get filtered -->
- <exclude>**/camel-example-reportincident-wssecurity/README.txt</exclude>
- <exclude>**/camel-example-osgi/README.txt</exclude>
- <exclude>**/camel-example-cxf-osgi/README.txt</exclude>
- <exclude>**/camel-example-cxf-blueprint/README.txt</exclude>
</excludes>
<lineEnding>dos</lineEnding>
</fileSet>
@@ -74,38 +69,6 @@
</fileSet>
</fileSets>
- <files>
- <!--filtering README.txt-->
- <file>
- <source>../examples/camel-example-reportincident-wssecurity/README.txt</source>
- <outputDirectory>/examples/camel-example-reportincident-wssecurity</outputDirectory>
- <filtered>true</filtered>
- <fileMode>0644</fileMode>
- <lineEnding>dos</lineEnding>
- </file>
- <file>
- <source>../examples/camel-example-osgi/README.txt</source>
- <outputDirectory>/examples/camel-example-osgi</outputDirectory>
- <filtered>true</filtered>
- <fileMode>0644</fileMode>
- <lineEnding>dos</lineEnding>
- </file>
- <file>
- <source>../examples/camel-example-cxf-osgi/README.txt</source>
- <outputDirectory>/examples/camel-example-cxf-osgi</outputDirectory>
- <filtered>true</filtered>
- <fileMode>0644</fileMode>
- <lineEnding>dos</lineEnding>
- </file>
- <file>
- <source>../examples/camel-example-cxf-blueprint/README.txt</source>
- <outputDirectory>/examples/camel-example-cxf-blueprint</outputDirectory>
- <filtered>true</filtered>
- <fileMode>0644</fileMode>
- <lineEnding>dos</lineEnding>
- </file>
- </files>
-
<componentDescriptors>
<componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
</componentDescriptors>
http://git-wip-us.apache.org/repos/asf/camel/blob/6dd1856a/apache-camel/src/main/release/README.txt
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/release/README.txt b/apache-camel/src/main/release/README.txt
index 5167302..04d3015 100755
--- a/apache-camel/src/main/release/README.txt
+++ b/apache-camel/src/main/release/README.txt
@@ -92,11 +92,18 @@ code and source code.
The following provides more details on the included cryptographic
software:
- * camel-ftp can be configured for secure file transfers
- * camel-mail can be configured for secure email communications
- * camel-cxf can be configured for secure web service communications
- * camel-jetty can be configured to use https
- * camel-http can be configured to use https
- * camel-gae can be configured for secure communications
- * camel-xmlsecurity can be configured for secure communications
-
+ * camel-ahc can be configured to use https
+ * camel-crypto can be used for secure communications
+ * camel-cxf can be configured for secure communications
+ * camel-ftp can be configured for secure communications
+ * camel-gae can be configured for secure communications
+ * camel-http can be configured to use https
+ * camel-http4 can be configured to use https
+ * camel-jasypt can be used for secure communications
+ * camel-jetty can be configured to use https
+ * camel-mail can be configured for secure communications
+ * camel-nagios can be configured for secure communications
+ * camel-netty-http can be configured to use https
+ * camel-netty4-http can be configured to use https
+ * camel-undertow can be configured to use https
+ * camel-xmlsecurity can be configured for secure communications