svn commit: r1383043 - /axis/axis2/java/core/trunk/src/site/xdoc/release-process.xml
Author: veithen Date: Mon Sep 10 18:57:53 2012 New Revision: 1383043 URL: http://svn.apache.org/viewvc?rev=1383043&view=rev Log: Updated release process to reflect the migration to svnpubsub. Modified: axis/axis2/java/core/trunk/src/site/xdoc/release-process.xml Modified: axis/axis2/java/core/trunk/src/site/xdoc/release-process.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/src/site/xdoc/release-process.xml?rev=1383043&r1=1383042&r2=1383043&view=diff == --- axis/axis2/java/core/trunk/src/site/xdoc/release-process.xml (original) +++ axis/axis2/java/core/trunk/src/site/xdoc/release-process.xml Mon Sep 10 18:57:53 2012 @@ -204,17 +204,14 @@ folder and you only need to copy the X.Y.Z folder to the right location. Please execute the copy with umask 0002 and check that the files and directories have the right permissions (write access for the axis group). -Check out the current Axis2 site from https://svn.apache.org/repos/asf/axis/axis2/java/core/site/";>https://svn.apache.org/repos/asf/axis/axis2/java/core/site/ +Check out the current Axis2 site from https://svn.apache.org/repos/asf/axis/site/axis2/java/core/";>https://svn.apache.org/repos/asf/axis/site/axis2/java/core/ and synchronize it with the site for the new release. The site should have been generated during the release build and can be found in the target/checkout/target/site. Alternatively you can check out the release tag and rebuild the site using mvn site, or extract it from the documents distribution. Axiom has a script (see etc/syncsite.py) that can be used to synchronize the site in Subversion. It takes care of executing the relevant svn add -and svn remove commands on the local working copy of the site. -Login to people.apache.org and update the local working copy of the site: -umask 0002 -cd /www/axis.apache.org/axis2/java/core -svn update +and svn remove commands on the local working copy of the site. +The live Web site is updated automatically by svnpubsub once the changes have been committed to SVN. It may take several hours before everything has been synchronized. Before proceeding, check that
svn commit: r1383046 - in /axis/axis2/java/core/branches/1_6: ./ modules/saaj/ src/site/xdoc/release-process.xml
Author: veithen Date: Mon Sep 10 18:59:51 2012 New Revision: 1383046 URL: http://svn.apache.org/viewvc?rev=1383046&view=rev Log: Merged r1383043 to the 1.6 branch for publication with 1.6.3. Modified: axis/axis2/java/core/branches/1_6/ (props changed) axis/axis2/java/core/branches/1_6/modules/saaj/ (props changed) axis/axis2/java/core/branches/1_6/src/site/xdoc/release-process.xml Propchange: axis/axis2/java/core/branches/1_6/ -- Merged /axis/axis2/java/core/trunk:r1383043 Propchange: axis/axis2/java/core/branches/1_6/modules/saaj/ -- Merged /axis/axis2/java/core/trunk/modules/saaj:r1383043 Modified: axis/axis2/java/core/branches/1_6/src/site/xdoc/release-process.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/src/site/xdoc/release-process.xml?rev=1383046&r1=1383045&r2=1383046&view=diff == --- axis/axis2/java/core/branches/1_6/src/site/xdoc/release-process.xml (original) +++ axis/axis2/java/core/branches/1_6/src/site/xdoc/release-process.xml Mon Sep 10 18:59:51 2012 @@ -204,17 +204,14 @@ folder and you only need to copy the X.Y.Z folder to the right location. Please execute the copy with umask 0002 and check that the files and directories have the right permissions (write access for the axis group). -Check out the current Axis2 site from https://svn.apache.org/repos/asf/axis/axis2/java/core/site/";>https://svn.apache.org/repos/asf/axis/axis2/java/core/site/ +Check out the current Axis2 site from https://svn.apache.org/repos/asf/axis/site/axis2/java/core/";>https://svn.apache.org/repos/asf/axis/site/axis2/java/core/ and synchronize it with the site for the new release. The site should have been generated during the release build and can be found in the target/checkout/target/site. Alternatively you can check out the release tag and rebuild the site using mvn site, or extract it from the documents distribution. Axiom has a script (see etc/syncsite.py) that can be used to synchronize the site in Subversion. It takes care of executing the relevant svn add -and svn remove commands on the local working copy of the site. -Login to people.apache.org and update the local working copy of the site: -umask 0002 -cd /www/axis.apache.org/axis2/java/core -svn update +and svn remove commands on the local working copy of the site. +The live Web site is updated automatically by svnpubsub once the changes have been committed to SVN. It may take several hours before everything has been synchronized. Before proceeding, check that
svn commit: r1383051 - in /axis/axis2/java/core/branches/1_6: ./ modules/saaj/ src/site/resources/images/axis.jpg
Author: veithen Date: Mon Sep 10 19:04:46 2012 New Revision: 1383051 URL: http://svn.apache.org/viewvc?rev=1383051&view=rev Log: Merged r1372622 (addition of TM to the logo) to the 1.6 branch so that we don't loose that change again when we publish the site for 1.6.3. Modified: axis/axis2/java/core/branches/1_6/ (props changed) axis/axis2/java/core/branches/1_6/modules/saaj/ (props changed) axis/axis2/java/core/branches/1_6/src/site/resources/images/axis.jpg Propchange: axis/axis2/java/core/branches/1_6/ -- Merged /axis/axis2/java/core/trunk:r1372622 Propchange: axis/axis2/java/core/branches/1_6/modules/saaj/ -- Merged /axis/axis2/java/core/trunk/modules/saaj:r1372622 Modified: axis/axis2/java/core/branches/1_6/src/site/resources/images/axis.jpg URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/src/site/resources/images/axis.jpg?rev=1383051&r1=1383050&r2=1383051&view=diff == Binary files - no diff available.
svn commit: r1383056 - in /axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images: axis.jpg axis.png
Author: veithen Date: Mon Sep 10 19:09:01 2012 New Revision: 1383056 URL: http://svn.apache.org/viewvc?rev=1383056&view=rev Log: Removed two image files (logos) that are not used (and that are missing the TM). Removed: axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/axis.jpg axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/axis.png
svn commit: r1383060 - /axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/apache-rampart-logo.jpg
Author: veithen Date: Mon Sep 10 19:15:13 2012 New Revision: 1383060 URL: http://svn.apache.org/viewvc?rev=1383060&view=rev Log: Added TM to the Rampart logo. Modified: axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/apache-rampart-logo.jpg Modified: axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/apache-rampart-logo.jpg URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/apache-rampart-logo.jpg?rev=1383060&r1=1383059&r2=1383060&view=diff == Binary files - no diff available.
svn commit: r1383062 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
Author: veithen
Date: Mon Sep 10 19:17:08 2012
New Revision: 1383062
URL: http://svn.apache.org/viewvc?rev=1383062&view=rev
Log:
Merged r1338876 to the 1.6 branch to ensure that Rampart 1.6.x can be built
with Axiom 1.2.14.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
Propchange: axis/axis2/java/rampart/branches/1_6/
--
Merged /axis/axis2/java/rampart/trunk:r1338876
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java?rev=1383062&r1=1383061&r2=1383062&view=diff
==
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
Mon Sep 10 19:17:08 2012
@@ -129,7 +129,7 @@ public class RampartTest extends TestCas
if (i == 31) {
OMNamespace omNamespace =
OMAbstractFactory.getOMFactory().createOMNamespace(
"http://sample.com";, "myNs");
-SOAPHeaderBlock header =
OMAbstractFactory.getSOAP12Factory()
+SOAPHeaderBlock header =
OMAbstractFactory.getSOAP11Factory()
.createSOAPHeaderBlock("VitalHeader", omNamespace);
header.addChild(AXIOMUtil.stringToOM("This is a
sample Header"));
serviceClient.addHeader(header);
svn commit: r1383063 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/documentation/src/site/resources/images/apache-rampart-logo.jpg
Author: veithen Date: Mon Sep 10 19:18:30 2012 New Revision: 1383063 URL: http://svn.apache.org/viewvc?rev=1383063&view=rev Log: Merged r1383060 (addition of TM to logo) to the 1.6 branch for publication with Rampart 1.6.3. Modified: axis/axis2/java/rampart/branches/1_6/ (props changed) axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/images/apache-rampart-logo.jpg Propchange: axis/axis2/java/rampart/branches/1_6/ -- Merged /axis/axis2/java/rampart/trunk:r1383060 Modified: axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/images/apache-rampart-logo.jpg URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/images/apache-rampart-logo.jpg?rev=1383063&r1=1383062&r2=1383063&view=diff == Binary files - no diff available.
svn commit: r1383068 - /axis/site/axis2/java/rampart/images/apache-rampart-logo.jpg
Author: veithen Date: Mon Sep 10 19:22:35 2012 New Revision: 1383068 URL: http://svn.apache.org/viewvc?rev=1383068&view=rev Log: Merged r1383060 (addition of TM to logo) to the live site. Modified: axis/site/axis2/java/rampart/images/apache-rampart-logo.jpg (contents, props changed) Modified: axis/site/axis2/java/rampart/images/apache-rampart-logo.jpg URL: http://svn.apache.org/viewvc/axis/site/axis2/java/rampart/images/apache-rampart-logo.jpg?rev=1383068&r1=1383067&r2=1383068&view=diff == Binary files - no diff available. Propchange: axis/site/axis2/java/rampart/images/apache-rampart-logo.jpg -- --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Sep 10 19:22:35 2012 @@ -0,0 +1 @@ +/axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/apache-rampart-logo.jpg:1383060
svn commit: r1383074 - /axis/axis2/java/sandesha/trunk/src/site/resources/images/Sandesha.jpg
Author: veithen Date: Mon Sep 10 19:32:39 2012 New Revision: 1383074 URL: http://svn.apache.org/viewvc?rev=1383074&view=rev Log: Added TM to the Sandesha logo. Modified: axis/axis2/java/sandesha/trunk/src/site/resources/images/Sandesha.jpg Modified: axis/axis2/java/sandesha/trunk/src/site/resources/images/Sandesha.jpg URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/src/site/resources/images/Sandesha.jpg?rev=1383074&r1=1383073&r2=1383074&view=diff == Binary files - no diff available.
svn commit: r1383075 - in /axis/axis2/java/sandesha/branches/1_6: ./ src/site/resources/images/Sandesha.jpg
Author: veithen Date: Mon Sep 10 19:35:32 2012 New Revision: 1383075 URL: http://svn.apache.org/viewvc?rev=1383075&view=rev Log: Merged r1383074 (addition of TM to logo) to the 1.6 branch for publication with Sandesha2 1.6.3. Modified: axis/axis2/java/sandesha/branches/1_6/ (props changed) axis/axis2/java/sandesha/branches/1_6/src/site/resources/images/Sandesha.jpg Propchange: axis/axis2/java/sandesha/branches/1_6/ -- Merged /axis/axis2/java/sandesha/trunk:r1383074 Modified: axis/axis2/java/sandesha/branches/1_6/src/site/resources/images/Sandesha.jpg URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/src/site/resources/images/Sandesha.jpg?rev=1383075&r1=1383074&r2=1383075&view=diff == Binary files - no diff available.
svn commit: r1383076 - /axis/site/axis2/java/sandesha/images/Sandesha.jpg
Author: veithen Date: Mon Sep 10 19:37:38 2012 New Revision: 1383076 URL: http://svn.apache.org/viewvc?rev=1383076&view=rev Log: Merged r1383074 (addition of TM to logo) to the live site. Modified: axis/site/axis2/java/sandesha/images/Sandesha.jpg (contents, props changed) Modified: axis/site/axis2/java/sandesha/images/Sandesha.jpg URL: http://svn.apache.org/viewvc/axis/site/axis2/java/sandesha/images/Sandesha.jpg?rev=1383076&r1=1383075&r2=1383076&view=diff == Binary files - no diff available. Propchange: axis/site/axis2/java/sandesha/images/Sandesha.jpg -- --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Sep 10 19:37:38 2012 @@ -0,0 +1 @@ +/axis/axis2/java/sandesha/trunk/src/site/resources/images/Sandesha.jpg:1383074
svn commit: r1383094 - /axis/axis1/java/trunk/axis/pom.xml
Author: veithen
Date: Mon Sep 10 20:04:07 2012
New Revision: 1383094
URL: http://svn.apache.org/viewvc?rev=1383094&view=rev
Log:
AXIS-2875: Override SAAJ version so that we can build on Java 1.6.
Modified:
axis/axis1/java/trunk/axis/pom.xml
Modified: axis/axis1/java/trunk/axis/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis/pom.xml?rev=1383094&r1=1383093&r2=1383094&view=diff
==
--- axis/axis1/java/trunk/axis/pom.xml (original)
+++ axis/axis1/java/trunk/axis/pom.xml Mon Sep 10 20:04:07 2012
@@ -166,7 +166,12 @@
xerces
xmlParserAPIs
-
+
+
+${project.groupId}
+axis-saaj
+${project.version}
+
true
${project.build.directory}/endorsed
@@ -189,8 +194,8 @@
org/apache/axis/encoding/ser/xbeans/**
-
-
-Xbootclasspath/p:${project.build.directory}/endorsed/xmlParserAPIs.jar
+
+
-Xbootclasspath/p:${project.build.directory}/endorsed/xmlParserAPIs.jar${path.separator}${project.build.directory}/endorsed/axis-saaj.jar
svn commit: r1383102 - /axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/i18n/ProjectResourceBundle.java
Author: veithen
Date: Mon Sep 10 20:38:17 2012
New Revision: 1383102
URL: http://svn.apache.org/viewvc?rev=1383102&view=rev
Log:
AXIS-2875: Renamed a method that conflicts with a method in the superclass
introduced in Java 1.6. Note that it is unlikely that this method is used by
application code.
Modified:
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/i18n/ProjectResourceBundle.java
Modified:
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/i18n/ProjectResourceBundle.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/i18n/ProjectResourceBundle.java?rev=1383102&r1=1383101&r2=1383102&view=diff
==
---
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/i18n/ProjectResourceBundle.java
(original)
+++
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/i18n/ProjectResourceBundle.java
Mon Sep 10 20:38:17 2012
@@ -358,9 +358,12 @@ public class ProjectResourceBundle exten
}
/**
- * Clears the internal cache
+ * Clears the internal cache.
+ *
+ * Note: In Axis 1.4 this method was named clearCache.
However, that name conflicts
+ * with a method in the base class introduced in Java 1.6.
*/
-public static void clearCache()
+public static void clearBundleCache()
{
bundleCache.clear();
}
svn commit: r1383258 - /axis/axis1/java/trunk/pom.xml
Author: veithen Date: Tue Sep 11 06:54:05 2012 New Revision: 1383258 URL: http://svn.apache.org/viewvc?rev=1383258&view=rev Log: AXIS-2875: Set the appropriate system properties so that the SAAJ unit tests can be executed on Java 1.6 (and actually test the Axis SAAJ implementation). This is necessary because Axis doesn't contain META-INF/services/* resources for SAAJ. Note that we don't want to add these files because this would likely cause issues for applications that use both Axis 1.x and SAAJ 1.3. Modified: axis/axis1/java/trunk/pom.xml Modified: axis/axis1/java/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/pom.xml?rev=1383258&r1=1383257&r2=1383258&view=diff == --- axis/axis1/java/trunk/pom.xml (original) +++ axis/axis1/java/trunk/pom.xml Tue Sep 11 06:54:05 2012 @@ -112,10 +112,29 @@ maven-surefire-plugin 2.11 + + + + org.apache.axis.soap.MessageFactoryImpl + org.apache.axis.soap.SOAPFactoryImpl + org.apache.axis.soap.SOAPConnectionFactoryImpl + + maven-failsafe-plugin 2.11 + + + + org.apache.axis.soap.MessageFactoryImpl + org.apache.axis.soap.SOAPFactoryImpl + org.apache.axis.soap.SOAPConnectionFactoryImpl + + maven-antrun-plugin
