You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/07/31 21:14:42 UTC
svn commit: r561445 - in /webservices/axis2/trunk/java: legal/
modules/distribution/ modules/distribution/src/main/assembly/
modules/documentation/src/site/ modules/documentation/xdocs/
modules/kernel/src/org/apache/axis2/transport/ modules/parent/ mod...
Author: dims
Date: Tue Jul 31 12:14:41 2007
New Revision: 561445
URL: http://svn.apache.org/viewvc?view=rev&rev=561445
Log:
Sync changes from 1.3 branch
Added:
webservices/axis2/trunk/java/modules/distribution/src/main/assembly/doc-assembly.xml
Removed:
webservices/axis2/trunk/java/legal/geronimo-activation-LICENSE.txt
webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/loggingmodule/META-INF/MANIFEST.MF
Modified:
webservices/axis2/trunk/java/modules/distribution/pom.xml
webservices/axis2/trunk/java/modules/documentation/src/site/site.xml
webservices/axis2/trunk/java/modules/documentation/xdocs/index.xml
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/SimpleAxis2Server.java
webservices/axis2/trunk/java/modules/parent/pom.xml
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/pom.xml
webservices/axis2/trunk/java/modules/webapp/scripts/build.xml
Modified: webservices/axis2/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/pom.xml?view=diff&rev=561445&r1=561444&r2=561445
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/pom.xml Tue Jul 31 12:14:41 2007
@@ -228,6 +228,7 @@
<descriptor>src/main/assembly/war-assembly.xml</descriptor>
<descriptor>src/main/assembly/src-assembly.xml</descriptor>
<descriptor>src/main/assembly/bin-assembly.xml</descriptor>
+ <descriptor>src/main/assembly/doc-assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
@@ -240,6 +241,34 @@
<version>1.1</version>
<inherited>false</inherited>
<executions>
+ <execution>
+ <id>package</id>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <!-- TODO : filtering is not working -->
+ <filter filtersfile="../../modules/documentation/xdocs/dynamic-labels.properties" />
+ <copy todir="target/xdocs" filtering="on">
+ <fileset dir="../../modules/documentation/xdocs">
+ <exclude name="**/*.gif"/>
+ <exclude name="**/*.jpg"/>
+ <exclude name="**/*.png"/>
+ </fileset>
+ </copy>
+ <!-- copy images without filtering -->
+ <copy todir="target/xdocs" >
+ <fileset dir="../../modules/documentation/xdocs">
+ <include name="**/*.gif"/>
+ <include name="**/*.jpg"/>
+ <include name="**/*.png"/>
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
<execution>
<id>service-module-list-generation</id>
<phase>package</phase>
Added: webservices/axis2/trunk/java/modules/distribution/src/main/assembly/doc-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/src/main/assembly/doc-assembly.xml?view=auto&rev=561445
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/src/main/assembly/doc-assembly.xml (added)
+++ webservices/axis2/trunk/java/modules/distribution/src/main/assembly/doc-assembly.xml Tue Jul 31 12:14:41 2007
@@ -0,0 +1,35 @@
+<assembly>
+ <id>docs</id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>axis2-${version}</baseDirectory>
+ <formats>
+ <!--<format>tar.gz</format> //uncomment,if tar.gz archive needed-->
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/xdocs</directory>
+ <outputDirectory>docs/xdocs</outputDirectory>
+ <excludes>
+ <exclude>.svn/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../../modules/documentation/target/apidocs</directory>
+ <outputDirectory>docs/javadocs</outputDirectory>
+ <excludes>
+ <exclude>.svn/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../..</directory>
+ <outputDirectory>docs</outputDirectory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>README.txt</include>
+ <include>release-notes.html</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Modified: webservices/axis2/trunk/java/modules/documentation/src/site/site.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/documentation/src/site/site.xml?view=diff&rev=561445&r1=561444&r2=561445
==============================================================================
--- webservices/axis2/trunk/java/modules/documentation/src/site/site.xml (original)
+++ webservices/axis2/trunk/java/modules/documentation/src/site/site.xml Tue Jul 31 12:14:41 2007
@@ -25,7 +25,7 @@
<item name="Tools" href="tools/index.html" />
</menu>
<menu name="Documentation">
- <item name="Version 1.2" href="/@axis2_version_dir@/contents.html" >
+ <item name="Version 1.3" href="/@axis2_version_dir@/contents.html" >
<item name="Table of Contents" href="@axis2_version_dir@/toc.html" />
<item name="Installation Guide" href="@axis2_version_dir@/installationguide.html" />
<item name="QuickStart Guide" href="@axis2_version_dir@/quickstartguide.html" />
@@ -35,6 +35,7 @@
<item name="Web Administrator's Guide" href="@axis2_version_dir@/webadminguide.html" />
<item name="Migration Guide (from Axis1)" href="@axis2_version_dir@/migration.html" />
</item>
+ <item name="Version 1.2" href="/1_2/contents.html" />
<item name="Version 1.1.1" href="/1_1_1/contents.html" />
<item name="Version 1.1" href="/1_1/contents.html" />
<item name="Version 1.0" href="/1_0/index.html" />
Modified: webservices/axis2/trunk/java/modules/documentation/xdocs/index.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/documentation/xdocs/index.xml?view=diff&rev=561445&r1=561444&r2=561445
==============================================================================
--- webservices/axis2/trunk/java/modules/documentation/xdocs/index.xml (original)
+++ webservices/axis2/trunk/java/modules/documentation/xdocs/index.xml Tue Jul 31 12:14:41 2007
@@ -36,7 +36,7 @@
here, you can visit the <a href=
"http://ws.apache.org/axis2/c/"><strong>Apache Axis2/C</strong></a>
Web site for Axis2/C implementation information.</p>
-<h2>27th April 2007 - Apache Axis2/Java Version 1.2 Released!</h2>
+<h2>03rd August 2007 - Apache Axis2/Java Version 1.3 Released!</h2>
<p>[ <a href=
"http://ws.apache.org/axis2/download.cgi"><strong>Download</strong></a>
] | [ <a href="1_2/index.html"><strong>Documents Home</strong></a>
@@ -214,8 +214,8 @@
"mailto:axis-user@ws.apache.org">axis-user@ws.apache.org</a>". Make
sure to prefix the subject of the mail with [Axis2].</p>
<h2>Features of Axis2 Latest Version</h2>
-<p>Apache Axis2 Version 1.2 comes with performance improvements and
-bug fixes over the 1.1.1 release. Check out the complete list of
+<p>Apache Axis2 Version 1.3 comes with performance improvements and
+a number bug fixes over the 1.2 release. Check out the complete list of
features below.</p>
<h3>Programming Model</h3>
<ul>
@@ -303,15 +303,6 @@
(Apache Axis2 comes built in with a module that supports
WS-Addressing.)
<h2>Known Issues and Limitations</h2>
-<ul>
-<li>Xml-beans databinding does not support response unwrapping</li>
-<li>ADB databinding does not support minOccurs and maxOccurs
-attributes in sequence and choice elements (i.e.,
-<code><sequence minOccurs="0"
-maxOccurs="unbounded"></sequence></code>)</li>
-<li>Unable to produce original WSDL in the case of WSDL 2.0,
-therefore the AxisService is serialized to produce ?wsdl2.</li>
-</ul>
<h2>Archived News</h2>
<p>For information on previous Axis2 releases running up to the
current release see the <a href="archived_news.html" target=
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/SimpleAxis2Server.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/SimpleAxis2Server.java?view=diff&rev=561445&r1=561444&r2=561445
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/SimpleAxis2Server.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/SimpleAxis2Server.java Tue Jul 31 12:14:41 2007
@@ -105,7 +105,6 @@
} catch (Throwable t) {
log.fatal("[SimpleAxisServer] Shutting down. Error starting SimpleAxisServer", t);
System.err.println("[SimpleAxisServer] Shutting down. Error starting SimpleAxisServer");
- t.printStackTrace(System.out);
}
}
Modified: webservices/axis2/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?view=diff&rev=561445&r1=561444&r2=561445
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Tue Jul 31 12:14:41 2007
@@ -236,6 +236,18 @@
<organization>WSO2</organization>
</developer>
<developer>
+ <name>Sumedha Rubasinghe</name>
+ <id>sumedha</id>
+ <email>sumedha AT WSO2.com</email>
+ <organization>WSO2</organization>
+ </developer>
+ <developer>
+ <name>Charitha Kamkanamge</name>
+ <id>charitha</id>
+ <email>charitha AT WSO2.com</email>
+ <organization>WSO2</organization>
+ </developer>
+ <developer>
<name>Srinath Perera</name>
<id>hemapani</id>
<email>hemapani AT apache.org</email>
@@ -346,6 +358,13 @@
<email/>
<organization>Lanka Software Foundation / University of Moratuwa</organization>
</contributor>
+
+<contributor>
+ <name>Shivantha Huruggamuwa</name>
+ <email>shivanthah AT gmail.com</email>
+ <organization>University Of Peradeniya , Sri Lanaka</organization>
+ </contributor>
+
</contributors>
<repositories>
<!--
Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?view=diff&rev=561445&r1=561444&r2=561445
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Tue Jul 31 12:14:41 2007
@@ -305,7 +305,6 @@
<unzip src="./target/axis2.eclipse.codegen.plugin-${pom.version}.jar" dest="./target/plugin/${codegen.plugin.version}"/>
<!-- Copy to the same position with the filtering on-->
- <!-- Copy to the same position with the filtering on-->
<copy todir="./target/plugin/${codegen.plugin.version}" filtering="on">
<fileset dir="${codegen.resource.dir}">
<include name="plugin.xml"/>
@@ -327,6 +326,14 @@
<copy todir="./target/plugin/${codegen.plugin.version}/${icons.dir.name}">
<fileset dir="${codegen.resource.dir}/${icons.dir.name}"/>
</copy>
+ <!-- copy the lib files -->
+ <mkdir dir="./target/plugin/temp"/>
+ <unzip src="./target/dist-axis2-eclipse-codege-plugin.zip" dest="./target/plugin/temp"/>
+ <mkdir dir="./target/plugin/${codegen.plugin.version}/lib"/>
+ <copy todir="./target/plugin/${codegen.plugin.version}/lib">
+ <fileset dir="./target/plugin/temp/lib"/>
+ </copy>
+ <delete dir="./target/plugin/temp"/>
<!-- copy the other project files-->
<copy todir="./target/plugin/${codegen.plugin.version}">
<fileset file="${codegen.resource.dir}/${plugin.project.file.name}"/>
Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml?view=diff&rev=561445&r1=561444&r2=561445
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml Tue Jul 31 12:14:41 2007
@@ -17,7 +17,7 @@
~ under the License.
-->
<assembly>
- <id>axis2-service-codege-plugin</id>
+ <id>axis2-eclipse-service-plugin</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/pom.xml?view=diff&rev=561445&r1=561444&r2=561445
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/pom.xml Tue Jul 31 12:14:41 2007
@@ -233,7 +233,7 @@
<filter token="version_number" value="${version_number}"/>
<filter token="ant.version" value="${ant.version}"/>
<filter token="commons.logging.version" value="${commons.logging.version}"/>
- <filter token="log4j.version" value="1.2.14"/>
+ <filter token="log4j.version" value="${log4j.version}"/>
<delete dir="./target/plugin/${service.plugin.version}"/>
<mkdir dir="./target/plugin/${service.plugin.version}"/>
<delete dir="./target/dist"/>
@@ -261,6 +261,15 @@
<copy todir="./target/plugin/${service.plugin.version}/${icons.dir.name}">
<fileset dir="${service.resource.dir}/${icons.dir.name}"/>
</copy>
+ <!-- copy the lib files -->
+ <mkdir dir="./target/plugin/temp"/>
+ <unzip src="./target/dist-axis2-eclipse-service-plugin.zip" dest="./target/plugin/temp"/>
+ <mkdir dir="./target/plugin/${service.plugin.version}/lib"/>
+ <copy todir="./target/plugin/${service.plugin.version}/lib">
+ <fileset dir="./target/plugin/temp/lib"/>
+ </copy>
+ <delete dir="./target/plugin/temp"/>
+
<!-- copy the other project files-->
<copy todir="./target/plugin/${service.plugin.version}">
<fileset file="${service.resource.dir}/${plugin.project.file.name}"/>
Modified: webservices/axis2/trunk/java/modules/webapp/scripts/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/scripts/build.xml?view=diff&rev=561445&r1=561444&r2=561445
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/scripts/build.xml (original)
+++ webservices/axis2/trunk/java/modules/webapp/scripts/build.xml Tue Jul 31 12:14:41 2007
@@ -73,6 +73,9 @@
<include name="**" />
<exclude name="**servlet**" />
<exclude name="ant*.jar" />
+ <exclude name="axis2-adb-codegen*.jar"/>
+ <exclude name="axis2-codegen*.jar"/>
+ <exclude name="jibx-bind*.jar"/>
</lib>
<webinf dir="${temp}/WEB-INF" />
<fileset dir="${temp}">
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org