You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by as...@apache.org on 2006/06/01 14:47:26 UTC
svn commit: r410859 - in /incubator/synapse/trunk/java: NOTICE-JAR.txt
README.txt maven.xml modules/extensions/maven.xml
modules/extensions/src/META-INF/NOTICE.txt project.xml
Author: asankha
Date: Thu Jun 1 05:47:25 2006
New Revision: 410859
URL: http://svn.apache.org/viewvc?rev=410859&view=rev
Log:
merge changes from M2 branch
Added:
incubator/synapse/trunk/java/NOTICE-JAR.txt
- copied unchanged from r410857, incubator/synapse/branches/M2/NOTICE-JAR.txt
incubator/synapse/trunk/java/modules/extensions/src/META-INF/NOTICE.txt
Modified:
incubator/synapse/trunk/java/README.txt
incubator/synapse/trunk/java/maven.xml
incubator/synapse/trunk/java/modules/extensions/maven.xml
incubator/synapse/trunk/java/project.xml
Modified: incubator/synapse/trunk/java/README.txt
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/README.txt?rev=410859&r1=410858&r2=410859&view=diff
==============================================================================
--- incubator/synapse/trunk/java/README.txt (original)
+++ incubator/synapse/trunk/java/README.txt Thu Jun 1 05:47:25 2006
@@ -4,7 +4,7 @@
http://incubator.apache.org/synapse/
------------------------------------------------------
-Synapse is an effort undergoing incubation at the Apache Software Foundation (ASF),
+Apache Synapse is an effort undergoing incubation at the Apache Software Foundation (ASF),
sponsored by the Web Services PMC. Incubation is required of all newly accepted projects
until a further review indicates that the infrastructure, communications, and decision
making process have stabilized in a manner consistent with other successful ASF projects.
@@ -19,7 +19,7 @@
binary distribution and in the 'xdocs' directory in the source
distribution. Documentation on samples are available in the samples directory.
-For examples on Synapse message mediation please see the User Guide
+For examples on Apache Synapse message mediation please see the User Guide
(http://wiki.apache.org/ws/Synapse/UserGuide).
For more information on the Synapse Configuration language syntax and useage refer to
@@ -31,9 +31,9 @@
Synapse is typically configured using a synapse.xml file in the repository directory.
In the binary distribution this is the <SYNAPSE>\synapse_repository directory, where
-<SYNAPSE> is the directory you installed SYNAPSE to.
+<SYNAPSE> is the directory you installed Apache Synapse into.
-You can start the sample Synapse configuration using the bin\synapse command (bat or sh)
+You can start the sample Apache Synapse configuration using the bin\synapse command (bat or sh)
This will pick up the Synapse configuration at <SYNAPSE>\synapse_repository\conf\synapse.xml
and the Axis2 configuration from <SYNAPSE>\synapse_repository\conf\axis2.xml
@@ -50,7 +50,7 @@
Support
===================
-Any problem with this release can be reported to Synapse mailing list
+Any problem with this release can be reported to Apache Synapse mailing list
or in the JIRA issue tracker.
Mailing list subscription:
Modified: incubator/synapse/trunk/java/maven.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/maven.xml?rev=410859&r1=410858&r2=410859&view=diff
==============================================================================
--- incubator/synapse/trunk/java/maven.xml (original)
+++ incubator/synapse/trunk/java/maven.xml Thu Jun 1 05:47:25 2006
@@ -296,6 +296,13 @@
<ant:echo>+----------------------------------------</ant:echo>
<ant:delete dir="target"/>
<ant:delete dir="etc/target"/>
+ <ant:echo>+----------------------------------------</ant:echo>
+ <ant:echo>| Cleaning: logs and MANIFEST.MF </ant:echo>
+ <ant:echo>+----------------------------------------</ant:echo>
+ <ant:delete file="modules/extensions/synapse.log"/>
+ <ant:delete file="modules/core/synapse.log"/>
+ <ant:delete file="MANIFEST.MF"/>
+ <ant:delete file="modules/extensions/MANIFEST.MF"/>
</goal>
<goal name="clean">
@@ -313,7 +320,18 @@
</goal> -->
<goal name="create-jar" prereqs="init">
- <jar destfile="target/lib/${pom.artifactId}-${pom.currentVersion}.jar">
+ <manifest file="MANIFEST.MF">
+ <attribute name="Extension-Name" value="org.apache.synapse"/>
+ <attribute name="Specification-Title" value="${pom.artifactId}"/>
+ <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
+ <attribute name="Specification-Version" value="${pom.currentVersion}"/>
+ <attribute name="Implementation-Title" value="Apache Synapse"/>
+ <attribute name="Implementation-Vendor-Id" value="org.apache"/>
+ <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
+ <attribute name="Implementation-Version" value="${pom.currentVersion}"/>
+ </manifest>
+
+ <jar destfile="target/lib/${pom.artifactId}-${pom.currentVersion}.jar" manifest="MANIFEST.MF">
<fileset dir="modules/core/target/classes"/>
</jar>
</goal>
@@ -323,6 +341,8 @@
<ant:mkdir dir="${target/lib}/endorsed"/>
</goal>
+ <goal name="release" prereqs="dist-src,dist-bin,dist-extensions"/>
+
<!-- ================================================================ -->
<!--- Create the Distro -->
<!-- ================================================================ -->
@@ -338,10 +358,51 @@
<ant:mkdir dir="${bin.dist.dir}/xdocs"/>
<ant:mkdir dir="${bin.dist.dir}/synapse_repository"/>
<ant:mkdir dir="${bin.dist.dir}/samples"/>
- <!--<ant:mkdir dir="${bin.dist.dir}/mediators"/>-->
+ <ant:mkdir dir="${bin.dist.dir}/licenses"/>
<ant:mkdir dir="target/temp/"/>
+ <ant:mkdir dir="target/temp1/"/>
+ <ant:mkdir dir="target/temp1/META-INF/"/>
+ <ant:copy todir="target/temp1/META-INF/">
+ <ant:fileset file="LICENSE.txt"/>
+ </ant:copy>
+
+ <ant:copy file="NOTICE-JAR.txt"
+ tofile="target/temp1/META-INF/NOTICE.txt"/>
+
+ <ant:copy todir="target/temp1/">
+ <ant:fileset dir="modules/core/target/classes">
+ <ant:include name="**"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <manifest file="MANIFEST.MF">
+ <attribute name="Extension-Name" value="org.apache.synapse"/>
+ <attribute name="Specification-Title" value="${pom.artifactId}"/>
+ <attribute name="Specification-Vendor"
+ value="Apache Software Foundation"/>
+ <attribute name="Specification-Version"
+ value="${pom.currentVersion}"/>
+ <attribute name="Implementation-Title" value="Apache Synapse"/>
+ <attribute name="Implementation-Vendor-Id" value="org.apache"/>
+ <attribute name="Implementation-Vendor"
+ value="Apache Software Foundation"/>
+ <attribute name="Implementation-Version"
+ value="${pom.currentVersion}"/>
+ </manifest>
+
+ <jar destfile="target/lib/${pom.artifactId}-${pom.currentVersion}.jar" manifest="MANIFEST.MF">
+ <fileset dir="modules/core/target/classes"/>
+ </jar>
+
+ <jar destfile="target/${dist.name}.jar" manifest="MANIFEST.MF">
+ <fileset dir="target/temp1"/>
+ </jar>
+
+ <ant:copy file="target/${dist.name}.jar"
+ tofile="target/lib/${dist.name}.jar"/>
+
<ant:copy todir="${bin.dist.dir}/xdocs">
<ant:fileset dir="xdocs">
<ant:include name="**"/>
@@ -355,12 +416,23 @@
<ant:include name="*.txt"/>
</ant:fileset>
</ant:copy>
+
+ <ant:copy todir="${bin.dist.dir}/licenses" flatten="true">
+ <ant:fileset dir="licenses">
+ <ant:include name="*.txt"/>
+ </ant:fileset>
+ </ant:copy>
<ant:copy file="bin/synapse.sh"
tofile="${bin.dist.dir}/bin/synapse.sh"/>
<ant:copy file="bin/synapse.bat"
tofile="${bin.dist.dir}/bin/synapse.bat"/>
<ant:copy file="README.txt"
tofile="${bin.dist.dir}/README.txt"/>
+ <ant:copy file="NOTICE.txt"
+ tofile="${bin.dist.dir}/NOTICE.txt"/>
+ <ant:copy file="LICENSE.txt"
+ tofile="${bin.dist.dir}/LICENSE.txt"/>
+
<ant:copy file="modules/core/conf/log4j.properties"
tofile="${bin.dist.dir}/log4j.properties"/>
@@ -395,6 +467,7 @@
basedir="target/temp"/>
<ant:delete dir="target/temp"/>
+ <ant:delete dir="target/temp1"/>
<ant:delete dir="target/dist-bin"/>
</goal>
@@ -610,6 +683,7 @@
<ant:exclude name="**/*.log"/>
<ant:exclude name=".*"/>
<ant:exclude name="**/*.license"/>
+ <ant:exclude name="**/NOTICE-JAR.txt"/>
</ant:fileset>
</ant:copy>
@@ -675,7 +749,7 @@
</ant:copy>
- <ant:zip file="${dist.dir}/Extensions-Synapse-${pom.currentVersion}-bin.zip"
+ <ant:zip file="${dist.dir}/${dist.name}-extensions-${pom.currentVersion}-bin.zip"
basedir="target/temp"/>
<ant:delete dir="target/temp"/>
Modified: incubator/synapse/trunk/java/modules/extensions/maven.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/maven.xml?rev=410859&r1=410858&r2=410859&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/maven.xml (original)
+++ incubator/synapse/trunk/java/modules/extensions/maven.xml Thu Jun 1 05:47:25 2006
@@ -43,10 +43,29 @@
<ant:fileset dir="src/META-INF">
<ant:include name="**/**"/>
</ant:fileset>
+ <ant:fileset file="../../LICENSE.txt"/>
+
</ant:copy>
+ <ant:copy file="../../NOTICE-JAR.txt"
+ tofile="src/META-INF/NOTICE.txt"/>
+
+ <manifest file="MANIFEST.MF">
+ <attribute name="Extension-Name" value="org.apache.synapse"/>
+ <attribute name="Specification-Title" value="${pom.artifactId}"/>
+ <attribute name="Specification-Vendor"
+ value="Apache Software Foundation"/>
+ <attribute name="Specification-Version"
+ value="${pom.currentVersion}"/>
+ <attribute name="Implementation-Title" value="Apache Synapse"/>
+ <attribute name="Implementation-Vendor-Id" value="org.apache"/>
+ <attribute name="Implementation-Vendor"
+ value="Apache Software Foundation"/>
+ <attribute name="Implementation-Version"
+ value="${pom.currentVersion}"/>
+ </manifest>
<jar jarfile="target/dist/extension_mediators.jar"
- basedir="${extensions.dir}">
+ basedir="${extensions.dir}" manifest="MANIFEST.MF">
<include name="**/**"/>
</jar>
<ant:delete dir="${extensions.dir}"/>
Added: incubator/synapse/trunk/java/modules/extensions/src/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/META-INF/NOTICE.txt?rev=410859&view=auto
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/META-INF/NOTICE.txt (added)
+++ incubator/synapse/trunk/java/modules/extensions/src/META-INF/NOTICE.txt Thu Jun 1 05:47:25 2006
@@ -0,0 +1,9 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Synapse distribution. ==
+ =========================================================================
+
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
Modified: incubator/synapse/trunk/java/project.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/project.xml?rev=410859&r1=410858&r2=410859&view=diff
==============================================================================
--- incubator/synapse/trunk/java/project.xml (original)
+++ incubator/synapse/trunk/java/project.xml Thu Jun 1 05:47:25 2006
@@ -3,6 +3,6 @@
<project>
<pomVersion>3</pomVersion>
<extend>etc/project.xml</extend>
- <id>Synapse-Incubating</id>
+ <id>Apache-Synapse-Incubating</id>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org