svn commit: r981188 - in /axis/axis2/java/core/trunk/modules: fastinfoset/pom.xml tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
Author: veithen
Date: Sun Aug 1 09:30:32 2010
New Revision: 981188
URL: http://svn.apache.org/viewvc?rev=981188&view=rev
Log:
Use the new axis2-repo-maven-plugin to simplify the fastinfoset build. Also
fixed MDEP-259 for axis2-repo-maven-plugin.
Modified:
axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
Modified: axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml?rev=981188&r1=981187&r2=981188&view=diff
==
--- axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml Sun Aug 1 09:30:32
2010
@@ -172,38 +172,16 @@
-maven-dependency-plugin
+org.apache.axis2
+axis2-repo-maven-plugin
-generate-test-resources
-copy
+create-test-repository
-
-
-org.apache.axis2
-addressing
-${project.version}
-mar
-
-
-
${project.build.directory}/repo/modules
+
${project.build.directory}/repo
-
-
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java?rev=981188&r1=981187&r2=981188&view=diff
==
---
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
Sun Aug 1 09:30:32 2010
@@ -21,10 +21,16 @@ package org.apache.axis2.maven2.repo;
import java.io.File;
import java.io.IOException;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -44,6 +50,30 @@ public abstract class AbstractCreateRepo
private MavenProject project;
/**
+ * @component
+ */
+private ArtifactFactory factory;
+
+/**
+ * @component
+ */
+private ArtifactResolver resolver;
+
+/**
+ * @parameter expression="${project.remoteArtifactRepositories}"
+ * @readonly
+ * @required
+ */
+protected List remoteRepositories;
+
+/**
+ * @parameter expression="${localRepository}"
+ * @readonly
+ * @required
+ */
+private ArtifactRepository localRepository;
+
+/**
* The directory (relative to the repository root) where AAR files are
copied. This should be
* set to the same value as the ServicesDirectory property in
axis2.xml.
*
@@ -89,6 +119,7 @@ public abstract class AbstractCreateRepo
} catch (ArtifactFilterException ex) {
throw new MojoExecutionException(ex.getMessage(), ex);
}
+artifacts = replaceIncompleteArtifacts(artifacts);
File outputDirectory = getOutputDirectory();
File servicesDirectory = new File(outputDirectory,
this.servicesDirectory);
File modulesDirectory = new File(outputDirectory,
this.modulesDirectory);
@@ -115,4 +146,33 @@ public abstract class AbstractCreateRepo
}
}
}
+
+/**
+ * Replace artifacts that have not been packaged yet. This occurs if the
artifact is
+ * part of the reactor build and the compile phase has been executed, but
not the
+ * the package phase. These artifacts will be replaced by new ar
svn propchange: r944915 - svn:log
Author: veithen Revision: 944915 Modified property: svn:log Modified: svn:log at Sun Aug 1 10:28:31 2010 -- --- svn:log (original) +++ svn:log Sun Aug 1 10:28:31 2010 @@ -1 +1 @@ -AXIS2-4450: Strictly forbid document type declarations in both SOAP and plain XML requests. +CVE-2010-1632 (AXIS2-4450): Strictly forbid document type declarations in both SOAP and plain XML requests.
svn propchange: r952764 - svn:log
Author: veithen Revision: 952764 Modified property: svn:log Modified: svn:log at Sun Aug 1 10:30:14 2010 -- --- svn:log (original) +++ svn:log Sun Aug 1 10:30:14 2010 @@ -1 +1 @@ -Merged r944915 and r951385 to the 1.5 branch in order to support Axiom 1.2.9. +Merged r944915 and r951385 to the 1.5 branch in order to fix the security issue described in CVE-2010-1632.
svn propchange: r951385 - svn:log
Author: veithen Revision: 951385 Modified property: svn:log Modified: svn:log at Sun Aug 1 10:32:45 2010 -- --- svn:log (original) +++ svn:log Sun Aug 1 10:32:45 2010 @@ -1,2 +1,2 @@ -AXIS2-4450 +CVE-2010-1632 (AXIS2-4450) Don't allow DTD's in MTOMBuilder flow.
svn commit: r981197 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport/http/
Author: veithen Date: Sun Aug 1 10:35:12 2010 New Revision: 981197 URL: http://svn.apache.org/viewvc?rev=981197&view=rev Log: Merged r981095 to the 1.5 branch in order to keep the build process in sync with the trunk. Added: axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/ - copied from r981095, axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/ axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/pom.xml - copied, changed from r981095, axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/pom.xml axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/ - copied from r981095, axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/ axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/ - copied from r981095, axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/ axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/ - copied from r981095, axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/ axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/ - copied from r981095, axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/ axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/ - copied from r981095, axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/ axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/ - copied from r981095, axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/ axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/ - copied from r981095, axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/ axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ - copied from r981095, axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java - copied unchanged from r981095, axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java - copied unchanged from r981095, axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java - copied unchanged from r981095, axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java Removed: axis/axis2/java/core/branches/java/1_5/modules/metadata/build.xml Modified: axis/axis2/java/core/branches/java/1_5/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/distribution/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/metadata/pom.xml axis/axis2/java/core/branches/java/1_5/modules/parent/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (props changed) axis/axis2/java/core/branches/java/1_5/pom.xml Propchange: axis/axis2/java/core/branches/java/1_5/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 1 10:35:12 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk:922914,922983,944347,944915,951385,960693,9609
svn commit: r981207 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/fastinfoset/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/
Author: veithen
Date: Sun Aug 1 11:30:48 2010
New Revision: 981207
URL: http://svn.apache.org/viewvc?rev=981207&view=rev
Log:
Merged r935169,935174,935338,981188 to the 1.5 branch in order to keep the
build process in sync with the trunk.
Modified:
axis/axis2/java/core/branches/java/1_5/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/distribution/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/parent/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
(props changed)
Propchange: axis/axis2/java/core/branches/java/1_5/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 11:30:48 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk:922914,922983,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095
+/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188
/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 11:30:48 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/distribution:922914,922983,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095
+/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188
/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Modified: axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/pom.xml?rev=981207&r1=981206&r2=981207&view=diff
==
--- axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/pom.xml
(original)
+++ axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/pom.xml Sun Aug
1 11:30:48 2010
@@ -93,6 +93,13 @@
neethi
+org.apache.axis2
+addressing
+${project.version}
+mar
+test
+
+
xmlunit
xmlunit
test
@@ -136,6 +143,9 @@
**/*.properties
+
+${project.build.directory}/repo
+
@@ -162,6 +172,20 @@
+org.apache.axis2
+axis2-repo-maven-plugin
+
+
+
+create-test-repository
+
+
+
svn commit: r981220 - in /axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo: AbstractCreateRepositoryMojo.java CreateRepositoryMojo.java Create
Author: veithen
Date: Sun Aug 1 13:23:31 2010
New Revision: 981220
URL: http://svn.apache.org/viewvc?rev=981220&view=rev
Log:
Some improvements to the new axis2-repo-maven-plugin. In particular, collect
AAR and MAR files not only from project dependencies, but also from submodules
in a multimodule project.
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java?rev=981220&r1=981219&r2=981220&view=diff
==
---
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
Sun Aug 1 13:23:31 2010
@@ -22,7 +22,6 @@ package org.apache.axis2.maven2.repo;
import java.io.File;
import java.io.IOException;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -43,13 +42,6 @@ import org.codehaus.plexus.util.FileUtil
public abstract class AbstractCreateRepositoryMojo extends AbstractMojo {
/**
- * @parameter expression="${project}"
- * @readonly
- * @required
- */
-private MavenProject project;
-
-/**
* @component
*/
private ArtifactFactory factory;
@@ -60,11 +52,18 @@ public abstract class AbstractCreateRepo
private ArtifactResolver resolver;
/**
+ * @parameter expression="${project.artifacts}"
+ * @readonly
+ * @required
+ */
+private Set projectArtifacts;
+
+/**
* @parameter expression="${project.remoteArtifactRepositories}"
* @readonly
* @required
*/
-protected List remoteRepositories;
+private List remoteRepositories;
/**
* @parameter expression="${localRepository}"
@@ -74,6 +73,13 @@ public abstract class AbstractCreateRepo
private ArtifactRepository localRepository;
/**
+ * @parameter expression="${project.collectedProjects}"
+ * @required
+ * @readonly
+ */
+private List collectedProjects;
+
+/**
* The directory (relative to the repository root) where AAR files are
copied. This should be
* set to the same value as the ServicesDirectory property in
axis2.xml.
*
@@ -105,12 +111,36 @@ public abstract class AbstractCreateRepo
*/
private String configurationDirectory;
+/**
+ * Specifies whether the plugin should scan the project dependencies for
AAR and MAR artifacts.
+ *
+ * @parameter default-value="true"
+ */
+private boolean useDependencies;
+
+/**
+ * Specifies whether the plugin should scan Maven modules for AAR and MAR
artifacts. This
+ * parameter only has an effect for multimodule projects.
+ *
+ * @parameter default-value="true"
+ */
+private boolean useModules;
+
protected abstract String getScope();
protected abstract File getOutputDirectory();
public void execute() throws MojoExecutionException, MojoFailureException {
-Set artifacts = project.getArtifacts();
+Set artifacts = new HashSet();
+if (useDependencies) {
+artifacts.addAll(projectArtifacts);
+}
+if (useModules) {
+for (MavenProject project : collectedProjects) {
+artifacts.add(project.getArtifact());
+artifacts.addAll(project.getAttachedArtifacts());
+}
+}
FilterArtifacts filter = new FilterArtifacts();
filter.addFilter(new ScopeFilter(getScope(), null));
filter.addFilter(new TypeFilter("aar,mar", null));
@@ -123,8 +153,7 @@ public abstract class AbstractCreateRepo
File outputDirectory = getOutputDirectory();
File servicesDirectory = new File(outputDirectory,
this.servicesDirectory);
File modulesDirectory = new File(outputDirectory,
this.modulesDirectory);
-for (Iterator it = artifacts.iterator(); it.hasNext(); ) {
-Artifact artifact = (Artifact)it.next();
+for (Artifact artifact : artifacts) {
String type = artifact.getType();
String destFileName = a
svn commit: r981221 - /axis/axis2/java/core/trunk/modules/distribution/pom.xml
Author: veithen Date: Sun Aug 1 13:29:00 2010 New Revision: 981221 URL: http://svn.apache.org/viewvc?rev=981221&view=rev Log: Removed stuff related to the old documents distribution. Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=981221&r1=981220&r2=981221&view=diff == --- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Sun Aug 1 13:29:00 2010 @@ -262,7 +262,6 @@ src/main/assembly/war-assembly.xml src/main/assembly/bin-assembly.xml - @@ -275,68 +274,6 @@ false -package -process-resources - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -run - - - delete-temporary-files install
svn commit: r981237 - in /axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo: AbstractCreateRepositoryMojo.java ArchiveDeployer.java
Author: veithen
Date: Sun Aug 1 14:59:17 2010
New Revision: 981237
URL: http://svn.apache.org/viewvc?rev=981237&view=rev
Log:
Enhanced the axis2-repo-maven-plugin so that it can write services.list and
modules.list files. This will eventually allow us to get rid of the Groovy
stuff in the distribution module.
Added:
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java
(with props)
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java?rev=981237&r1=981236&r2=981237&view=diff
==
---
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
Sun Aug 1 14:59:17 2010
@@ -21,8 +21,10 @@ package org.apache.axis2.maven2.repo;
import java.io.File;
import java.io.IOException;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
@@ -126,6 +128,14 @@ public abstract class AbstractCreateRepo
*/
private boolean useModules;
+/**
+ * Specifies whether the plugin should generate services.list and
modules.list
+ * files.
+ *
+ * @parameter default-value="false"
+ */
+private boolean generateFileLists;
+
protected abstract String getScope();
protected abstract File getOutputDirectory();
@@ -151,18 +161,16 @@ public abstract class AbstractCreateRepo
}
artifacts = replaceIncompleteArtifacts(artifacts);
File outputDirectory = getOutputDirectory();
-File servicesDirectory = new File(outputDirectory,
this.servicesDirectory);
-File modulesDirectory = new File(outputDirectory,
this.modulesDirectory);
+Map deployers = new
HashMap();
+deployers.put("aar", new ArchiveDeployer(outputDirectory,
servicesDirectory, "services.list", generateFileLists));
+deployers.put("mar", new ArchiveDeployer(outputDirectory,
modulesDirectory, "modules.list", generateFileLists));
for (Artifact artifact : artifacts) {
String type = artifact.getType();
-String destFileName = artifact.getArtifactId() + "-" +
artifact.getVersion() + "." + type;
-File targetDir = type.equals("mar") ? modulesDirectory :
servicesDirectory;
-getLog().info("Adding " + destFileName);
-try {
-FileUtils.copyFile(artifact.getFile(), new File(targetDir,
destFileName));
-} catch (IOException ex) {
-throw new MojoExecutionException("Error copying " +
destFileName + ": " + ex.getMessage(), ex);
+ArchiveDeployer deployer = deployers.get(type);
+if (deployer == null) {
+throw new MojoExecutionException("No deployer found for
artifact type " + type);
}
+deployer.deploy(getLog(), artifact);
}
if (axis2xml != null) {
getLog().info("Copying axis2.xml");
@@ -174,6 +182,9 @@ public abstract class AbstractCreateRepo
throw new MojoExecutionException("Error copying axis2.xml
file: " + ex.getMessage(), ex);
}
}
+for (ArchiveDeployer deployer : deployers.values()) {
+deployer.finish(getLog());
+}
}
/**
Added:
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java?rev=981237&view=auto
==
---
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java
(added)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java
Sun Aug 1 14:59:17 2010
@@ -0,0 +1,82 @@
+/*
+ * 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
svn commit: r981253 - /axis/axis2/java/core/trunk/modules/all/pom.xml
Author: amilas Date: Sun Aug 1 16:04:38 2010 New Revision: 981253 URL: http://svn.apache.org/viewvc?rev=981253&view=rev Log: fixed the version and added the proper name Modified: axis/axis2/java/core/trunk/modules/all/pom.xml Modified: axis/axis2/java/core/trunk/modules/all/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/all/pom.xml?rev=981253&r1=981252&r2=981253&view=diff == --- axis/axis2/java/core/trunk/modules/all/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/all/pom.xml Sun Aug 1 16:04:38 2010 @@ -13,11 +13,10 @@ org.apache.axis2 axis2-all bundle -axis2-all +Apache Axis2 - all This bundle exports all the axis2 packages; -1.6-SNAPSHOT
svn commit: r981262 - in /axis/axis2/java/core/trunk/modules: distribution/pom.xml distribution/src/main/assembly/repository.xml integration/pom.xml scripting/pom.xml webapp/pom.xml
Author: veithen
Date: Sun Aug 1 16:30:51 2010
New Revision: 981262
URL: http://svn.apache.org/viewvc?rev=981262&view=rev
Log:
Changed the artifactId of the scripting module from "axis2-scripting" to
"scripting" to match the convention used by the other Axis2 modules. This also
implies that we no longer need to apply special processing to that module when
building the binary distribution.
Modified:
axis/axis2/java/core/trunk/modules/distribution/pom.xml
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml
axis/axis2/java/core/trunk/modules/integration/pom.xml
axis/axis2/java/core/trunk/modules/scripting/pom.xml
axis/axis2/java/core/trunk/modules/webapp/pom.xml
Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=981262&r1=981261&r2=981262&view=diff
==
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Sun Aug 1 16:30:51
2010
@@ -171,7 +171,7 @@
org.apache.axis2
-axis2-scripting
+scripting
${pom.version}
mar
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml?rev=981262&r1=981261&r2=981262&view=diff
==
---
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml
(original)
+++
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml
Sun Aug 1 16:30:51 2010
@@ -31,18 +31,6 @@
*:*:mar
-
-org.apache.axis2:axis2-scripting
-
-
-
-
-modules
-false
-
-org.apache.axis2:axis2-scripting:mar
-
-
scripting-${artifact.version}.mar
Modified: axis/axis2/java/core/trunk/modules/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/pom.xml?rev=981262&r1=981261&r2=981262&view=diff
==
--- axis/axis2/java/core/trunk/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/pom.xml Sun Aug 1 16:30:51
2010
@@ -52,7 +52,7 @@
org.apache.axis2
-axis2-scripting
+scripting
mar
${project.version}
Modified: axis/axis2/java/core/trunk/modules/scripting/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/scripting/pom.xml?rev=981262&r1=981261&r2=981262&view=diff
==
--- axis/axis2/java/core/trunk/modules/scripting/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/scripting/pom.xml Sun Aug 1 16:30:51
2010
@@ -27,7 +27,7 @@
SNAPSHOT
../parent/pom.xml
-axis2-scripting
+scripting
mar
Apache Axis2 - Scripting
Axis2 scripting support for services implemented with
scripting languages
Modified: axis/axis2/java/core/trunk/modules/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/pom.xml?rev=981262&r1=981261&r2=981262&view=diff
==
--- axis/axis2/java/core/trunk/modules/webapp/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/webapp/pom.xml Sun Aug 1 16:30:51 2010
@@ -1105,7 +1105,7 @@
org.apache.axis2
-axis2-scripting
+scripting
${project.version}
mar
svn commit: r981278 - in /axis/axis2/java/core/trunk/modules: distribution/pom.xml distribution/src/main/assembly/repository.xml mex/pom.xml
Author: veithen
Date: Sun Aug 1 18:09:50 2010
New Revision: 981278
URL: http://svn.apache.org/viewvc?rev=981278&view=rev
Log:
Fixed the packaging of the mex module so that it will be deployed as a MAR to
the Maven repository. This was not the case previously.
Modified:
axis/axis2/java/core/trunk/modules/distribution/pom.xml
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml
axis/axis2/java/core/trunk/modules/mex/pom.xml
Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=981278&r1=981277&r2=981278&view=diff
==
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Sun Aug 1 18:09:50
2010
@@ -129,6 +129,7 @@
org.apache.axis2
mex
${pom.version}
+mar
org.apache.axis2
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml?rev=981278&r1=981277&r2=981278&view=diff
==
---
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml
(original)
+++
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml
Sun Aug 1 18:09:50 2010
@@ -32,15 +32,6 @@
*:*:mar
-
-
-modules
-false
-
-org.apache.axis2:mex:jar
-
-
${artifact.artifactId}-${artifact.version}.mar
-
services
Modified: axis/axis2/java/core/trunk/modules/mex/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/mex/pom.xml?rev=981278&r1=981277&r2=981278&view=diff
==
--- axis/axis2/java/core/trunk/modules/mex/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/mex/pom.xml Sun Aug 1 18:09:50 2010
@@ -28,7 +28,7 @@
../parent/pom.xml
mex
-jar
+mar
Apache Axis2 - MEX
WS-Metadata Exchange implementation
@@ -90,32 +90,35 @@
org.apache.axis2
axis2-mar-maven-plugin
true
+
+false
+
+
+
+maven-jar-plugin
-generate-mar
-verify
+classpath-module
-mar
+jar
-false
+classpath-module
+
+
+
+
+impl
+
+jar
+
+
+impl
+
+META-INF/module.xml
+
-
-
-
-org.apache.maven.plugins
-maven-jar-plugin
-
-
-package
-
- jar
-
-
- impl
-
-
svn commit: r981293 - in /axis/axis2/java/core/trunk/modules: distribution/ distribution/src/main/assembly/ tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/
Author: veithen
Date: Sun Aug 1 19:54:36 2010
New Revision: 981293
URL: http://svn.apache.org/viewvc?rev=981293&view=rev
Log:
Enhanced axis2-repo-maven-plugin with options to strip version numbers from AAR
and MAR files. Use this to get rid of the Groovy stuff and some of the assembly
stuff in the distribution module.
Removed:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml
Modified:
axis/axis2/java/core/trunk/modules/distribution/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java
Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=981293&r1=981292&r2=981293&view=diff
==
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Sun Aug 1 19:54:36
2010
@@ -192,57 +192,16 @@
-
-org.apache.maven.plugins
-maven-assembly-plugin
-
-
-generate-resources
-
-directory-single
-
-
-
${project.build.directory}
-tmp-repository
-
true
-false
-
-
src/main/assembly/repository.xml
-
-
-
-
-
-
-
-org.codehaus.gmaven
-gmaven-plugin
+org.apache.axis2
+axis2-repo-maven-plugin
-generate-resources
-execute
+create-repository
-
-def modulesdir = new
File(project.build.directory, "tmp-repository/modules");
-def moduleslist = new File(modulesdir,
"modules.list");
-moduleslist.delete();
-modulesdir.eachFile({
-if (it.name.endsWith(".mar")) {
-moduleslist.append("$it.name\n");
-}
-})
-
-def servicesdir = new
File(project.build.directory, "tmp-repository/services");
-def serviceslist = new File(servicesdir,
"services.list");
-serviceslist.delete();
-servicesdir.eachFile({
-if (it.name.endsWith(".aar")) {
-serviceslist.append("$it.name\n");
-}
-})
-
+
${project.build.directory}/tmp-repository
+true
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java?rev=981293&r1=981292&r2=981293&view=diff
==
---
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
Sun Aug 1 19:54:36 2010
@@ -136,6 +136,20 @@ public abstract class AbstractCreateRepo
*/
private boolean generateFileLists;
+/**
+ * Specifies whether the plugin strips version numbers from AAR files.
+ *
+ * @parameter default-value="true"
+ */
+private boolean stripServiceVersion;
+
+/**
+ * Specifies whether the plugin strips version numbers from MAR files.
+ *
+ * @parameter default-value="false"
+ */
+private boolean stripModuleVersion;
+
protected abstract
svn commit: r981306 - /axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
Author: veithen Date: Sun Aug 1 20:05:00 2010 New Revision: 981306 URL: http://svn.apache.org/viewvc?rev=981306&view=rev Log: Removed unnecessary excludes from the bin assembly (i.e. those that are never triggered). Modified: axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml Modified: axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=981306&r1=981305&r2=981306&view=diff == --- axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml (original) +++ axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml Sun Aug 1 20:05:00 2010 @@ -206,63 +206,21 @@ *:*:jar - mx4j:mx4j-jmx:jar - mx4j:mx4j-impl:jar - mx4j:mx4j-remote:jar - mx4j:mx4j-tools:jar - mx4j:mx4j:jar - rome:rome:jar org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar - org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:jar - org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec:jar - org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec:jar org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar - org.apache.geronimo.specs:geronimo-jsp_2.0_spec:jar - org.apache.activemq:activemq-console:jar - org.apache.activemq:activemq-core:jar - org.apache.activemq:activemq-jaas:jar - org.apache.activemq:activemq-optional:jar - org.apache.activemq:activemq-optional:jar - org.apache.activemq:activemq-web:jar - org.apache.activemq:activemq-web-demo:war - xstream:xstream:jar - xom:xom:jar - xmlpull:xmlpull:jar - xerces:xmlParserAPIs:jar - org.apache.xbean:xbean-spring:jar - org.springframework:spring:jar org.springframework:spring-beans:jar org.springframework:spring-context:jar org.springframework:spring-core:jar org.springframework:spring-web:jar - logkit:logkit:jar - javax.xml.bind:jsr173_api:jar - jrms:jrms:jar - activemq:jmdns:jar - org.mortbay.jetty:jetty:jar - org.mortbay.jetty:jetty-util:jar - jdom:jdom:jar jakarta-regexp:jakarta-regexp:jar - com.ibm.icu:icu4j:jar org.apache.bcel:bcel:jar - org.apache.activemq:activeio-core:jar org.apache.ant:ant:jar org.apache.ant:ant-launcher:jar aopalliance:aopalliance:jar - org.apache.activemq:apache-activemq:jar - avalon-framework:avalon-framework:jar - axis:axis:jar bsf:bsf:jar - commons-beanutils:commons-beanutils:jar - commons-collections:commons-collections:jar - commons-pool:commons-pool:jar - dom4j:dom4j:jar com.sun.xml.fastinfoset:FastInfoset:jar - activesoap:jaxp-api:jar rhino:js:jar - junit:junit:jar javax.servlet:servlet-api - org.mortbay.jetty:servlet-api-2.5:jar:6.0.1
svn commit: r981311 - /axis/axis2/java/core/trunk/modules/jibx/pom.xml
Author: veithen
Date: Sun Aug 1 20:31:07 2010
New Revision: 981311
URL: http://svn.apache.org/viewvc?rev=981311&view=rev
Log:
Reduced the dependencies of the jibx module.
Modified:
axis/axis2/java/core/trunk/modules/jibx/pom.xml
Modified: axis/axis2/java/core/trunk/modules/jibx/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jibx/pom.xml?rev=981311&r1=981310&r2=981311&view=diff
==
--- axis/axis2/java/core/trunk/modules/jibx/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jibx/pom.xml Sun Aug 1 20:31:07 2010
@@ -40,11 +40,13 @@
org.apache.axis2
axis2-transport-http
${project.version}
+test
org.apache.axis2
axis2-transport-local
${project.version}
+test
org.apache.axis2
@@ -66,10 +68,7 @@
org.apache.ant
ant
-
-
-org.apache.ant
-ant-launcher
+test
svn commit: r981315 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport/http/
Author: veithen Date: Sun Aug 1 20:48:54 2010 New Revision: 981315 URL: http://svn.apache.org/viewvc?rev=981315&view=rev Log: Merged r981221 to the 1.5 branch. Modified: axis/axis2/java/core/branches/java/1_5/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/distribution/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/parent/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (props changed) Propchange: axis/axis2/java/core/branches/java/1_5/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 1 20:48:54 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188 +/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221 /webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 1 20:48:54 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188 +/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221 /webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980 Modified: axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml?rev=981315&r1=981314&r2=981315&view=diff == --- axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml Sun Aug 1 20:48:54 2010 @@ -258,7 +258,6 @@ src/main/assembly/war-assembly.xml src/main/assembly/src-assembly.xml src/main/assembly/bin-assembly.xml - src/main/assembly/doc-assembly.xml @@ -272,68 +271,6 @@ false -package -process-resources - - - - - - - - - - - - -
svn commit: r981316 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/distribution/src/main/assembly/ modules/integration/ modules/kernel/src/org/apache/axis2/transport/ht
Author: veithen
Date: Sun Aug 1 20:57:52 2010
New Revision: 981316
URL: http://svn.apache.org/viewvc?rev=981316&view=rev
Log:
Merged r981262 to the 1.5 branch.
Modified:
axis/axis2/java/core/branches/java/1_5/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/distribution/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/repository.xml
axis/axis2/java/core/branches/java/1_5/modules/integration/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/parent/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/scripting/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
(props changed)
Propchange: axis/axis2/java/core/branches/java/1_5/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 20:57:52 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221
+/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221,981262
/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 20:57:52 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221
+/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221,981262
/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Modified: axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml?rev=981316&r1=981315&r2=981316&view=diff
==
--- axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
(original)
+++ axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml Sun Aug
1 20:57:52 2010
@@ -166,7 +166,7 @@
org.apache.axis2
-axis2-scripting
+scripting
${pom.version}
mar
Modified:
axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/repository.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/repository.xml?rev=981316&r1=981315&r2=981316&view=diff
==
---
axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/r
svn commit: r981317 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/distribution/src/main/assembly/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kern
Author: veithen
Date: Sun Aug 1 21:02:52 2010
New Revision: 981317
URL: http://svn.apache.org/viewvc?rev=981317&view=rev
Log:
Merged r981278 to the 1.5 branch.
Modified:
axis/axis2/java/core/branches/java/1_5/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/distribution/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/repository.xml
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/mex/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/parent/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
(props changed)
Propchange: axis/axis2/java/core/branches/java/1_5/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:02:52 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221,981262
+/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:02:52 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221,981262
+/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Modified: axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml?rev=981317&r1=981316&r2=981317&view=diff
==
--- axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
(original)
+++ axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml Sun Aug
1 21:02:52 2010
@@ -124,6 +124,7 @@
org.apache.axis2
mex
${pom.version}
+mar
org.apache.axis2
Modified:
axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/repository.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/repository.xml?rev=981317&r1=981316&r2=981317&view=diff
==
---
axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/repository.xml
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/repository.xml
Sun A
svn commit: r981320 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport/http/
Author: veithen
Date: Sun Aug 1 21:21:38 2010
New Revision: 981320
URL: http://svn.apache.org/viewvc?rev=981320&view=rev
Log:
Merged r777882 to the 1.5 branch.
Modified:
axis/axis2/java/core/branches/java/1_5/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/distribution/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/parent/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
(props changed)
Propchange: axis/axis2/java/core/branches/java/1_5/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:21:38 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
-/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
+/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:21:38 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
-/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
+/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Modified: axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml?rev=981320&r1=981319&r2=981320&view=diff
==
--- axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
(original)
+++ axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml Sun Aug
1 21:21:38 2010
@@ -190,7 +190,6 @@
org.apache.maven.plugins
maven-assembly-plugin
-${maven.assembly.version}
generate-resources
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:21:38 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,98103
svn commit: r981324 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/distribution/src/main/assembly/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kern
Author: veithen Date: Sun Aug 1 21:33:37 2010 New Revision: 981324 URL: http://svn.apache.org/viewvc?rev=981324&view=rev Log: Merged r981220,981237,981293 to the 1.5 branch. Added: axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java - copied, changed from r981237, axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ArchiveDeployer.java Removed: axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/repository.xml Modified: axis/axis2/java/core/branches/java/1_5/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/distribution/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/parent/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (props changed) Propchange: axis/axis2/java/core/branches/java/1_5/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 1 21:33:37 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278 +/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293 /webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 1 21:33:37 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278 +/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293 /webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980 Modified: axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml?rev=981324&r1=981323&r2=981324&view=diff == --- axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml (original) +++ axis/axis2/j
svn commit: r981325 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/jibx/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/t
Author: veithen
Date: Sun Aug 1 21:36:45 2010
New Revision: 981325
URL: http://svn.apache.org/viewvc?rev=981325&view=rev
Log:
Merged r981311 to the 1.5 branch.
Modified:
axis/axis2/java/core/branches/java/1_5/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/distribution/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/jibx/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/parent/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
(props changed)
Propchange: axis/axis2/java/core/branches/java/1_5/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:36:45 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293
+/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981311
/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:36:45 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293
+/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981311
/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Modified: axis/axis2/java/core/branches/java/1_5/modules/jibx/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/jibx/pom.xml?rev=981325&r1=981324&r2=981325&view=diff
==
--- axis/axis2/java/core/branches/java/1_5/modules/jibx/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/jibx/pom.xml Sun Aug 1
21:36:45 2010
@@ -40,11 +40,13 @@
org.apache.axis2
axis2-transport-http
${project.version}
+test
org.apache.axis2
axis2-transport-local
${project.version}
+test
org.apache.axis2
@@ -66,10 +68,7 @@
org.apache.ant
ant
-
-
-org.apache.ant
-ant-launcher
+test
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:36:45 2010
@@ -1,2 +1,2 @
