Author: asankha
Date: Wed Nov 22 00:30:27 2006
New Revision: 478086
URL: http://svn.apache.org/viewvc?view=rev&rev=478086
Log:
implement some of the suggestions by Ant, to improve the release
remove unused dependencies and limit the others to test/compile alone
fix creation of logs directories during unit test execution
update BUILDING.txt and remove it from bin dist
Added:
incubator/synapse/trunk/java/modules/extensions/src/test/resources/
incubator/synapse/trunk/java/modules/extensions/src/test/resources/log4j.properties
Modified:
incubator/synapse/trunk/java/modules/core/pom.xml
incubator/synapse/trunk/java/modules/core/src/test/resources/log4j.properties
incubator/synapse/trunk/java/modules/extensions/pom.xml
incubator/synapse/trunk/java/modules/mar/pom.xml
incubator/synapse/trunk/java/pom.xml
incubator/synapse/trunk/java/src/main/assembly/bin.xml
incubator/synapse/trunk/java/src/main/assembly/src.xml
incubator/synapse/trunk/java/src/main/release/BUILDING.txt
incubator/synapse/trunk/java/src/site/resources/Synapse_Samples.html
Modified: incubator/synapse/trunk/java/modules/core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/pom.xml?view=diff&rev=478086&r1=478085&r2=478086
==============================================================================
--- incubator/synapse/trunk/java/modules/core/pom.xml (original)
+++ incubator/synapse/trunk/java/modules/core/pom.xml Wed Nov 22 00:30:27 2006
@@ -67,7 +67,9 @@
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<executions>
<execution>
<id>create_repo</id>
Modified:
incubator/synapse/trunk/java/modules/core/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/test/resources/log4j.properties?view=diff&rev=478086&r1=478085&r2=478086
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/test/resources/log4j.properties
(original)
+++
incubator/synapse/trunk/java/modules/core/src/test/resources/log4j.properties
Wed Nov 22 00:30:27 2006
@@ -30,7 +30,7 @@
#### appender writes to a file
log4j.appender.logfile=org.apache.log4j.RollingFileAppender
-log4j.appender.logfile.File=logs/logfile.log
+log4j.appender.logfile.File=target/logs/logfile.log
# Control the maximum log file size
Modified: incubator/synapse/trunk/java/modules/extensions/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/pom.xml?view=diff&rev=478086&r1=478085&r2=478086
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/pom.xml (original)
+++ incubator/synapse/trunk/java/modules/extensions/pom.xml Wed Nov 22 00:30:27
2006
@@ -42,6 +42,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.2</version>
<configuration>
<systemProperties>
<property>
Added:
incubator/synapse/trunk/java/modules/extensions/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/test/resources/log4j.properties?view=auto&rev=478086
==============================================================================
---
incubator/synapse/trunk/java/modules/extensions/src/test/resources/log4j.properties
(added)
+++
incubator/synapse/trunk/java/modules/extensions/src/test/resources/log4j.properties
Wed Nov 22 00:30:27 2006
@@ -0,0 +1,42 @@
+#
+# 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.
+#
+
+log4j.rootCategory=ERROR,logfile
+
+# Set the level to DEBUG if you want to log all Exceptions (some of them
aren't errors)
+#log4j.category.org.apache.axis2=INFO
+log4j.category.org.apache.synapse=INFO
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.stdout.layout.ConversionPattern=[%t] %-5p %C{1} - %m %n
+
+#### appender writes to a file
+log4j.appender.logfile=org.apache.log4j.RollingFileAppender
+log4j.appender.logfile.File=target/logs/logfile.log
+
+
+# Control the maximum log file size
+log4j.appender.logfile.MaxFileSize=1000KB
+# Archive log files (one backup file here)
+log4j.appender.logfile.MaxBackupIndex=10
+
+log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
+log4j.appender.logfile.layout.ConversionPattern=%6r [%t] %5p %C{1} (%F:%L) -
%m%n
\ No newline at end of file
Modified: incubator/synapse/trunk/java/modules/mar/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/mar/pom.xml?view=diff&rev=478086&r1=478085&r2=478086
==============================================================================
--- incubator/synapse/trunk/java/modules/mar/pom.xml (original)
+++ incubator/synapse/trunk/java/modules/mar/pom.xml Wed Nov 22 00:30:27 2006
@@ -41,7 +41,9 @@
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<executions>
<execution>
<id>mar</id>
@@ -61,6 +63,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<id>mar</id>
Modified: incubator/synapse/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/pom.xml?view=diff&rev=478086&r1=478085&r2=478086
==============================================================================
--- incubator/synapse/trunk/java/pom.xml (original)
+++ incubator/synapse/trunk/java/pom.xml Wed Nov 22 00:30:27 2006
@@ -87,6 +87,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.1</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
@@ -103,6 +104,7 @@
<!---->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.1</version>
<executions>
<execution>
<goals>
@@ -145,6 +147,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
<configuration>
<archive>
<manifestEntries>
@@ -224,30 +227,10 @@
<!-- core Axis2 -->
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
+ <artifactId>axis2</artifactId>
<version>${axis2.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-adb</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-adb-codegen</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-codegen</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-java2wsdl</artifactId>
- <version>${axis2.version}</version>
- </dependency>
-
+
<!-- core Axiom -->
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
@@ -370,6 +353,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>jaxen</groupId>
@@ -383,29 +367,28 @@
<version>${wsdl4j.version}</version>
</dependency>
<dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>${commons.fileupload.version}</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${servletapi.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-javamail</artifactId>
<version>${geronimo.spec.javamail.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-activation</artifactId>
<version>${geronimo.spec.activation.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jms</artifactId>
<version>${geronimo.spec.jms.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>annogen</groupId>
@@ -431,6 +414,7 @@
<plugin>
<inherited>false</inherited>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.1</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
@@ -460,6 +444,7 @@
<!--</plugin>-->
<plugin>
<artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-5</version>
<inherited>false</inherited>
</plugin>
</plugins>
Modified: incubator/synapse/trunk/java/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/src/main/assembly/bin.xml?view=diff&rev=478086&r1=478085&r2=478086
==============================================================================
--- incubator/synapse/trunk/java/src/main/assembly/bin.xml (original)
+++ incubator/synapse/trunk/java/src/main/assembly/bin.xml Wed Nov 22 00:30:27
2006
@@ -34,8 +34,6 @@
<include>LICENSE</include>
<include>NOTICE</include>
<include>README.txt</include>
- <include>BUILDING.txt</include>
- <include>licenses/*.*</include>
</includes>
</fileSet>
<fileSet>
Modified: incubator/synapse/trunk/java/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/src/main/assembly/src.xml?view=diff&rev=478086&r1=478085&r2=478086
==============================================================================
--- incubator/synapse/trunk/java/src/main/assembly/src.xml (original)
+++ incubator/synapse/trunk/java/src/main/assembly/src.xml Wed Nov 22 00:30:27
2006
@@ -36,7 +36,6 @@
<include>NOTICE</include>
<include>README.txt</include>
<include>BUILDING.txt</include>
- <include>licenses/*.*</include>
</includes>
</fileSet>
<fileSet>
@@ -58,6 +57,8 @@
<exclude>**/.project</exclude>
<exclude>**/.wtpmodules</exclude>
<exclude>**/*.iml</exclude>
+ <exclude>**/.settings</exclude>
+ <exclude>**/.settings/**/*</exclude>
</excludes>
</fileSet>
</fileSets>
Modified: incubator/synapse/trunk/java/src/main/release/BUILDING.txt
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/src/main/release/BUILDING.txt?view=diff&rev=478086&r1=478085&r2=478086
==============================================================================
--- incubator/synapse/trunk/java/src/main/release/BUILDING.txt (original)
+++ incubator/synapse/trunk/java/src/main/release/BUILDING.txt Wed Nov 22
00:30:27 2006
@@ -2,31 +2,21 @@
The Synapse source code is available at
http://svn.apache.org/viewcvs.cgi/incubator/synapse/trunk/java/
-To build Synapse, you will need JDK 1.4.x or 1.5.x., Maven and any of its
dependencies.
+To build Synapse, you will need JDK 1.4.x or 1.5.x., Maven 2 and any of its
dependencies.
-The Synapse distribution could be built with the maven target "dist-bin" as
follows:
+The Synapse JARs could be built with maven 2 as follows:
-maven clean dist-bin
+mvn clean install
-The binary would be available at target\dist
+Note: If you encounter any issues with Maven 2 complaining of invalid POMs
refer to this ->
+http://www.nabble.com/forum/ViewPost.jtp?post=7437760&framed=y
-Build the extensions after you perform a "dist-bin" and perform it using the
"dist-extensions" target
-without specifying "clean", as follows:
+To build the Synapse assembly, use the following:
-maven dist-extensions
+mvn assembly:assembly -Drelease
-The binary would be available at target\dist
+This would build the source and binary distributions in the target folder.
-Note:
+To build the site, use:
-As the build process executes the unit test cases, you will need to set up
your build environment to
-support the extensions.
-
-The Validate mediator depends on the Xerces 2.8.0 parser, and this should be
installed into your
-JAVA/lib/endorsed directory.
-(e.g. C:\jdk1.5.0_06\jre\lib\endorsed and may not be to
C:\jdk1.5.0_06\lib\endorsed if you have the JRE)
-
-You will need the xml-apis.jar, and the xercesImpl.jar copied to the
lib\endorsed directory at a mimimum.
-
-You may optionally ignore unit test failures with the
"maven.test.failure.ignore" property. Refer to
-http://maven.apache.org/maven-1.x/plugins/test/properties.html for more
information.
\ No newline at end of file
+mvn site
Modified: incubator/synapse/trunk/java/src/site/resources/Synapse_Samples.html
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/src/site/resources/Synapse_Samples.html?view=diff&rev=478086&r1=478085&r2=478086
==============================================================================
--- incubator/synapse/trunk/java/src/site/resources/Synapse_Samples.html
(original)
+++ incubator/synapse/trunk/java/src/site/resources/Synapse_Samples.html Wed
Nov 22 00:30:27 2006
@@ -651,7 +651,7 @@
the Axis2 documentation on setting up JMS for more details
(http://ws.apache.org/axis2/1_1/jms-transport.html). You will also need to
copy the ActiveMQ client jar files activeio-core-3.0-beta1.jar,
-activemq-core-4.0-RC2.jar and geronimo-j2ee-management_1.0_spec-1.0.jar into
+activemq-core-4.0-RC2.jar, geronimo-jms_1.1_spec-1.0.jar and
geronimo-j2ee-management_1.0_spec-1.0.jar into
the lib directory to allow Synapse to connect to the JMS provider.</p>
<p>For a default ActiveMQ v4.0 installation, you may uncomment the Axis2
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
